From 188193eb619648e138e1bfb25b67fc5fc12a64d6 Mon Sep 17 00:00:00 2001 From: LetterJay Date: Thu, 24 Aug 2017 21:24:25 -0500 Subject: [PATCH] here we go again (#2456) --- .github/CONTRIBUTING.md | 4 +- .../LavaRuins/lavaland_biodome_beach.dmm | 46 +- .../lavaland_biodome_clown_planet.dmm | 50 +- .../lavaland_surface_animal_hospital.dmm | 120 +- .../lavaland_surface_ash_walker1.dmm | 62 +- .../lavaland_surface_biodome_winter.dmm | 22 +- .../LavaRuins/lavaland_surface_cultaltar.dmm | 4 +- .../LavaRuins/lavaland_surface_envy.dmm | 2 +- .../LavaRuins/lavaland_surface_gluttony.dmm | 4 +- .../LavaRuins/lavaland_surface_golem_ship.dmm | 52 +- .../LavaRuins/lavaland_surface_greed.dmm | 18 +- .../LavaRuins/lavaland_surface_hermit.dmm | 24 +- .../LavaRuins/lavaland_surface_pizzaparty.dmm | 22 +- .../LavaRuins/lavaland_surface_seed_vault.dmm | 84 +- .../LavaRuins/lavaland_surface_sloth.dmm | 6 +- .../lavaland_surface_survivalpod.dmm | 8 +- .../lavaland_surface_syndicate_base1.dmm | 202 +- .../LavaRuins/lavaland_surface_ufo_crash.dmm | 18 +- .../LavaRuins/lavaland_surface_xeno_nest.dmm | 6 +- _maps/RandomRuins/SpaceRuins/DJstation.dmm | 14 +- _maps/RandomRuins/SpaceRuins/TheDerelict.dmm | 194 +- .../SpaceRuins/abandonedteleporter.dmm | 16 +- _maps/RandomRuins/SpaceRuins/abandonedzoo.dmm | 70 +- _maps/RandomRuins/SpaceRuins/asteroid3.dmm | 2 +- _maps/RandomRuins/SpaceRuins/asteroid4.dmm | 6 +- _maps/RandomRuins/SpaceRuins/bigderelict1.dmm | 86 +- _maps/RandomRuins/SpaceRuins/bus.dmm | 42 +- .../RandomRuins/SpaceRuins/caravanambush.dmm | 122 +- .../SpaceRuins/crashedclownship.dmm | 38 +- _maps/RandomRuins/SpaceRuins/crashedship.dmm | 144 +- _maps/RandomRuins/SpaceRuins/deepstorage.dmm | 240 +- _maps/RandomRuins/SpaceRuins/derelict4.dmm | 4 +- _maps/RandomRuins/SpaceRuins/derelict5.dmm | 4 +- _maps/RandomRuins/SpaceRuins/derelict6.dmm | 12 +- .../RandomRuins/SpaceRuins/gasthelizards.dmm | 94 +- .../SpaceRuins/intactemptyship.dmm | 8 +- .../SpaceRuins/listeningstation.dmm | 30 +- _maps/RandomRuins/SpaceRuins/miracle.dmm | 4 +- _maps/RandomRuins/SpaceRuins/oldAIsat.dmm | 64 +- _maps/RandomRuins/SpaceRuins/oldstation.dmm | 248 +- .../RandomRuins/SpaceRuins/oldteleporter.dmm | 2 +- _maps/RandomRuins/SpaceRuins/onehalf.dmm | 52 +- .../SpaceRuins/originalcontent.dmm | 42 +- _maps/RandomRuins/SpaceRuins/shuttlerelic.dmm | 2 +- _maps/RandomRuins/SpaceRuins/spacehotel.dmm | 344 +- .../SpaceRuins/turretedoutpost.dmm | 34 +- _maps/RandomRuins/SpaceRuins/vaporwave.dmm | 2 +- _maps/RandomZLevels/Academy.dmm | 196 +- _maps/RandomZLevels/Cabin.dmm | 54 +- _maps/RandomZLevels/beach.dmm | 10 +- _maps/RandomZLevels/beach2.dmm | 56 +- _maps/RandomZLevels/caves.dmm | 170 +- _maps/RandomZLevels/centcomAway.dmm | 202 +- _maps/RandomZLevels/challenge.dmm | 38 +- _maps/RandomZLevels/moonoutpost19.dmm | 314 +- _maps/RandomZLevels/research.dmm | 232 +- _maps/RandomZLevels/snowdin.dmm | 398 +- _maps/RandomZLevels/spacebattle.dmm | 200 +- _maps/RandomZLevels/undergroundoutpost45.dmm | 332 +- _maps/RandomZLevels/wildwest.dmm | 108 +- _maps/map_files/BoxStation/BoxStation.dmm | 2006 ++++---- _maps/map_files/Cerestation/cerestation.dmm | 2054 ++++---- .../CitadelStation/CitadelStation-1.2.2.dmm | 1792 +++---- .../map_files/Deltastation/DeltaStation2.dmm | 4532 ++++++++--------- _maps/map_files/MetaStation/MetaStation.dmm | 3502 ++++++------- _maps/map_files/Mining/Lavaland.dmm | 72 +- _maps/map_files/OmegaStation/OmegaStation.dmm | 1526 +++--- .../map_files/OmegaStation/job/job_changes.dm | 10 +- _maps/map_files/OmegaStation/job_changes.dm | 10 +- _maps/map_files/PubbyStation/PubbyStation.dmm | 2032 ++++---- .../PubbyStation/monastery_shuttle.dm | 4 +- _maps/map_files/debug/runtimestation.dmm | 44 +- _maps/map_files/generic/CentCom.dmm | 1358 ++--- _maps/shuttles/emergency_asteroid.dmm | 30 +- _maps/shuttles/emergency_bar.dmm | 52 +- _maps/shuttles/emergency_birdboat.dmm | 34 +- _maps/shuttles/emergency_box.dmm | 18 +- _maps/shuttles/emergency_cere.dmm | 100 +- _maps/shuttles/emergency_clown.dmm | 28 +- _maps/shuttles/emergency_cramped.dmm | 4 +- _maps/shuttles/emergency_delta.dmm | 122 +- _maps/shuttles/emergency_goon.dmm | 6 +- .../emergency_imfedupwiththisworld.dmm | 30 +- _maps/shuttles/emergency_luxury.dmm | 70 +- _maps/shuttles/emergency_meta.dmm | 122 +- _maps/shuttles/emergency_meteor.dmm | 2 +- _maps/shuttles/emergency_mini.dmm | 28 +- _maps/shuttles/emergency_narnar.dmm | 24 +- _maps/shuttles/emergency_pubby.dmm | 12 +- _maps/shuttles/emergency_raven.dmm | 86 +- _maps/shuttles/emergency_russiafightpit.dmm | 50 +- _maps/shuttles/emergency_scrapheap.dmm | 10 +- _maps/shuttles/emergency_supermatter.dmm | 6 +- _maps/shuttles/emergency_wabbajack.dmm | 26 +- _maps/shuttles/ferry_lighthouse.dmm | 10 +- _maps/shuttles/ferry_meat.dmm | 30 +- _maps/shuttles/whiteship_box.dmm | 28 +- _maps/shuttles/whiteship_cere.dmm | 18 +- _maps/shuttles/whiteship_meta.dmm | 174 +- _maps/shuttles/whiteship_pubby.dmm | 6 +- _maps/templates/medium_shuttle1.dmm | 2 +- _maps/templates/medium_shuttle2.dmm | 2 +- _maps/templates/medium_shuttle3.dmm | 2 +- _maps/templates/shelter_1.dmm | 2 +- _maps/templates/shelter_2.dmm | 18 +- code/__DEFINES/is_helpers.dm | 8 +- code/__HELPERS/priority_announce.dm | 2 +- code/__HELPERS/unsorted.dm | 2 +- code/_globalvars/lists/maintenance_loot.dm | 76 +- code/_onclick/autoclick.dm | 4 +- code/_onclick/click.dm | 2 +- code/_onclick/hud/robot.dm | 2 +- code/_onclick/hud/screen_objects.dm | 16 +- code/_onclick/observer.dm | 2 +- code/citadel/_cit_helpers.dm | 2 +- code/citadel/cit_arousal.dm | 10 +- code/citadel/cit_genemods.dm | 4 +- code/citadel/cit_guns.dm | 10 +- code/citadel/cit_vendors.dm | 22 +- code/citadel/dogborgs.dm | 68 +- code/citadel/dogborgstuff.dm | 60 +- code/citadel/pokemon.dm | 4 +- code/citadel/toys/dildos.dm | 26 +- code/controllers/hooks-defs.dm | 4 +- code/controllers/subsystem/persistence.dm | 8 +- code/datums/action.dm | 10 +- code/datums/antagonists/datum_traitor.dm | 6 +- code/datums/antagonists/devil.dm | 4 +- code/datums/antagonists/ninja.dm | 10 +- code/datums/datacore.dm | 4 +- code/datums/diseases/_MobProcs.dm | 2 +- code/datums/diseases/wizarditis.dm | 2 +- code/datums/emotes.dm | 2 +- code/datums/helper_datums/teleport.dm | 4 +- code/datums/martial/cqc.dm | 4 +- code/datums/martial/plasma_fist.dm | 4 +- code/datums/martial/sleeping_carp.dm | 12 +- code/datums/martial/wrestling.dm | 6 +- code/datums/material_container.dm | 14 +- code/datums/mind.dm | 4 +- code/datums/outfit.dm | 2 +- code/datums/recipe.dm | 4 +- code/datums/riding.dm | 2 +- code/datums/status_effects/buffs.dm | 2 +- code/datums/status_effects/debuffs.dm | 6 +- code/datums/wires/explosive.dm | 10 +- code/datums/wires/wires.dm | 4 +- code/game/atoms.dm | 6 +- code/game/atoms_movable.dm | 4 +- code/game/data_huds.dm | 8 +- code/game/gamemodes/antag_spawner.dm | 48 +- code/game/gamemodes/antag_spawner_cit.dm | 8 +- .../gamemodes/changeling/powers/mutations.dm | 36 +- .../gamemodes/changeling/powers/tiny_prick.dm | 8 +- .../clock_effects/spatial_gateway.dm | 2 +- .../clock_helpers/clock_powerdrain.dm | 8 +- .../clock_items/clock_components.dm | 2 +- .../clock_items/replica_fabricator.dm | 2 +- .../clock_mobs/clockwork_marauder.dm | 4 +- .../gamemodes/clock_cult/clock_structure.dm | 2 +- .../clock_structures/interdiction_lens.dm | 2 +- .../clock_structures/ocular_warden.dm | 4 +- .../clock_cult/clock_structures/wall_gear.dm | 4 +- code/game/gamemodes/cult/cult.dm | 6 +- code/game/gamemodes/cult/cult_items.dm | 30 +- code/game/gamemodes/cult/cult_structures.dm | 8 +- code/game/gamemodes/cult/ritual.dm | 18 +- code/game/gamemodes/cult/runes.dm | 30 +- code/game/gamemodes/cult/supply.dm | 20 +- code/game/gamemodes/cult/talisman.dm | 78 +- code/game/gamemodes/devil/devil.dm | 4 +- code/game/gamemodes/devil/devilinfo.dm | 4 +- code/game/gamemodes/gang/gang.dm | 2 +- code/game/gamemodes/gang/gang_items.dm | 36 +- code/game/gamemodes/gang/gang_pen.dm | 8 +- .../gamemodes/malfunction/Malf_Modules.dm | 6 +- code/game/gamemodes/meteor/meteors.dm | 22 +- .../miniantags/abduction/abduction_gear.dm | 70 +- .../miniantags/abduction/abduction_outfits.dm | 12 +- .../miniantags/abduction/abduction_surgery.dm | 2 +- .../gamemodes/miniantags/abduction/gland.dm | 2 +- .../miniantags/abduction/machinery/console.dm | 2 +- .../abduction/machinery/dispenser.dm | 2 +- .../abduction/machinery/experiment.dm | 2 +- .../gamemodes/miniantags/bot_swarm/swarmer.dm | 10 +- code/game/gamemodes/miniantags/hades/hades.dm | 18 +- .../miniantags/hades/hades_chapel.dm | 18 +- code/game/gamemodes/miniantags/morph/morph.dm | 2 +- .../gamemodes/miniantags/revenant/revenant.dm | 22 +- code/game/gamemodes/nuclear/nuclear.dm | 34 +- .../gamemodes/nuclear/nuclear_challenge.dm | 4 +- code/game/gamemodes/nuclear/nuclearbomb.dm | 42 +- code/game/gamemodes/nuclear/pinpointer.dm | 30 +- code/game/gamemodes/objective.dm | 4 +- code/game/gamemodes/objective_items.dm | 40 +- code/game/gamemodes/sandbox/h_sandbox.dm | 26 +- code/game/gamemodes/wizard/artefact.dm | 48 +- code/game/gamemodes/wizard/spellbook.dm | 148 +- code/game/gamemodes/wizard/wizard.dm | 8 +- code/game/machinery/PDApainter.dm | 4 +- code/game/machinery/Sleeper.dm | 6 +- code/game/machinery/_machinery.dm | 24 +- code/game/machinery/announcement_system.dm | 4 +- code/game/machinery/aug_manipulator.dm | 4 +- code/game/machinery/autolathe.dm | 12 +- code/game/machinery/buttons.dm | 8 +- code/game/machinery/camera/camera.dm | 18 +- code/game/machinery/camera/camera_assembly.dm | 14 +- code/game/machinery/cell_charger.dm | 8 +- code/game/machinery/cloning.dm | 18 +- code/game/machinery/computer/Operating.dm | 2 +- code/game/machinery/computer/_computer.dm | 8 +- code/game/machinery/computer/aifixer.dm | 4 +- code/game/machinery/computer/apc_control.dm | 6 +- code/game/machinery/computer/arcade.dm | 38 +- code/game/machinery/computer/atmos_alert.dm | 2 +- code/game/machinery/computer/atmos_control.dm | 4 +- .../game/machinery/computer/buildandrepair.dm | 28 +- code/game/machinery/computer/camera.dm | 4 +- code/game/machinery/computer/card.dm | 22 +- code/game/machinery/computer/cloning.dm | 16 +- .../game/machinery/computer/communications.dm | 14 +- code/game/machinery/computer/crew.dm | 4 +- code/game/machinery/computer/dna_console.dm | 16 +- .../machinery/computer/gulag_teleporter.dm | 8 +- .../machinery/computer/launchpad_control.dm | 2 +- code/game/machinery/computer/law.dm | 8 +- code/game/machinery/computer/medical.dm | 28 +- code/game/machinery/computer/message.dm | 14 +- .../machinery/computer/monastery_shuttle.dm | 2 +- code/game/machinery/computer/prisoner.dm | 20 +- code/game/machinery/computer/robot.dm | 2 +- code/game/machinery/computer/security.dm | 36 +- code/game/machinery/computer/station_alert.dm | 2 +- code/game/machinery/computer/teleporter.dm | 4 +- code/game/machinery/constructable_frame.dm | 32 +- code/game/machinery/dance_machine.dm | 2 +- code/game/machinery/deployable.dm | 14 +- code/game/machinery/dna_scanner.dm | 8 +- code/game/machinery/doors/airlock.dm | 66 +- .../machinery/doors/airlock_electronics.dm | 8 +- code/game/machinery/doors/airlock_types.dm | 4 +- code/game/machinery/doors/door.dm | 8 +- code/game/machinery/doors/firedoor.dm | 30 +- code/game/machinery/doors/windowdoor.dm | 16 +- code/game/machinery/doppler_array.dm | 2 +- code/game/machinery/droneDispenser.dm | 6 +- code/game/machinery/firealarm.dm | 20 +- code/game/machinery/flasher.dm | 10 +- code/game/machinery/gulag_item_reclaimer.dm | 6 +- code/game/machinery/gulag_teleporter.dm | 18 +- code/game/machinery/hologram.dm | 4 +- code/game/machinery/igniter.dm | 4 +- code/game/machinery/iv_drip.dm | 12 +- code/game/machinery/iv_drip.dm.rej | 2 +- code/game/machinery/launch_pad.dm | 4 +- code/game/machinery/limbgrower.dm | 8 +- code/game/machinery/navbeacon.dm | 4 +- code/game/machinery/newscaster.dm | 46 +- code/game/machinery/pipe/construction.dm | 8 +- code/game/machinery/pipe/pipe_dispenser.dm | 2 +- .../machinery/porta_turret/portable_turret.dm | 44 +- .../porta_turret/portable_turret_construct.dm | 34 +- .../porta_turret/portable_turret_cover.dm | 2 +- code/game/machinery/quantum_pad.dm | 8 +- code/game/machinery/recharger.dm | 32 +- code/game/machinery/rechargestation.dm | 8 +- code/game/machinery/recycler.dm | 8 +- code/game/machinery/requests_console.dm | 12 +- code/game/machinery/shieldgen.dm | 8 +- code/game/machinery/slotmachine.dm | 20 +- code/game/machinery/spaceheater.dm | 14 +- code/game/machinery/suit_storage_unit.dm | 16 +- code/game/machinery/syndicatebeacon.dm | 4 +- code/game/machinery/syndicatebomb.dm | 98 +- .../telecomms/computers/logbrowser.dm | 2 +- .../telecomms/computers/telemonitor.dm | 2 +- .../telecomms/machines/broadcaster.dm | 2 +- code/game/machinery/telecomms/machines/bus.dm | 2 +- code/game/machinery/telecomms/machines/hub.dm | 2 +- .../machinery/telecomms/machines/processor.dm | 2 +- .../machinery/telecomms/machines/receiver.dm | 2 +- .../machinery/telecomms/machines/relay.dm | 2 +- .../machinery/telecomms/machines/server.dm | 2 +- code/game/machinery/teleporter.dm | 14 +- code/game/machinery/vending.dm | 288 +- code/game/machinery/washing_machine.dm | 16 +- code/game/mecha/combat/combat.dm | 4 +- code/game/mecha/combat/gygax.dm | 2 +- .../mecha/equipment/tools/medical_tools.dm | 12 +- code/game/mecha/equipment/weapons/weapons.dm | 10 +- code/game/mecha/mech_bay.dm | 6 +- code/game/mecha/mech_fabricator.dm | 12 +- code/game/mecha/mecha.dm | 4 +- code/game/mecha/mecha_construction_paths.dm | 468 +- code/game/mecha/mecha_control_console.dm | 6 +- code/game/mecha/mecha_defense.dm | 18 +- code/game/mecha/mecha_parts.dm | 46 +- code/game/mecha/mecha_topic.dm | 4 +- code/game/mecha/mecha_wreckage.dm | 8 +- code/game/mecha/working/ripley.dm | 2 +- code/game/objects/effects/contraband.dm | 16 +- code/game/objects/effects/decals/cleanable.dm | 4 +- code/game/objects/effects/manifest.dm | 2 +- code/game/objects/effects/mines.dm | 2 +- code/game/objects/effects/portals.dm | 2 +- .../objects/effects/spawners/bombspawner.dm | 4 +- code/game/objects/effects/spawners/bundle.dm | 8 +- .../game/objects/effects/spawners/lootdrop.dm | 50 +- code/game/objects/effects/wanted_poster.dm | 6 +- code/game/objects/items.dm | 30 +- code/game/objects/items/apc_frame.dm | 8 +- code/game/objects/items/candle.dm | 2 +- code/game/objects/items/control_wand.dm | 28 +- code/game/objects/items/crayons.dm | 8 +- code/game/objects/items/devices/PDA/PDA.dm | 38 +- .../objects/items/devices/PDA/PDA_types.dm | 70 +- code/game/objects/items/devices/PDA/cart.dm | 68 +- .../objects/items/devices/PDA/virus_cart.dm | 26 +- .../objects/items/devices/chameleonproj.dm | 4 +- .../objects/items/devices/geiger_counter.dm | 2 +- .../objects/items/devices/laserpointer.dm | 8 +- .../objects/items/devices/lightreplacer.dm | 16 +- code/game/objects/items/devices/powersink.dm | 2 +- .../items/devices/radio/electropack.dm | 2 +- .../objects/items/devices/radio/headset.dm | 4 +- .../objects/items/devices/radio/intercom.dm | 8 +- .../game/objects/items/devices/radio/radio.dm | 8 +- .../objects/items/devices/taperecorder.dm | 6 +- .../objects/items/devices/transfer_valve.dm | 6 +- code/game/objects/items/latexballoon.dm | 6 +- code/game/objects/items/nuke_tools.dm | 4 +- code/game/objects/items/religion.dm | 30 +- code/game/objects/items/robot/robot_items.dm | 30 +- code/game/objects/items/robot/robot_parts.dm | 6 +- .../objects/items/robot/robot_upgrades.dm | 30 +- code/game/objects/items/shooting_range.dm | 4 +- code/game/objects/items/stacks/bscrystal.dm | 16 +- code/game/objects/items/stacks/rods.dm | 10 +- .../game/objects/items/stacks/sheets/glass.dm | 18 +- .../objects/items/stacks/sheets/leather.dm | 12 +- .../game/objects/items/stacks/sheets/light.dm | 2 +- .../objects/items/stacks/sheets/mineral.dm | 10 +- .../items/stacks/sheets/sheet_types.dm | 46 +- code/game/objects/items/stacks/stack.dm | 2 +- code/game/objects/items/stacks/telecrystal.dm | 6 +- code/game/objects/items/stacks/tiles/light.dm | 2 +- .../objects/items/stacks/tiles/tile_types.dm | 4 +- code/game/objects/items/stacks/wrap.dm | 10 +- code/game/objects/items/theft_tools.dm | 28 +- code/game/objects/items/toys.dm | 16 +- code/game/objects/items/trash.dm | 2 +- code/game/objects/items/weapons/AI_modules.dm | 128 +- code/game/objects/items/weapons/RCD.dm | 88 +- code/game/objects/items/weapons/RCL.dm | 30 +- code/game/objects/items/weapons/RPD.dm | 20 +- code/game/objects/items/weapons/RSF.dm | 40 +- .../objects/items/weapons/airlock_painter.dm | 16 +- code/game/objects/items/weapons/cards_ids.dm | 112 +- code/game/objects/items/weapons/charter.dm | 16 +- .../objects/items/weapons/chrono_eraser.dm | 44 +- .../objects/items/weapons/cigs_lighters.dm | 74 +- .../weapons/circuitboards/circuitboard.dm | 12 +- .../circuitboards/computer_circuitboards.dm | 152 +- .../circuitboards/machine_circuitboards.dm | 486 +- code/game/objects/items/weapons/clown.dm | 12 +- .../game/objects/items/weapons/clown_items.dm | 38 +- code/game/objects/items/weapons/cosmetics.dm | 24 +- code/game/objects/items/weapons/courtroom.dm | 10 +- code/game/objects/items/weapons/defib.dm | 108 +- code/game/objects/items/weapons/dice.dm | 84 +- .../objects/items/weapons/dna_injector.dm | 112 +- .../objects/items/weapons/extinguisher.dm | 22 +- .../objects/items/weapons/flamethrower.dm | 52 +- code/game/objects/items/weapons/gift.dm | 52 +- .../items/weapons/grenades/chem_grenade.dm | 160 +- .../items/weapons/grenades/clusterbuster.dm | 74 +- .../items/weapons/grenades/emgrenade.dm | 4 +- .../items/weapons/grenades/flashbang.dm | 6 +- .../items/weapons/grenades/ghettobomb.dm | 14 +- .../objects/items/weapons/grenades/grenade.dm | 26 +- .../objects/items/weapons/grenades/plastic.dm | 54 +- .../items/weapons/grenades/smokebomb.dm | 8 +- .../items/weapons/grenades/spawnergrenade.dm | 12 +- .../items/weapons/grenades/syndieminibomb.dm | 14 +- code/game/objects/items/weapons/handcuffs.dm | 94 +- code/game/objects/items/weapons/his_grace.dm | 28 +- .../objects/items/weapons/holosign_creator.dm | 18 +- .../objects/items/weapons/holy_weapons.dm | 86 +- .../objects/items/weapons/implants/implant.dm | 22 +- .../weapons/implants/implant_abductor.dm | 10 +- .../items/weapons/implants/implant_chem.dm | 20 +- .../items/weapons/implants/implant_clown.dm | 14 +- .../items/weapons/implants/implant_exile.dm | 12 +- .../weapons/implants/implant_explosive.dm | 30 +- .../items/weapons/implants/implant_freedom.dm | 14 +- .../items/weapons/implants/implant_gang.dm | 16 +- .../weapons/implants/implant_krav_maga.dm | 14 +- .../weapons/implants/implant_loyality.dm | 16 +- .../items/weapons/implants/implant_misc.dm | 18 +- .../items/weapons/implants/implant_storage.dm | 24 +- .../items/weapons/implants/implant_track.dm | 18 +- .../items/weapons/implants/implantcase.dm | 28 +- .../items/weapons/implants/implantchair.dm | 4 +- .../items/weapons/implants/implanter.dm | 22 +- .../items/weapons/implants/implantpad.dm | 18 +- .../items/weapons/implants/implantuplink.dm | 20 +- code/game/objects/items/weapons/inducer.dm | 44 +- code/game/objects/items/weapons/kitchen.dm | 30 +- code/game/objects/items/weapons/manuals.dm | 46 +- .../objects/items/weapons/melee/energy.dm | 66 +- code/game/objects/items/weapons/melee/misc.dm | 62 +- .../items/weapons/melee/transforming.dm | 16 +- .../objects/items/weapons/miscellaneous.dm | 4 +- code/game/objects/items/weapons/mop.dm | 30 +- code/game/objects/items/weapons/paint.dm | 26 +- code/game/objects/items/weapons/paiwire.dm | 4 +- .../objects/items/weapons/pneumaticCannon.dm | 56 +- code/game/objects/items/weapons/powerfist.dm | 20 +- code/game/objects/items/weapons/scrolls.dm | 10 +- code/game/objects/items/weapons/sharpener.dm | 12 +- code/game/objects/items/weapons/shields.dm | 28 +- code/game/objects/items/weapons/signs.dm | 10 +- .../items/weapons/singularityhammer.dm | 24 +- .../objects/items/weapons/storage/backpack.dm | 266 +- .../objects/items/weapons/storage/bags.dm | 70 +- .../objects/items/weapons/storage/belt.dm | 378 +- .../objects/items/weapons/storage/book.dm | 32 +- .../objects/items/weapons/storage/boxes.dm | 596 +-- .../items/weapons/storage/briefcase.dm | 28 +- .../objects/items/weapons/storage/dakis.dm | 4 +- .../objects/items/weapons/storage/fancy.dm | 80 +- .../objects/items/weapons/storage/firstaid.dm | 110 +- .../objects/items/weapons/storage/internal.dm | 62 +- .../objects/items/weapons/storage/lockbox.dm | 48 +- .../objects/items/weapons/storage/secure.dm | 48 +- .../objects/items/weapons/storage/storage.dm | 92 +- .../objects/items/weapons/storage/toolbox.dm | 102 +- .../items/weapons/storage/uplink_kits.dm | 298 +- .../objects/items/weapons/storage/wallets.dm | 56 +- code/game/objects/items/weapons/stunbaton.dm | 42 +- .../objects/items/weapons/tanks/jetpack.dm | 50 +- .../objects/items/weapons/tanks/tank_types.dm | 46 +- .../game/objects/items/weapons/tanks/tanks.dm | 38 +- .../objects/items/weapons/tanks/watertank.dm | 112 +- .../objects/items/weapons/teleportation.dm | 20 +- code/game/objects/items/weapons/teleprod.dm | 10 +- code/game/objects/items/weapons/tools.dm | 166 +- code/game/objects/items/weapons/twohanded.dm | 170 +- .../objects/items/weapons/vending_items.dm | 22 +- code/game/objects/items/weapons/weaponry.dm | 121 +- code/game/objects/objs.dm | 2 +- code/game/objects/structures/ai_core.dm | 32 +- code/game/objects/structures/artstuff.dm | 22 +- code/game/objects/structures/barsigns.dm | 2 +- .../objects/structures/beds_chairs/bed.dm | 6 +- .../objects/structures/beds_chairs/chair.dm | 4 +- code/game/objects/structures/bedsheet_bin.dm | 82 +- .../structures/crates_lockers/closets.dm | 14 +- .../crates_lockers/closets/bodybag.dm | 4 +- .../crates_lockers/closets/cardboardbox.dm | 4 +- .../crates_lockers/closets/fitness.dm | 4 +- .../crates_lockers/closets/gimmick.dm | 22 +- .../crates_lockers/closets/job_closets.dm | 110 +- .../crates_lockers/closets/l3closet.dm | 6 +- .../crates_lockers/closets/secure/bar.dm | 2 +- .../crates_lockers/closets/secure/cargo.dm | 4 +- .../closets/secure/engineering.dm | 44 +- .../crates_lockers/closets/secure/freezer.dm | 22 +- .../closets/secure/hydroponics.dm | 8 +- .../crates_lockers/closets/secure/medical.dm | 46 +- .../crates_lockers/closets/secure/misc.dm | 34 +- .../crates_lockers/closets/secure/personal.dm | 10 +- .../closets/secure/scientist.dm | 10 +- .../crates_lockers/closets/secure/security.dm | 98 +- .../crates_lockers/closets/syndicate.dm | 14 +- .../crates_lockers/closets/utility_closets.dm | 34 +- .../crates_lockers/closets/wardrobe.dm | 2 +- .../structures/crates_lockers/crates.dm | 24 +- .../structures/crates_lockers/crates/bins.dm | 8 +- .../crates_lockers/crates/critter.dm | 2 +- .../structures/crates_lockers/crates/large.dm | 4 +- .../crates_lockers/crates/wooden.dm | 8 +- code/game/objects/structures/displaycase.dm | 24 +- code/game/objects/structures/door_assembly.dm | 28 +- code/game/objects/structures/dresser.dm | 2 +- code/game/objects/structures/electricchair.dm | 4 +- code/game/objects/structures/extinguisher.dm | 10 +- code/game/objects/structures/false_walls.dm | 20 +- code/game/objects/structures/fireaxe.dm | 14 +- code/game/objects/structures/fireplace.dm | 6 +- code/game/objects/structures/flora.dm | 18 +- code/game/objects/structures/fluff.dm | 2 +- .../objects/structures/ghost_role_spawners.dm | 64 +- code/game/objects/structures/girders.dm | 28 +- code/game/objects/structures/grille.dm | 14 +- code/game/objects/structures/guncase.dm | 6 +- code/game/objects/structures/holosign.dm | 2 +- code/game/objects/structures/janicart.dm | 24 +- code/game/objects/structures/kitchen_spike.dm | 6 +- code/game/objects/structures/ladders.dm | 2 +- code/game/objects/structures/lattice.dm | 2 +- code/game/objects/structures/mineral_doors.dm | 8 +- code/game/objects/structures/mirror.dm | 6 +- code/game/objects/structures/mop_bucket.dm | 2 +- code/game/objects/structures/morgue.dm | 6 +- code/game/objects/structures/musician.dm | 2 +- code/game/objects/structures/noticeboard.dm | 10 +- code/game/objects/structures/plasticflaps.dm | 4 +- code/game/objects/structures/reflector.dm | 8 +- code/game/objects/structures/showcase.dm | 4 +- code/game/objects/structures/signs.dm | 4 +- code/game/objects/structures/statues.dm | 18 +- code/game/objects/structures/table_frames.dm | 2 +- code/game/objects/structures/tables_racks.dm | 34 +- .../game/objects/structures/tank_dispenser.dm | 14 +- .../structures/transit_tubes/station.dm | 2 +- .../structures/transit_tubes/transit_tube.dm | 4 +- .../transit_tube_construction.dm | 2 +- .../transit_tubes/transit_tube_pod.dm | 2 +- code/game/objects/structures/watercloset.dm | 32 +- .../objects/structures/windoor_assembly.dm | 22 +- code/game/objects/structures/window.dm | 26 +- code/game/objects/weapons.dm | 2 +- code/game/shuttle_engines.dm | 6 +- code/game/turfs/simulated/dirtystation.dm | 2 +- code/game/turfs/simulated/floor.dm | 10 +- .../game/turfs/simulated/floor/fancy_floor.dm | 18 +- .../game/turfs/simulated/floor/light_floor.dm | 2 +- .../turfs/simulated/floor/mineral_floor.dm | 6 +- code/game/turfs/simulated/floor/misc_floor.dm | 2 +- code/game/turfs/simulated/floor/plating.dm | 4 +- .../turfs/simulated/floor/plating/asteroid.dm | 20 +- .../game/turfs/simulated/floor/reinf_floor.dm | 4 +- code/game/turfs/simulated/lava.dm | 4 +- code/game/turfs/simulated/minerals.dm | 28 +- .../turfs/simulated/wall/mineral_walls.dm | 4 +- code/game/turfs/simulated/wall/reinf_walls.dm | 50 +- code/game/turfs/simulated/walls.dm | 26 +- code/game/turfs/space/space.dm | 4 +- code/game/turfs/turf.dm | 8 +- code/modules/admin/create_object.dm | 2 +- code/modules/admin/fun_balloon.dm | 2 +- code/modules/admin/player_panel.dm | 2 +- code/modules/admin/topic.dm | 4 +- code/modules/admin/verbs/SDQL2/SDQL_2.dm | 2 +- code/modules/admin/verbs/debug.dm | 18 +- code/modules/admin/verbs/machine_upgrade.dm | 2 +- code/modules/admin/verbs/manipulate_organs.dm | 12 +- code/modules/admin/verbs/onlyone.dm | 16 +- code/modules/admin/verbs/randomverbs.dm | 2 +- code/modules/assembly/assembly.dm | 4 +- code/modules/assembly/bomb.dm | 14 +- code/modules/assembly/flash.dm | 4 +- code/modules/assembly/health.dm | 2 +- code/modules/assembly/holder.dm | 4 +- code/modules/assembly/shock_kit.dm | 4 +- code/modules/assembly/signaler.dm | 4 +- code/modules/assembly/voice.dm | 2 +- .../atmospherics/machinery/airalarm.dm | 18 +- .../atmospherics/machinery/atmosmachinery.dm | 4 +- .../components/unary_devices/cryo.dm | 8 +- .../components/unary_devices/thermomachine.dm | 14 +- .../components/unary_devices/vent_pump.dm | 4 +- .../components/unary_devices/vent_scrubber.dm | 6 +- .../atmospherics/machinery/other/meter.dm | 4 +- .../atmospherics/machinery/pipes/pipes.dm | 2 +- .../machinery/portable/canister.dm | 6 +- .../portable/portable_atmospherics.dm | 10 +- .../machinery/portable/scrubber.dm | 2 +- code/modules/awaymissions/capture_the_flag.dm | 60 +- code/modules/awaymissions/corpse.dm | 20 +- code/modules/awaymissions/exile.dm | 12 +- code/modules/awaymissions/gateway.dm | 4 +- .../awaymissions/mission_code/Academy.dm | 46 +- .../awaymissions/mission_code/Cabin.dm | 2 +- .../awaymissions/mission_code/caves.dm | 16 +- .../awaymissions/mission_code/centcomAway.dm | 4 +- .../mission_code/moonoutpost19.dm | 40 +- .../awaymissions/mission_code/research.dm | 2 +- .../awaymissions/mission_code/snowdin.dm | 116 +- .../mission_code/stationCollision.dm | 44 +- .../awaymissions/mission_code/wildwest.dm | 10 +- code/modules/awaymissions/pamphlet.dm | 6 +- code/modules/awaymissions/signpost.dm | 2 +- .../modules/awaymissions/super_secret_room.dm | 4 +- code/modules/cargo/console.dm | 8 +- code/modules/cargo/exports/gear.dm | 2 +- code/modules/cargo/exports/large_objects.dm | 2 +- code/modules/cargo/exports/manifest.dm | 22 +- code/modules/cargo/exports/materials.dm | 10 +- code/modules/cargo/exports/parts.dm | 4 +- code/modules/cargo/exports/research.dm | 6 +- code/modules/cargo/exports/tools.dm | 26 +- code/modules/cargo/exports/weapons.dm | 24 +- code/modules/cargo/order.dm | 14 +- code/modules/cargo/packs.dm | 646 +-- code/modules/clothing/chameleon.dm | 68 +- code/modules/clothing/clothing.dm | 6 +- code/modules/clothing/glasses/glasses.dm | 2 +- code/modules/clothing/gloves/color.dm | 4 +- code/modules/clothing/head/helmet.dm | 2 +- code/modules/clothing/head/jobs.dm | 4 +- code/modules/clothing/head/misc.dm | 2 +- code/modules/clothing/masks/hailer.dm | 6 +- code/modules/clothing/outfits/ert.dm | 114 +- code/modules/clothing/outfits/standard.dm | 142 +- code/modules/clothing/shoes/bananashoes.dm | 2 +- code/modules/clothing/shoes/colour.dm | 4 +- code/modules/clothing/shoes/miscellaneous.dm | 14 +- .../modules/clothing/spacesuits/chronosuit.dm | 2 +- .../modules/clothing/spacesuits/flightsuit.dm | 40 +- code/modules/clothing/spacesuits/hardsuit.dm | 38 +- .../clothing/spacesuits/miscellaneous.dm | 20 +- code/modules/clothing/spacesuits/plasmamen.dm | 2 +- code/modules/clothing/spacesuits/syndi.dm | 2 +- code/modules/clothing/spacesuits/vg_spess.dm | 6 +- code/modules/clothing/suits/armor.dm | 6 +- code/modules/clothing/suits/bio.dm | 2 +- code/modules/clothing/suits/cloaks.dm | 4 +- code/modules/clothing/suits/jobs.dm | 24 +- code/modules/clothing/suits/labcoat.dm | 2 +- code/modules/clothing/suits/miscellaneous.dm | 40 +- code/modules/clothing/suits/utility.dm | 6 +- code/modules/clothing/suits/vg_suits.dm | 2 +- code/modules/clothing/suits/wiz_robe.dm | 2 +- code/modules/clothing/under/accessories.dm | 6 +- code/modules/crafting/craft.dm | 8 +- code/modules/crafting/recipes.dm | 186 +- code/modules/detectivework/evidence.dm | 32 +- .../detectivework/footprints_and_rag.dm | 6 +- code/modules/detectivework/scanner.dm | 2 +- code/modules/events/holiday/halloween.dm | 28 +- code/modules/events/holiday/vday.dm | 22 +- code/modules/events/holiday/xmas.dm | 20 +- code/modules/events/shuttle_loan.dm | 12 +- code/modules/events/wizard/curseditems.dm | 2 +- code/modules/events/wizard/greentext.dm | 16 +- code/modules/events/wizard/rpgloot.dm | 4 +- code/modules/flufftext/Dreaming.dm | 2 +- code/modules/flufftext/Hallucination.dm | 28 +- code/modules/flufftext/Hallucination.dm.rej | 28 +- code/modules/food_and_drinks/drinks/drinks.dm | 90 +- .../food_and_drinks/drinks/drinks/bottle.dm | 84 +- .../drinks/drinks/drinkingglass.dm | 26 +- code/modules/food_and_drinks/food.dm | 6 +- .../modules/food_and_drinks/food/condiment.dm | 52 +- .../food_and_drinks/food/customizables.dm | 92 +- code/modules/food_and_drinks/food/snacks.dm | 66 +- .../food_and_drinks/food/snacks/dough.dm | 50 +- .../food_and_drinks/food/snacks/meat.dm | 150 +- .../food_and_drinks/food/snacks_bread.dm | 66 +- .../food_and_drinks/food/snacks_burgers.dm | 66 +- .../food_and_drinks/food/snacks_cake.dm | 80 +- .../food_and_drinks/food/snacks_egg.dm | 40 +- .../food_and_drinks/food/snacks_meat.dm | 66 +- .../food_and_drinks/food/snacks_other.dm | 126 +- .../food_and_drinks/food/snacks_pastry.dm | 72 +- .../food_and_drinks/food/snacks_pie.dm | 56 +- .../food_and_drinks/food/snacks_pizza.dm | 48 +- .../food_and_drinks/food/snacks_salad.dm | 32 +- .../food/snacks_sandwichtoast.dm | 26 +- .../food_and_drinks/food/snacks_soup.dm | 58 +- .../food_and_drinks/food/snacks_spaghetti.dm | 24 +- .../food_and_drinks/food/snacks_vend.dm | 18 +- .../kitchen_machinery/deep_fryer.dm | 28 +- .../kitchen_machinery/food_cart.dm | 20 +- .../kitchen_machinery/gibber.dm | 12 +- .../kitchen_machinery/icecream_vat.dm | 16 +- .../kitchen_machinery/juicer.dm | 74 +- .../kitchen_machinery/microwave.dm | 34 +- .../kitchen_machinery/monkeyrecycler.dm | 8 +- .../kitchen_machinery/processor.dm | 56 +- .../kitchen_machinery/smartfridge.dm | 60 +- code/modules/food_and_drinks/pizzabox.dm | 26 +- .../food_and_drinks/recipes/food_mixtures.dm | 22 +- .../recipes/tablecraft/recipes_bread.dm | 66 +- .../recipes/tablecraft/recipes_burger.dm | 160 +- .../recipes/tablecraft/recipes_cake.dm | 64 +- .../recipes/tablecraft/recipes_egg.dm | 24 +- .../recipes/tablecraft/recipes_meat.dm | 96 +- .../recipes/tablecraft/recipes_misc.dm | 196 +- .../recipes/tablecraft/recipes_pastry.dm | 158 +- .../recipes/tablecraft/recipes_pie.dm | 96 +- .../recipes/tablecraft/recipes_pizza.dm | 66 +- .../recipes/tablecraft/recipes_salad.dm | 94 +- .../recipes/tablecraft/recipes_sandwich.dm | 30 +- .../recipes/tablecraft/recipes_soup.dm | 168 +- .../recipes/tablecraft/recipes_spaghetti.dm | 48 +- code/modules/games/cards.dm | 52 +- code/modules/games/cas.dm | 2 +- code/modules/holiday/easter.dm | 70 +- code/modules/holiday/halloween.dm | 14 +- code/modules/holiday/holidays.dm | 4 +- code/modules/holodeck/items.dm | 24 +- code/modules/html_interface/cards/cards.dm | 2 +- code/modules/hydroponics/beekeeping/beebox.dm | 6 +- .../hydroponics/beekeeping/honeycomb.dm | 8 +- code/modules/hydroponics/biogenerator.dm | 30 +- code/modules/hydroponics/gene_modder.dm | 30 +- code/modules/hydroponics/grown.dm | 26 +- code/modules/hydroponics/grown/ambrosia.dm | 14 +- code/modules/hydroponics/grown/apple.dm | 12 +- code/modules/hydroponics/grown/banana.dm | 32 +- code/modules/hydroponics/grown/beans.dm | 8 +- code/modules/hydroponics/grown/berries.dm | 34 +- code/modules/hydroponics/grown/cannabis.dm | 20 +- code/modules/hydroponics/grown/cereals.dm | 20 +- code/modules/hydroponics/grown/chili.dm | 16 +- code/modules/hydroponics/grown/citrus.dm | 28 +- .../hydroponics/grown/cocoa_vanilla.dm | 8 +- code/modules/hydroponics/grown/corn.dm | 22 +- code/modules/hydroponics/grown/eggplant.dm | 10 +- code/modules/hydroponics/grown/flowers.dm | 38 +- .../modules/hydroponics/grown/grass_carpet.dm | 12 +- code/modules/hydroponics/grown/kudzu.dm | 4 +- code/modules/hydroponics/grown/melon.dm | 10 +- code/modules/hydroponics/grown/misc.dm | 28 +- code/modules/hydroponics/grown/mushrooms.dm | 56 +- code/modules/hydroponics/grown/nettle.dm | 24 +- code/modules/hydroponics/grown/onion.dm | 20 +- code/modules/hydroponics/grown/potato.dm | 14 +- code/modules/hydroponics/grown/pumpkin.dm | 10 +- code/modules/hydroponics/grown/random.dm | 4 +- code/modules/hydroponics/grown/replicapod.dm | 4 +- code/modules/hydroponics/grown/root.dm | 20 +- code/modules/hydroponics/grown/tea_coffee.dm | 16 +- code/modules/hydroponics/grown/tobacco.dm | 8 +- code/modules/hydroponics/grown/tomato.dm | 24 +- code/modules/hydroponics/grown/towercap.dm | 28 +- code/modules/hydroponics/growninedible.dm | 14 +- code/modules/hydroponics/hydroitemdefines.dm | 52 +- code/modules/hydroponics/hydroponics.dm | 44 +- code/modules/hydroponics/plant_genes.dm | 50 +- code/modules/hydroponics/seed_extractor.dm | 22 +- code/modules/hydroponics/seeds.dm | 4 +- code/modules/jobs/access.dm | 2 +- code/modules/jobs/job_types/captain.dm | 18 +- code/modules/jobs/job_types/cargo_service.dm | 40 +- code/modules/jobs/job_types/civilian.dm | 32 +- .../jobs/job_types/civilian_chaplain.dm | 10 +- code/modules/jobs/job_types/engineering.dm | 40 +- code/modules/jobs/job_types/job.dm | 22 +- code/modules/jobs/job_types/medical.dm | 38 +- code/modules/jobs/job_types/science.dm | 22 +- code/modules/jobs/job_types/security.dm | 60 +- code/modules/language/codespeak.dm | 12 +- code/modules/library/lib_codex_gigas.dm | 16 +- code/modules/library/lib_items.dm | 64 +- code/modules/library/lib_machines.dm | 34 +- code/modules/library/random_books.dm | 18 +- code/modules/mining/abandoned_crates.dm | 78 +- code/modules/mining/aux_base.dm | 2 +- code/modules/mining/aux_base_camera.dm | 10 +- .../modules/mining/equipment/explorer_gear.dm | 2 +- .../mining/equipment/kinetic_crusher.dm | 32 +- .../mining/equipment/lazarus_injector.dm | 8 +- code/modules/mining/equipment/mining_tools.dm | 24 +- .../mining/equipment/regenerative_core.dm | 4 +- code/modules/mining/equipment/resonator.dm | 12 +- code/modules/mining/equipment/survival_pod.dm | 54 +- code/modules/mining/fulton.dm | 14 +- code/modules/mining/laborcamp/laborshuttle.dm | 4 +- code/modules/mining/laborcamp/laborstacker.dm | 12 +- code/modules/mining/lavaland/ash_flora.dm | 30 +- .../mining/lavaland/necropolis_chests.dm | 142 +- code/modules/mining/machine_processing.dm | 4 +- code/modules/mining/machine_redemption.dm | 28 +- code/modules/mining/machine_unloading.dm | 2 +- code/modules/mining/machine_vending.dm | 114 +- code/modules/mining/mine_items.dm | 22 +- code/modules/mining/minebot.dm | 16 +- code/modules/mining/mint.dm | 4 +- code/modules/mining/money_bag.dm | 20 +- code/modules/mining/ores_coins.dm | 112 +- code/modules/mining/satchel_ore_boxdm.dm | 20 +- code/modules/mob/inventory.dm | 2 +- code/modules/mob/living/bloodcrawl.dm | 8 +- code/modules/mob/living/carbon/alien/alien.dm | 4 +- .../living/carbon/alien/humanoid/humanoid.dm | 2 +- .../mob/living/carbon/alien/humanoid/queen.dm | 2 +- code/modules/mob/living/carbon/carbon.dm | 14 +- .../mob/living/carbon/carbon_defines.dm | 4 +- .../mob/living/carbon/carbon_movement.dm | 2 +- .../mob/living/carbon/human/examine.dm | 2 +- code/modules/mob/living/carbon/human/human.dm | 20 +- .../mob/living/carbon/human/human_helpers.dm | 14 +- .../mob/living/carbon/human/interactive.dm | 160 +- code/modules/mob/living/carbon/human/say.dm | 2 +- .../mob/living/carbon/human/species.dm | 14 +- .../carbon/human/species_types/flypeople.dm | 4 +- .../carbon/human/species_types/furrypeople.dm | 4 +- .../carbon/human/species_types/golems.dm | 42 +- .../carbon/human/species_types/jellypeople.dm | 2 +- .../human/species_types/lizardpeople.dm | 2 +- .../carbon/human/species_types/podpeople.dm | 2 +- .../human/species_types/shadowpeople.dm | 2 +- .../carbon/human/species_types/skeletons.dm | 2 +- .../carbon/human/species_types/zombies.dm | 4 +- code/modules/mob/living/carbon/inventory.dm | 2 +- .../mob/living/carbon/monkey/combat.dm | 12 +- .../mob/living/carbon/monkey/monkey.dm | 10 +- code/modules/mob/living/emote.dm | 2 +- code/modules/mob/living/living.dm | 8 +- code/modules/mob/living/living_defense.dm | 4 +- code/modules/mob/living/silicon/ai/death.dm | 2 +- code/modules/mob/living/silicon/pai/pai.dm | 4 +- .../mob/living/silicon/pai/software.dm | 2 +- .../mob/living/silicon/robot/inventory.dm | 12 +- .../modules/mob/living/silicon/robot/robot.dm | 68 +- .../mob/living/silicon/robot/robot_modules.dm | 302 +- .../mob/living/simple_animal/bot/bot.dm | 16 +- .../mob/living/simple_animal/bot/cleanbot.dm | 6 +- .../living/simple_animal/bot/construction.dm | 82 +- .../mob/living/simple_animal/bot/ed209bot.dm | 16 +- .../mob/living/simple_animal/bot/floorbot.dm | 2 +- .../mob/living/simple_animal/bot/medbot.dm | 8 +- .../mob/living/simple_animal/bot/mulebot.dm | 10 +- .../mob/living/simple_animal/bot/secbot.dm | 16 +- .../mob/living/simple_animal/constructs.dm | 2 +- .../mob/living/simple_animal/corpse.dm | 18 +- .../mob/living/simple_animal/friendly/cat.dm | 8 +- .../mob/living/simple_animal/friendly/crab.dm | 2 +- .../mob/living/simple_animal/friendly/dog.dm | 12 +- .../simple_animal/friendly/drone/_drone.dm | 4 +- .../friendly/drone/extra_drone_types.dm | 12 +- .../friendly/drone/interaction.dm | 4 +- .../simple_animal/friendly/farm_animals.dm | 22 +- .../mob/living/simple_animal/friendly/fox.dm | 2 +- .../living/simple_animal/friendly/mouse.dm | 6 +- .../mob/living/simple_animal/friendly/pet.dm | 2 +- .../living/simple_animal/friendly/sloth.dm | 2 +- .../living/simple_animal/guardian/guardian.dm | 40 +- .../mob/living/simple_animal/hostile/alien.dm | 6 +- .../mob/living/simple_animal/hostile/bear.dm | 4 +- .../mob/living/simple_animal/hostile/bees.dm | 4 +- .../mob/living/simple_animal/hostile/carp.dm | 2 +- .../simple_animal/hostile/giant_spider.dm | 4 +- .../simple_animal/hostile/jungle_mobs.dm | 4 +- .../simple_animal/hostile/killertomato.dm | 2 +- .../hostile/megafauna/blood_drunk_miner.dm | 10 +- .../hostile/megafauna/colossus.dm | 6 +- .../simple_animal/hostile/megafauna/dragon.dm | 2 +- .../hostile/megafauna/hierophant.dm | 12 +- .../simple_animal/hostile/megafauna/legion.dm | 6 +- .../mob/living/simple_animal/hostile/mimic.dm | 16 +- .../hostile/mining_mobs/basilisk.dm | 6 +- .../hostile/mining_mobs/goldgrub.dm | 12 +- .../hostile/mining_mobs/goliath.dm | 2 +- .../hostile/mining_mobs/gutlunch.dm | 2 +- .../hostile/mining_mobs/hivelord.dm | 50 +- .../living/simple_animal/hostile/mushroom.dm | 6 +- .../simple_animal/hostile/nanotrasen.dm | 4 +- .../living/simple_animal/hostile/pirate.dm | 6 +- .../simple_animal/hostile/retaliate/bat.dm | 2 +- .../simple_animal/hostile/retaliate/frog.dm | 4 +- .../simple_animal/hostile/retaliate/ghost.dm | 2 +- .../hostile/retaliate/spaceman.dm | 2 +- .../living/simple_animal/hostile/russian.dm | 10 +- .../living/simple_animal/hostile/skeleton.dm | 4 +- .../living/simple_animal/hostile/stickman.dm | 2 +- .../living/simple_animal/hostile/wizard.dm | 4 +- .../mob/living/simple_animal/parrot.dm | 14 +- .../modules/mob/living/simple_animal/shade.dm | 2 +- .../mob/living/simple_animal/simple_animal.dm | 6 +- code/modules/mob/mob.dm | 4 +- code/modules/mob/mob_defines.dm | 2 +- code/modules/mob/mob_helpers.dm | 2 +- code/modules/mob/transform_procs.dm | 8 +- code/modules/modular_computers/NTNet/NTNet.dm | 2 +- .../modular_computers/NTNet/NTNet_relay.dm | 2 +- .../computers/item/computer.dm | 46 +- .../computers/item/computer_components.dm | 6 +- .../computers/item/computer_damage.dm | 4 +- .../computers/item/computer_power.dm | 14 +- .../computers/item/computer_ui.dm | 8 +- .../computers/item/laptop_presets.dm | 10 +- .../computers/item/tablet_presets.dm | 30 +- .../computers/machinery/console_presets.dm | 18 +- .../computers/machinery/modular_computer.dm | 4 +- .../computers/machinery/modular_console.dm | 14 +- .../file_system/computer_file.dm | 2 +- .../modular_computers/file_system/program.dm | 8 +- .../file_system/programs/airestorer.dm | 6 +- .../file_system/programs/antagonist/dos.dm | 2 +- .../programs/antagonist/revelation.dm | 6 +- .../file_system/programs/card.dm | 36 +- .../file_system/programs/configurator.dm | 8 +- .../file_system/programs/file_browser.dm | 10 +- .../file_system/programs/ntdownloader.dm | 6 +- .../file_system/programs/ntnrc_client.dm | 2 +- .../file_system/programs/nttransfer.dm | 6 +- .../modules/modular_computers/hardware/CPU.dm | 10 +- .../modular_computers/hardware/_hardware.dm | 24 +- .../modular_computers/hardware/ai_slot.dm | 16 +- .../hardware/battery_module.dm | 22 +- .../modular_computers/hardware/card_slot.dm | 28 +- .../modular_computers/hardware/hard_drive.dm | 34 +- .../hardware/network_card.dm | 14 +- .../hardware/portable_disk.dm | 12 +- .../modular_computers/hardware/printer.dm | 16 +- .../modular_computers/hardware/recharger.dm | 24 +- .../modular_computers/laptop_vendor.dm | 56 +- code/modules/ninja/energy_katana.dm | 22 +- .../ninja/suit/n_suit_verbs/ninja_stars.dm | 4 +- code/modules/ninja/suit/ninjaDrainAct.dm | 2 +- code/modules/ninja/suit/suit.dm | 10 +- code/modules/ninja/suit/suit_attackby.dm | 12 +- code/modules/paperwork/clipboard.dm | 30 +- code/modules/paperwork/contract.dm | 92 +- code/modules/paperwork/filingcabinet.dm | 12 +- code/modules/paperwork/folders.dm | 38 +- code/modules/paperwork/handlabeler.dm | 18 +- code/modules/paperwork/paper.dm | 62 +- code/modules/paperwork/paper_cutter.dm | 36 +- code/modules/paperwork/paper_premade.dm | 50 +- code/modules/paperwork/paper_premade.dm.rej | 6 +- code/modules/paperwork/paperbin.dm | 58 +- code/modules/paperwork/paperplane.dm | 30 +- code/modules/paperwork/pen.dm | 40 +- code/modules/paperwork/photocopier.dm | 26 +- code/modules/paperwork/photography.dm | 38 +- code/modules/paperwork/stamps.dm | 42 +- .../power/antimatter/containment_jar.dm | 6 +- code/modules/power/antimatter/control.dm | 6 +- code/modules/power/apc.dm | 24 +- code/modules/power/cable.dm | 8 +- code/modules/power/cell.dm | 100 +- code/modules/power/floodlight.dm | 8 +- code/modules/power/gravitygenerator.dm | 10 +- code/modules/power/lighting.dm | 52 +- code/modules/power/monitor.dm | 2 +- code/modules/power/port_gen.dm | 16 +- code/modules/power/power.dm | 8 +- code/modules/power/rtg.dm | 8 +- code/modules/power/singularity/collector.dm | 12 +- code/modules/power/singularity/emitter.dm | 26 +- .../power/singularity/field_generator.dm | 8 +- code/modules/power/singularity/generator.dm | 2 +- .../particle_accelerator.dm | 10 +- .../particle_accelerator/particle_control.dm | 10 +- code/modules/power/singularity/singularity.dm | 2 +- code/modules/power/smes.dm | 14 +- code/modules/power/solar.dm | 32 +- code/modules/power/supermatter/supermatter.dm | 2 +- code/modules/power/terminal.dm | 2 +- code/modules/power/tesla/coil.dm | 10 +- code/modules/power/tracker.dm | 10 +- code/modules/power/turbine.dm | 10 +- .../mapGenerators/syndicate.dm | 2 +- .../projectiles/ammunition/caseless.dm | 4 +- code/modules/projectiles/ammunition/energy.dm | 14 +- .../modules/projectiles/ammunition/special.dm | 12 +- code/modules/projectiles/gun.dm | 72 +- code/modules/projectiles/guns/ballistic.dm | 38 +- .../projectiles/guns/ballistic/automatic.dm | 100 +- .../guns/ballistic/laser_gatling.dm | 40 +- .../projectiles/guns/ballistic/launchers.dm | 28 +- .../projectiles/guns/ballistic/pistol.dm | 20 +- .../projectiles/guns/ballistic/revolver.dm | 82 +- .../projectiles/guns/ballistic/shotgun.dm | 76 +- .../modules/projectiles/guns/ballistic/toy.dm | 32 +- code/modules/projectiles/guns/beam_rifle.dm | 76 +- code/modules/projectiles/guns/energy.dm | 38 +- .../projectiles/guns/energy/energy_gun.dm | 36 +- .../guns/energy/kinetic_accelerator.dm | 90 +- code/modules/projectiles/guns/energy/laser.dm | 28 +- .../projectiles/guns/energy/megabuster.dm | 6 +- .../modules/projectiles/guns/energy/plasma.dm | 12 +- code/modules/projectiles/guns/energy/pulse.dm | 36 +- .../projectiles/guns/energy/special.dm | 78 +- code/modules/projectiles/guns/energy/stun.dm | 12 +- .../projectiles/guns/grenade_launcher.dm | 16 +- code/modules/projectiles/guns/magic.dm | 24 +- code/modules/projectiles/guns/magic/staff.dm | 22 +- code/modules/projectiles/guns/magic/wand.dm | 38 +- code/modules/projectiles/guns/medbeam.dm | 28 +- .../projectiles/guns/misc/blastcannon.dm | 16 +- code/modules/projectiles/guns/mounted.dm | 8 +- code/modules/projectiles/guns/syringe_gun.dm | 34 +- code/modules/projectiles/pins.dm | 20 +- .../modules/projectiles/projectile/bullets.dm | 2 +- code/modules/projectiles/projectile/energy.dm | 8 +- code/modules/projectiles/projectile/magic.dm | 2 +- .../projectiles/projectile/reusable.dm | 2 +- .../modules/projectiles/projectile/special.dm | 4 +- .../chemistry/machinery/chem_dispenser.dm | 22 +- .../chemistry/machinery/chem_heater.dm | 8 +- .../chemistry/machinery/chem_master.dm | 32 +- .../reagents/chemistry/machinery/pandemic.dm | 10 +- .../chemistry/machinery/reagentgrinder.dm | 118 +- .../chemistry/reagents/alcohol_reagents.dm | 10 +- .../chemistry/reagents/other_reagents.dm | 4 +- .../reagents/chemistry/recipes/others.dm | 4 +- .../chemistry/recipes/slime_extracts.dm | 48 +- code/modules/reagents/reagent_containers.dm | 26 +- .../reagents/reagent_containers/blood_pack.dm | 32 +- .../reagents/reagent_containers/borghydro.dm | 44 +- .../reagents/reagent_containers/bottle.dm | 114 +- .../reagents/reagent_containers/dropper.dm | 6 +- .../reagents/reagent_containers/glass.dm | 116 +- .../reagents/reagent_containers/hypospray.dm | 32 +- .../reagents/reagent_containers/patch.dm | 10 +- .../reagents/reagent_containers/pill.dm | 38 +- .../reagents/reagent_containers/spray.dm | 38 +- .../reagents/reagent_containers/syringes.dm | 52 +- code/modules/reagents/reagent_dispenser.dm | 10 +- code/modules/recycling/conveyor2.dm | 10 +- .../recycling/disposal-construction.dm | 6 +- code/modules/recycling/disposal-structures.dm | 10 +- code/modules/recycling/disposal-unit.dm | 12 +- code/modules/recycling/sortingmachinery.dm | 4 +- code/modules/research/circuitprinter.dm | 12 +- code/modules/research/designs.dm | 64 +- .../research/designs/AI_module_designs.dm | 32 +- .../research/designs/autolathe_designs.dm | 92 +- .../research/designs/biogenerator_designs.dm | 28 +- .../research/designs/comp_board_designs.dm | 68 +- .../research/designs/computer_part_designs.dm | 52 +- .../research/designs/limbgrower_designs.dm | 2 +- .../research/designs/machine_designs.dm | 104 +- .../modules/research/designs/mecha_designs.dm | 32 +- .../research/designs/medical_designs.dm | 32 +- .../modules/research/designs/power_designs.dm | 18 +- .../research/designs/stock_parts_designs.dm | 58 +- .../research/designs/telecomms_designs.dm | 14 +- .../research/designs/weapon_designs.dm | 36 +- code/modules/research/destructive_analyzer.dm | 4 +- code/modules/research/experimentor.dm | 66 +- code/modules/research/protolathe.dm | 12 +- code/modules/research/rdconsole.dm | 18 +- code/modules/research/research.dm | 12 +- code/modules/research/server.dm | 8 +- code/modules/research/stock_parts.dm | 78 +- .../research/xenobiology/xenobio_camera.dm | 10 +- .../research/xenobiology/xenobiology.dm | 2 +- code/modules/ruins/lavaland_ruin_code.dm | 18 +- code/modules/ruins/lavalandruin_code/sloth.dm | 2 +- .../ruins/lavalandruin_code/surface.dm | 2 +- .../ruins/objects_and_mobs/sin_ruins.dm | 6 +- .../modules/ruins/spaceruin_code/DJstation.dm | 2 +- .../ruins/spaceruin_code/TheDerelict.dm | 6 +- .../modules/ruins/spaceruin_code/asteroid4.dm | 2 +- .../ruins/spaceruin_code/crashedclownship.dm | 2 +- .../ruins/spaceruin_code/crashedship.dm | 6 +- .../ruins/spaceruin_code/deepstorage.dm | 6 +- .../ruins/spaceruin_code/listeningstation.dm | 24 +- .../ruins/spaceruin_code/oldstation.dm | 16 +- .../ruins/spaceruin_code/originalcontent.dm | 2 +- .../ruins/spaceruin_code/spacehotel.dm | 4 +- code/modules/shuttle/arrivals.dm | 2 +- code/modules/shuttle/computer.dm | 6 +- code/modules/shuttle/emergency.dm | 40 +- code/modules/shuttle/ferry.dm | 4 +- code/modules/shuttle/on_move.dm | 2 +- code/modules/shuttle/special.dm | 6 +- code/modules/shuttle/supply.dm | 2 +- code/modules/shuttle/syndicate.dm | 4 +- code/modules/shuttle/white_ship.dm | 2 +- code/modules/spells/spell_types/charge.dm | 26 +- code/modules/spells/spell_types/conjure.dm | 2 +- code/modules/spells/spell_types/devil.dm | 22 +- .../modules/spells/spell_types/devil_boons.dm | 6 +- code/modules/spells/spell_types/godhand.dm | 18 +- .../spells/spell_types/infinite_guns.dm | 4 +- code/modules/spells/spell_types/mime.dm | 4 +- .../spells/spell_types/rightandwrong.dm | 138 +- code/modules/spells/spell_types/santa.dm | 2 +- .../spells/spell_types/touch_attacks.dm | 8 +- code/modules/station_goals/bsa.dm | 14 +- code/modules/station_goals/shield.dm | 2 +- code/modules/stock_market/computer.dm | 2 +- code/modules/surgery/amputation.dm | 2 +- .../surgery/bodyparts/dismemberment.dm | 2 +- code/modules/surgery/bodyparts/head.dm | 2 +- code/modules/surgery/bodyparts/helpers.dm | 2 +- .../surgery/bodyparts/robot_bodyparts.dm | 6 +- code/modules/surgery/core_removal.dm | 2 +- code/modules/surgery/dental_implant.dm | 4 +- code/modules/surgery/eye_surgery.dm | 2 +- code/modules/surgery/generic_steps.dm | 34 +- code/modules/surgery/helpers.dm | 2 +- code/modules/surgery/implant_removal.dm | 10 +- code/modules/surgery/limb_augmentation.dm | 2 +- code/modules/surgery/lipoplasty.dm | 8 +- code/modules/surgery/organ_manipulation.dm | 24 +- code/modules/surgery/organs/augments_arms.dm | 28 +- code/modules/surgery/organs/augments_chest.dm | 2 +- .../surgery/organs/augments_internal.dm | 4 +- code/modules/surgery/organs/autoimplanter.dm | 2 +- code/modules/surgery/organs/autosurgeon.dm | 2 +- code/modules/surgery/organs/organ_internal.dm | 6 +- code/modules/surgery/plastic_surgery.dm | 2 +- .../modules/surgery/prosthetic_replacement.dm | 14 +- code/modules/surgery/tail_modification.dm | 10 +- code/modules/surgery/tools.dm | 36 +- code/modules/telesci/telepad.dm | 38 +- code/modules/telesci/telesci_computer.dm | 6 +- code/modules/uplink/uplink.dm | 2 +- code/modules/uplink/uplink_item.dm | 176 +- code/modules/uplink/uplink_item_cit.dm | 14 +- code/modules/vehicles/pimpin_ride.dm | 4 +- code/modules/vehicles/scooter.dm | 8 +- code/modules/vore/eating/living_vr.dm | 6 +- code/modules/vore/resizing/holder_micro_vr.dm | 12 +- code/modules/vore/resizing/resize_vr.dm | 4 +- code/modules/vore/resizing/sizegun_vr.dm | 6 +- 1107 files changed, 25425 insertions(+), 25422 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 9e9e9d9d3cc..97e2a743644 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -119,10 +119,10 @@ It is rarely allowed to put type paths in a text format, as there are no compile ```DM //Good -var/path_type = /obj/item/weapon/baseball_bat +var/path_type = /obj/item/baseball_bat //Bad -var/path_type = "/obj/item/weapon/baseball_bat" +var/path_type = "/obj/item/baseball_bat" ``` ### Tabs, not spaces diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm index c47534925f0..086d10fd6e6 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_beach.dmm @@ -8,7 +8,7 @@ /area/ruin/powered/beach) "ae" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil, /turf/open/floor/plating, /area/ruin/powered/beach) @@ -86,7 +86,7 @@ /turf/open/floor/plating, /area/ruin/powered/beach) "at" = ( -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/plating, /area/ruin/powered/beach) "au" = ( @@ -112,7 +112,7 @@ /area/ruin/powered/beach) "az" = ( /obj/item/clothing/neck/necklace/dope, -/obj/item/weapon/reagent_containers/spray/spraytan, +/obj/item/reagent_containers/spray/spraytan, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "aA" = ( @@ -130,10 +130,10 @@ /area/ruin/powered/beach) "aD" = ( /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/storage/box/beakers, /obj/machinery/light{ dir = 1 }, @@ -153,13 +153,13 @@ /area/ruin/powered/beach) "aG" = ( /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/wood, /area/ruin/powered/beach) "aH" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light{ dir = 1 }, @@ -172,7 +172,7 @@ /area/ruin/powered/beach) "aJ" = ( /obj/structure/closet/crate/bin, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/trash/candy, /obj/item/toy/talking/owl, /obj/effect/turf_decal/stripes/asteroid/line{ @@ -212,7 +212,7 @@ /area/ruin/powered/beach) "aR" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/food/drinks/bottle/tequila, /turf/open/floor/wood, /area/ruin/powered/beach) "aS" = ( @@ -230,7 +230,7 @@ "aV" = ( /obj/effect/mob_spawn/human/beach/alive{ flavour_text = "You're, like, totally a dudebro, bruh. Ch'yea. You came here, like, on spring break, hopin' to pick up some bangin' hot chicks, y'knaw?"; - l_pocket = /obj/item/weapon/reagent_containers/food/snacks/pizzaslice/dank; + l_pocket = /obj/item/reagent_containers/food/snacks/pizzaslice/dank; uniform = /obj/item/clothing/under/pants/youngfolksjeans }, /turf/open/floor/plating/beach/sand, @@ -287,7 +287,7 @@ /area/ruin/powered/beach) "bk" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/open/floor/plasteel/asteroid, /area/ruin/powered/beach) "bl" = ( @@ -311,10 +311,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/bikehorn/airhorn, +/obj/item/bikehorn/airhorn, /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid/brute, /turf/open/floor/wood, /area/ruin/powered/beach) "bB" = ( @@ -329,7 +329,7 @@ /turf/open/floor/wood, /area/ruin/powered/beach) "bE" = ( -/obj/item/weapon/reagent_containers/spray/spraytan, +/obj/item/reagent_containers/spray/spraytan, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bF" = ( @@ -350,7 +350,7 @@ }, /obj/effect/mob_spawn/human/beach/alive{ flavour_text = "You're a spunky lifeguard! It's up to you to make sure nobody drowns or gets eaten by sharks and stuff."; - id = /obj/item/weapon/card/id; + id = /obj/item/card/id; id_access = "Medical Doctor"; id_job = "Lifeguard"; mob_gender = "female" @@ -362,7 +362,7 @@ /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bK" = ( -/obj/item/weapon/storage/backpack/duffelbag, +/obj/item/storage/backpack/duffelbag, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bL" = ( @@ -386,7 +386,7 @@ /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bP" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating/beach/sand, /area/ruin/powered/beach) "bQ" = ( @@ -465,8 +465,8 @@ /area/ruin/powered/beach) "cR" = ( /obj/structure/table/wood, -/obj/item/weapon/tank/internals/oxygen, -/obj/item/weapon/pickaxe, +/obj/item/tank/internals/oxygen, +/obj/item/pickaxe, /obj/item/clothing/mask/gas, /turf/open/floor/pod/dark, /area/ruin/powered/beach) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm index 87137f7d14d..737585ffbed 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_biodome_clown_planet.dmm @@ -210,7 +210,7 @@ icon_state = "pipe-c"; invisibility = 101 }, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/open/indestructible{ icon_state = "darkyellowfull"; wet = 5 @@ -254,7 +254,7 @@ }, /area/ruin/powered/clownplanet) "aO" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/structure/disposalpipe/segment{ dir = 4; invisibility = 101 @@ -307,7 +307,7 @@ }, /area/ruin/powered/clownplanet) "aW" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/effect/decal/cleanable/dirt, /obj/structure/disposalpipe/segment{ invisibility = 101 @@ -327,7 +327,7 @@ /turf/open/floor/plating, /area/ruin/powered/clownplanet) "aY" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/structure/disposalpipe/segment{ invisibility = 101 }, @@ -379,10 +379,10 @@ invisibility = 101 }, /obj/structure/table, -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/paper/crumpled/bloody{ info = "If you dare not continue down this path of madness, escape can be found through the chute in this room. " }, -/obj/item/weapon/pen/fourcolor, +/obj/item/pen/fourcolor, /turf/open/indestructible{ icon_state = "white" }, @@ -415,7 +415,7 @@ dir = 4; invisibility = 101 }, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/indestructible{ icon_state = "white" }, @@ -490,7 +490,7 @@ /turf/closed/mineral/clown, /area/ruin/powered/clownplanet) "bq" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/indestructible{ icon_state = "white" }, @@ -519,7 +519,7 @@ /turf/open/floor/plating, /area/ruin/powered/clownplanet) "bu" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c"; @@ -646,7 +646,7 @@ }, /area/ruin/powered/clownplanet) "bL" = ( -/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/food/drinks/trophy/gold_cup, /obj/structure/table/glass, /turf/open/floor/carpet, /area/ruin/powered/clownplanet) @@ -675,7 +675,7 @@ /area/ruin/powered/clownplanet) "bQ" = ( /obj/structure/table/glass, -/obj/item/weapon/grown/bananapeel/bluespace, +/obj/item/grown/bananapeel/bluespace, /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bR" = ( @@ -684,10 +684,10 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bS" = ( -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, /obj/machinery/light/small{ dir = 8 }, @@ -699,16 +699,16 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bU" = ( -/obj/item/weapon/bikehorn/airhorn, +/obj/item/bikehorn/airhorn, /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bV" = ( /obj/structure/table/glass, -/obj/item/weapon/gun/magic/staff/honk, +/obj/item/gun/magic/staff/honk, /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "bW" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/open/indestructible/sound{ icon_state = "bananium"; name = "bananium floor"; @@ -736,7 +736,7 @@ }, /area/ruin/powered/clownplanet) "ca" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/effect/decal/cleanable/dirt, /turf/open/indestructible/sound{ icon_state = "bananium"; @@ -865,10 +865,10 @@ /turf/open/floor/carpet, /area/ruin/powered/clownplanet) "dL" = ( -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, -/obj/item/weapon/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, +/obj/item/coin/clown, /obj/machinery/light/small{ dir = 4 }, @@ -926,7 +926,7 @@ /turf/open/lava/smooth, /area/ruin/powered/clownplanet) "CB" = ( -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/paper/crumpled/bloody{ info = "Abandon hope, all ye who enter here." }, /obj/effect/decal/cleanable/blood/old, @@ -935,7 +935,7 @@ }, /area/lavaland/surface/outdoors/explored) "KX" = ( -/obj/item/weapon/grown/bananapeel{ +/obj/item/grown/bananapeel{ color = "#2F3000"; name = "stealth banana peel" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm index ec1ce79bd8e..d14d74fa1bb 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_animal_hospital.dmm @@ -43,7 +43,7 @@ "ak" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/open/floor/plasteel/cmo, /area/ruin/powered/animal_hospital) "al" = ( @@ -69,24 +69,24 @@ /area/ruin/powered/animal_hospital) "ap" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "aq" = ( /obj/structure/table, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "ar" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "as" = ( @@ -105,8 +105,8 @@ /turf/open/floor/plasteel/cmo, /area/ruin/powered/animal_hospital) "av" = ( -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/blue/side{ dir = 8 }, @@ -120,11 +120,11 @@ /area/ruin/powered/animal_hospital) "ax" = ( /obj/structure/closet/crate/trashcart, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/item/trash/cheesie, -/obj/item/weapon/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/syringe/antiviral, /obj/item/bodybag, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/open/floor/grass{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -145,7 +145,7 @@ dir = 1; pixel_y = -27 }, -/obj/item/weapon/paper/fluff/stations/lavaland/surface/henderson_report, +/obj/item/paper/fluff/stations/lavaland/surface/henderson_report, /turf/open/floor/plasteel/cmo, /area/ruin/powered/animal_hospital) "aA" = ( @@ -162,8 +162,8 @@ /area/ruin/powered/animal_hospital) "aD" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "aF" = ( @@ -197,10 +197,10 @@ /area/ruin/powered/animal_hospital) "aN" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/machinery/light/small{ dir = 1 }, @@ -239,11 +239,11 @@ /obj/effect/decal/cleanable/cobweb, /obj/item/ammo_casing/shotgun/dart, /obj/item/ammo_casing/shotgun/dart, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel{ +/obj/item/gun/ballistic/revolver/doublebarrel{ desc = "For putting critters out to pasture." }, /obj/item/ammo_casing/shotgun/buckshot, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/light/small{ dir = 8 }, @@ -276,8 +276,8 @@ /area/ruin/powered/animal_hospital) "ba" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/storage/backpack/duffelbag/med, +/obj/item/reagent_containers/glass/beaker, +/obj/item/storage/backpack/duffelbag/med, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bb" = ( @@ -290,13 +290,13 @@ /area/ruin/powered/animal_hospital) "bc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bd" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/gloves, +/obj/item/storage/box/masks{ pixel_x = 3; pixel_y = 3 }, @@ -307,13 +307,13 @@ /area/ruin/powered/animal_hospital) "be" = ( /obj/effect/decal/cleanable/oil, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/ruin/powered/animal_hospital) "bf" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/box/matches, /turf/open/floor/plating, /area/ruin/powered/animal_hospital) "bg" = ( @@ -322,7 +322,7 @@ /area/ruin/powered/animal_hospital) "bh" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bi" = ( @@ -331,7 +331,7 @@ /area/ruin/powered/animal_hospital) "bj" = ( /obj/structure/table/glass, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bk" = ( @@ -340,22 +340,22 @@ /area/ruin/powered/animal_hospital) "bl" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ name = "doggie biscuit" }, /obj/machinery/light{ @@ -381,15 +381,15 @@ /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bo" = ( -/obj/item/weapon/reagent_containers/glass/bowl, -/obj/item/weapon/reagent_containers/food/snacks/cheesewedge, -/obj/item/weapon/reagent_containers/food/snacks/cheesewedge, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/food/snacks/cheesewedge, +/obj/item/reagent_containers/food/snacks/cheesewedge, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bp" = ( /obj/structure/closet/crate/bin, /obj/item/trash/pistachios, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/item/seeds/apple, /turf/open/floor/plasteel/blue/side{ dir = 8 @@ -405,11 +405,11 @@ /area/ruin/powered/animal_hospital) "bs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/phone, +/obj/item/phone, /turf/open/floor/plasteel, /area/ruin/powered/animal_hospital) "bt" = ( -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel, /area/ruin/powered/animal_hospital) "bu" = ( @@ -453,13 +453,13 @@ /area/ruin/powered/animal_hospital) "bA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel, /area/ruin/powered/animal_hospital) "bB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/hug, +/obj/item/storage/box/hug, /turf/open/floor/plasteel, /area/ruin/powered/animal_hospital) "bC" = ( @@ -470,11 +470,11 @@ /area/ruin/powered/animal_hospital) "bD" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/cyanide{ +/obj/item/reagent_containers/glass/bottle/cyanide{ desc = "A cocktail of chemotherapy drugs intended to treat bladder cancer."; name = "MVAC regimen" }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bE" = ( @@ -498,8 +498,8 @@ /area/ruin/powered/animal_hospital) "bH" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/oxygen, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/plasteel/blue/side{ dir = 8 }, @@ -518,10 +518,10 @@ /turf/open/floor/plasteel, /area/ruin/powered/animal_hospital) "bK" = ( -/obj/item/weapon/reagent_containers/glass/bowl, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) @@ -563,32 +563,32 @@ "bQ" = ( /obj/structure/table/glass, /obj/item/clothing/neck/petcollar, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/open/floor/plasteel/white, /area/ruin/powered/animal_hospital) "bR" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/melee/baton/cattleprod{ +/obj/item/melee/baton/cattleprod{ desc = "On-the-fly rabies treatment."; name = "cattle prod" }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/blue/side{ dir = 10 }, /area/ruin/powered/animal_hospital) "bS" = ( /obj/structure/closet, -/obj/item/weapon/defibrillator/loaded, -/obj/item/weapon/storage/belt/medical, +/obj/item/defibrillator/loaded, +/obj/item/storage/belt/medical, /obj/item/clothing/glasses/hud/health, /turf/open/floor/plasteel/blue/side{ dir = 6 }, /area/ruin/powered/animal_hospital) "bT" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm index 3cae12bfe10..6712e631a70 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ash_walker1.dmm @@ -202,7 +202,7 @@ /area/ruin/unpowered/ash_walkers) "aC" = ( /obj/structure/stone_tile/block/cracked, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aD" = ( @@ -214,10 +214,10 @@ dir = 4 }, /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/lizard, -/obj/item/weapon/reagent_containers/blood/lizard, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/lizard, +/obj/item/reagent_containers/blood/lizard, /obj/item/stack/sheet/cloth/ten, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) @@ -293,7 +293,7 @@ /obj/structure/stone_tile{ dir = 1 }, -/obj/item/weapon/weldingtool/experimental, +/obj/item/weldingtool/experimental, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aO" = ( @@ -312,7 +312,7 @@ dir = 8 }, /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "aR" = ( @@ -488,7 +488,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "bk" = ( @@ -522,7 +522,7 @@ /obj/structure/stone_tile/cracked{ dir = 4 }, -/obj/item/weapon/construction/rcd/loaded, +/obj/item/construction/rcd/loaded, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "bn" = ( @@ -543,7 +543,7 @@ /obj/structure/stone_tile/block{ dir = 8 }, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bp" = ( @@ -752,7 +752,7 @@ /area/lavaland/surface/outdoors) "bP" = ( /obj/structure/stone_tile/block, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "bQ" = ( @@ -874,12 +874,12 @@ dir = 4 }, /obj/structure/closet/crate/internals, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cg" = ( @@ -919,7 +919,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "ck" = ( -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /obj/structure/stone_tile{ dir = 4 }, @@ -932,7 +932,7 @@ /obj/structure/stone_tile/cracked{ dir = 8 }, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cm" = ( @@ -1015,7 +1015,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cx" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cy" = ( @@ -1034,7 +1034,7 @@ /obj/structure/stone_tile/cracked{ dir = 1 }, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "cA" = ( @@ -1083,8 +1083,8 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/weapon/twohanded/spear, -/obj/item/weapon/storage/belt, +/obj/item/twohanded/spear, +/obj/item/storage/belt, /turf/open/indestructible/boss/air, /area/ruin/unpowered/ash_walkers) "cG" = ( @@ -1105,7 +1105,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cJ" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/structure/stone_tile/cracked{ dir = 8 }, @@ -1130,8 +1130,8 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/twohanded/spear, -/obj/item/weapon/scythe, +/obj/item/twohanded/spear, +/obj/item/scythe, /turf/open/indestructible/boss/air, /area/ruin/unpowered/ash_walkers) "cM" = ( @@ -1143,7 +1143,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) "cN" = ( @@ -1158,7 +1158,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /obj/item/clothing/head/helmet/roman/legionaire, /turf/open/indestructible/boss, /area/ruin/unpowered/ash_walkers) @@ -1216,7 +1216,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/unpowered/ash_walkers) "cX" = ( -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/structure/stone_tile{ dir = 1 }, @@ -1347,7 +1347,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dp" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/structure/stone_tile/cracked{ dir = 1 }, @@ -1404,7 +1404,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "dw" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/stone_tile/block/cracked{ dir = 4 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm index 722cc92d784..c3c05a411eb 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_biodome_winter.dmm @@ -32,7 +32,7 @@ /turf/open/floor/plating, /area/ruin/powered/snow_biodome) "ah" = ( -/obj/item/weapon/reagent_containers/food/drinks/mug, +/obj/item/reagent_containers/food/drinks/mug, /turf/open/floor/plating, /area/ruin/powered/snow_biodome) "ai" = ( @@ -92,7 +92,7 @@ /area/ruin/powered/snow_biodome) "au" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "av" = ( @@ -105,7 +105,7 @@ /area/ruin/powered/snow_biodome) "ax" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "ay" = ( @@ -150,7 +150,7 @@ /area/ruin/powered/snow_biodome) "aF" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/mug/coco, +/obj/item/reagent_containers/food/drinks/mug/coco, /turf/open/floor/wood, /area/ruin/powered/snow_biodome) "aG" = ( @@ -322,7 +322,7 @@ /turf/open/floor/pod/light, /area/ruin/powered/snow_biodome) "xU" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "zT" = ( @@ -332,8 +332,8 @@ /area/ruin/powered/snow_biodome) "AM" = ( /obj/structure/table, -/obj/item/weapon/pen, -/obj/item/weapon/paper, +/obj/item/pen, +/obj/item/paper, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "Dd" = ( @@ -365,7 +365,7 @@ /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "KS" = ( -/obj/item/weapon/twohanded/required/chainsaw, +/obj/item/twohanded/required/chainsaw, /obj/structure/closet, /obj/machinery/light/small{ dir = 4 @@ -387,8 +387,8 @@ /area/ruin/powered/snow_biodome) "PK" = ( /obj/structure/table, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin, +/obj/item/pen, +/obj/item/paper_bin, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "QI" = ( @@ -396,7 +396,7 @@ /area/lavaland/surface/outdoors/explored) "QK" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp, +/obj/item/storage/fancy/cigarettes/cigpack_carp, /turf/open/floor/pod/dark, /area/ruin/powered/snow_biodome) "QN" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm index 875cfdc35d9..8ca77f7dd24 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_cultaltar.dmm @@ -58,7 +58,7 @@ /area/ruin/unpowered) "k" = ( /obj/effect/decal/remains/human, -/obj/item/weapon/melee/cultblade, +/obj/item/melee/cultblade, /turf/open/floor/engine/cult{ initial_gas_mix = "o2=14;n2=23;TEMP=300" }, @@ -100,7 +100,7 @@ }, /obj/item/device/cult_shift, /obj/effect/decal/remains/human, -/obj/item/weapon/melee/cultblade/dagger, +/obj/item/melee/cultblade/dagger, /obj/effect/step_trigger/sound_effect{ happens_once = 1; name = "a grave mistake"; diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm index 773fc01f51e..7f2144d346d 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_envy.dmm @@ -60,7 +60,7 @@ pixel_y = 28; broken = 1 }, -/obj/item/weapon/kitchen/knife/envy, +/obj/item/kitchen/knife/envy, /turf/open/floor/plating, /area/ruin/unpowered) "l" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm index 3b1c5558057..b8c61df0477 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_gluttony.dmm @@ -12,7 +12,7 @@ /turf/open/lava/smooth, /area/ruin/powered/gluttony) "f" = ( -/obj/item/weapon/reagent_containers/syringe/gluttony, +/obj/item/reagent_containers/syringe/gluttony, /turf/open/floor/plasteel/freezer, /area/ruin/powered/gluttony) "g" = ( @@ -20,7 +20,7 @@ /turf/open/floor/plasteel/freezer, /area/ruin/powered/gluttony) "h" = ( -/obj/item/weapon/veilrender/vealrender, +/obj/item/veilrender/vealrender, /turf/open/floor/plasteel/freezer, /area/ruin/powered/gluttony) "i" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm index c993ecbb631..eba45a14bff 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_golem_ship.dmm @@ -7,29 +7,29 @@ /area/ruin/powered/golem_ship) "c" = ( /obj/structure/closet/crate, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /obj/item/device/mining_scanner, /obj/item/device/flashlight/lantern, -/obj/item/weapon/card/id/mining, +/obj/item/card/id/mining, /turf/open/floor/plating, /area/ruin/powered/golem_ship) "d" = ( /obj/structure/closet/crate, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /obj/item/device/mining_scanner, /obj/item/device/flashlight/lantern, -/obj/item/weapon/card/id/mining, +/obj/item/card/id/mining, /turf/open/floor/plating, /area/ruin/powered/golem_ship) "e" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/ruin/powered/golem_ship) "f" = ( @@ -78,7 +78,7 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "o" = ( -/obj/item/weapon/resonator, +/obj/item/resonator, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "p" = ( @@ -112,12 +112,12 @@ /area/ruin/powered/golem_ship) "u" = ( /obj/structure/table/wood, -/obj/item/weapon/bedsheet/rd/royal_cape{ +/obj/item/bedsheet/rd/royal_cape{ layer = 3; pixel_x = 5; pixel_y = 9 }, -/obj/item/weapon/book/manual/research_and_development{ +/obj/item/book/manual/research_and_development{ name = "Sacred Text of the Liberator"; pixel_x = -4; pixel_y = 3 @@ -129,7 +129,7 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "v" = ( -/obj/item/weapon/resonator/upgraded, +/obj/item/resonator/upgraded, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "w" = ( @@ -153,24 +153,24 @@ /area/ruin/powered/golem_ship) "A" = ( /obj/structure/table/wood, -/obj/item/weapon/surgical_drapes{ +/obj/item/surgical_drapes{ pixel_x = 15 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "B" = ( -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/machinery/light, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "C" = ( -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/item/areaeditor/blueprints{ desc = "Use to build new structures in the wastes."; name = "land claim" @@ -178,10 +178,10 @@ /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "D" = ( -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/disk/design_disk/golem_shell, +/obj/item/storage/firstaid/brute, +/obj/item/disk/design_disk/golem_shell, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/golem_ship) "E" = ( diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm index c81c510b9ee..28657c7e6de 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_greed.dmm @@ -10,7 +10,7 @@ /area/lavaland/surface/outdoors) "e" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/gun/ballistic/revolver/russian/soul, +/obj/item/gun/ballistic/revolver/russian/soul, /obj/machinery/light/small{ dir = 1 }, @@ -26,7 +26,7 @@ /area/ruin/powered/greed) "g" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/coin/mythril, +/obj/item/coin/mythril, /obj/machinery/light/small{ dir = 1 }, @@ -36,7 +36,7 @@ /area/ruin/powered/greed) "h" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/coin/diamond, +/obj/item/coin/diamond, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -48,7 +48,7 @@ /area/ruin/powered/greed) "j" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/coin/adamantine, +/obj/item/coin/adamantine, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -60,7 +60,7 @@ /turf/open/floor/engine/cult, /area/ruin/powered/greed) "l" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/open/floor/engine/cult, /area/ruin/powered/greed) "m" = ( @@ -72,12 +72,12 @@ /turf/open/floor/engine/cult, /area/ruin/powered/greed) "o" = ( -/obj/item/weapon/storage/bag/money, +/obj/item/storage/bag/money, /turf/open/floor/engine/cult, /area/ruin/powered/greed) "p" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/ore/gold, +/obj/item/ore/gold, /turf/open/floor/engine/cult, /area/ruin/powered/greed) "q" = ( @@ -113,12 +113,12 @@ /turf/open/floor/engine/cult, /area/ruin/powered/greed) "v" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /obj/machinery/light/small, /turf/open/floor/engine/cult, /area/ruin/powered/greed) "w" = ( -/obj/item/weapon/storage/bag/money, +/obj/item/storage/bag/money, /obj/machinery/light/small, /turf/open/floor/engine/cult, /area/ruin/powered/greed) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm index 2749e39f1ff..e04e5bf3c1c 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_hermit.dmm @@ -26,13 +26,13 @@ }, /area/ruin/powered) "h" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating/asteroid{ name = "dirt" }, /area/ruin/powered) "i" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating/asteroid{ name = "dirt" }, @@ -50,7 +50,7 @@ }, /area/ruin/powered) "l" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating/asteroid{ name = "dirt" }, @@ -60,7 +60,7 @@ /obj/item/seeds/reishi, /obj/item/seeds/plump, /obj/item/seeds/plump, -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom, +/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom, /turf/open/floor/plating/asteroid/basalt, /area/ruin/powered) "n" = ( @@ -72,9 +72,9 @@ /area/ruin/powered) "p" = ( /obj/structure/rack, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/ore, +/obj/item/storage/firstaid/regular, /turf/open/floor/plating/asteroid/basalt, /area/ruin/powered) "q" = ( @@ -83,8 +83,8 @@ /area/ruin/powered) "r" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/emergency, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/pickaxe/emergency, +/obj/item/tank/internals/oxygen, /turf/open/floor/plating/asteroid/basalt, /area/ruin/powered) "s" = ( @@ -95,7 +95,7 @@ /area/ruin/powered) "u" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plating, /area/ruin/powered) "v" = ( @@ -122,7 +122,7 @@ /area/ruin/powered) "A" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife/combat/survival, +/obj/item/kitchen/knife/combat/survival, /turf/open/floor/plating, /area/ruin/powered) "B" = ( @@ -131,7 +131,7 @@ /area/ruin/powered) "C" = ( /obj/structure/tubes, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/pod/dark, /area/ruin/powered) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm index f14495c95c7..3a89d344a86 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_pizzaparty.dmm @@ -23,7 +23,7 @@ /area/ruin/unpowered) "f" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -56,7 +56,7 @@ }, /area/ruin/unpowered) "j" = ( -/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom, +/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; @@ -172,7 +172,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "w" = ( -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; @@ -202,7 +202,7 @@ "z" = ( /obj/structure/table/wood, /obj/structure/glowshroom/single, -/obj/item/weapon/a_gift, +/obj/item/a_gift, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -211,7 +211,7 @@ "A" = ( /obj/structure/table/wood, /obj/item/trash/plate, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -230,7 +230,7 @@ /area/ruin/unpowered) "D" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/margherita, +/obj/item/reagent_containers/food/snacks/pizzaslice/margherita, /obj/item/trash/plate, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; @@ -239,7 +239,7 @@ /area/ruin/unpowered) "E" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/meat, +/obj/item/reagent_containers/food/snacks/pizzaslice/meat, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -247,7 +247,7 @@ /area/ruin/unpowered) "F" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday, +/obj/item/reagent_containers/food/snacks/store/cake/birthday, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -268,7 +268,7 @@ }, /area/ruin/unpowered) "I" = ( -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; @@ -305,7 +305,7 @@ /area/ruin/unpowered) "M" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/a_gift, +/obj/item/a_gift, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; initial_gas_mix = "o2=14;n2=23;TEMP=300" @@ -317,7 +317,7 @@ /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "O" = ( -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt/lava_land_surface; diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm index 01ac5362301..02efad16051 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_seed_vault.dmm @@ -7,17 +7,17 @@ /area/lavaland/surface/outdoors) "d" = ( /obj/structure/table/wood, -/obj/item/weapon/lighter, -/obj/item/weapon/lighter, -/obj/item/weapon/storage/fancy/rollingpapers, -/obj/item/weapon/storage/fancy/rollingpapers, -/obj/item/weapon/storage/fancy/rollingpapers, -/obj/item/weapon/storage/fancy/rollingpapers, +/obj/item/lighter, +/obj/item/lighter, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "e" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/disks_plantgene, +/obj/item/storage/box/disks_plantgene, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "f" = ( @@ -34,7 +34,7 @@ "i" = ( /obj/structure/closet/crate/hydroponics, /obj/structure/beebox, -/obj/item/weapon/melee/flyswatter, +/obj/item/melee/flyswatter, /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, @@ -69,18 +69,18 @@ /area/ruin/powered/seedvault) "o" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/cultivator, -/obj/item/weapon/cultivator, -/obj/item/weapon/cultivator, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/hatchet, -/obj/item/weapon/hatchet, -/obj/item/weapon/hatchet, -/obj/item/weapon/hatchet, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, +/obj/item/hatchet, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "p" = ( @@ -88,27 +88,27 @@ /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "q" = ( -/obj/item/weapon/hatchet, -/obj/item/weapon/storage/bag/plants, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/hatchet, +/obj/item/storage/bag/plants, +/obj/item/reagent_containers/glass/bucket, /obj/structure/table/wood, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "r" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/bag/plants, -/obj/item/weapon/storage/bag/plants, -/obj/item/weapon/storage/bag/plants, -/obj/item/weapon/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "s" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/storage/box/disks_plantgene, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/gun/energy/floragun, +/obj/item/storage/box/disks_plantgene, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "t" = ( @@ -136,10 +136,10 @@ pixel_y = 5 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, -/obj/item/weapon/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, +/obj/item/reagent_containers/glass/beaker/bluespace, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "y" = ( @@ -188,14 +188,14 @@ /area/ruin/powered/seedvault) "I" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) "J" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/structure/table/wood, /turf/open/floor/plasteel/freezer, /area/ruin/powered/seedvault) @@ -214,7 +214,7 @@ /area/lavaland/surface/outdoors) "N" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/disks_plantgene, +/obj/item/storage/box/disks_plantgene, /obj/machinery/light{ dir = 1 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm index 5ae42278133..49092bc87e9 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_sloth.dmm @@ -6,7 +6,7 @@ /turf/open/lava/smooth/lava_land_surface, /area/ruin/unpowered) "c" = ( -/obj/item/weapon/paper/fluff/stations/lavaland/sloth/note, +/obj/item/paper/fluff/stations/lavaland/sloth/note, /turf/open/floor/sepia{ blocks_air = 0; slowdown = 10 @@ -27,7 +27,7 @@ /area/ruin/unpowered) "f" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, /turf/open/floor/sepia{ blocks_air = 0; slowdown = 10 @@ -35,7 +35,7 @@ /area/ruin/unpowered) "g" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/sepia{ blocks_air = 0; slowdown = 10 diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm index 8d40c16d582..d50777c92f5 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_survivalpod.dmm @@ -50,13 +50,13 @@ /turf/open/floor/pod/dark, /area/ruin/powered) "l" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/effect/decal/cleanable/blood, /turf/open/floor/pod/dark, /area/ruin/powered) "m" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /obj/structure/tubes, /obj/machinery/light/small{ dir = 4 @@ -76,7 +76,7 @@ /area/lavaland/surface/outdoors) "p" = ( /obj/structure/table/survival_pod, -/obj/item/weapon/kitchen/knife/combat/survival, +/obj/item/kitchen/knife/combat/survival, /turf/open/floor/pod/dark, /area/ruin/powered) "q" = ( @@ -94,7 +94,7 @@ /area/ruin/powered) "r" = ( /obj/structure/tubes, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/pod/dark, /area/ruin/powered) diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm index 2893f3481f0..20b946d5db0 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_syndicate_base1.dmm @@ -12,7 +12,7 @@ /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base) "ae" = ( -/obj/item/weapon/bombcore/large/underwall, +/obj/item/bombcore/large/underwall, /turf/closed/wall/mineral/plastitanium, /area/ruin/powered/syndicate_lava_base) "af" = ( @@ -26,9 +26,9 @@ /area/ruin/powered/syndicate_lava_base) "ag" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/syndicake, -/obj/item/weapon/reagent_containers/food/snacks/syndicake, -/obj/item/weapon/reagent_containers/food/snacks/syndicake, +/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/reagent_containers/food/snacks/syndicake, +/obj/item/reagent_containers/food/snacks/syndicake, /obj/structure/sign/barsign{ pixel_y = 32; req_access = null; @@ -41,7 +41,7 @@ /area/ruin/powered/syndicate_lava_base) "ah" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad, +/obj/item/reagent_containers/food/snacks/salad/validsalad, /turf/open/floor/plasteel/podhatch{ dir = 6 }, @@ -52,7 +52,7 @@ icon_state = "minibar_left"; name = "skeletal minibar" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /obj/machinery/light/small{ dir = 1 }, @@ -64,7 +64,7 @@ icon_state = "minibar_right"; name = "skeletal minibar" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "ak" = ( @@ -75,21 +75,21 @@ /turf/open/floor/plasteel/vault, /area/ruin/powered/syndicate_lava_base) "al" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/vault, /area/ruin/powered/syndicate_lava_base) "am" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault, /area/ruin/powered/syndicate_lava_base) "an" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /turf/open/floor/plasteel/vault, /area/ruin/powered/syndicate_lava_base) @@ -149,7 +149,7 @@ /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -204,41 +204,41 @@ amount = 50 }, /obj/structure/table/reinforced, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/podhatch{ dir = 10 }, /area/ruin/powered/syndicate_lava_base) "aC" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood{ icon_state = "wood-broken4" }, /area/ruin/powered/syndicate_lava_base) "aD" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "aE" = ( /obj/structure/table/wood, /obj/item/toy/nuke, -/obj/item/weapon/book/manual/nuclear, +/obj/item/book/manual/nuclear, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "aF" = ( /obj/structure/table/wood, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_y = 3 }, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate, +/obj/item/storage/fancy/cigarettes/cigpack_syndicate, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "aG" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/wood, /area/ruin/powered/syndicate_lava_base) "aH" = ( @@ -275,16 +275,16 @@ /area/ruin/powered/syndicate_lava_base) "aN" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/soap/syndie, +/obj/item/lipstick/random, +/obj/item/soap/syndie, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -311,7 +311,7 @@ /area/ruin/powered/syndicate_lava_base) "aR" = ( /obj/structure/closet/emcloset/anchored, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/podhatch{ @@ -319,7 +319,7 @@ }, /area/ruin/powered/syndicate_lava_base) "aS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -338,7 +338,7 @@ /area/ruin/powered/syndicate_lava_base) "aU" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, /obj/machinery/light{ @@ -390,7 +390,7 @@ /area/ruin/powered/syndicate_lava_base) "ba" = ( /obj/structure/closet/emcloset/anchored, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/device/flashlight/seclite, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/podhatch{ @@ -398,7 +398,7 @@ }, /area/ruin/powered/syndicate_lava_base) "bb" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -412,7 +412,7 @@ }, /area/ruin/powered/syndicate_lava_base) "bd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -451,16 +451,16 @@ /area/ruin/powered/syndicate_lava_base) "bi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/podhatch{ dir = 1 }, @@ -486,10 +486,10 @@ /area/ruin/powered/syndicate_lava_base) "bl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/book/manual/wiki/chemistry, -/obj/item/weapon/book/manual/wiki/chemistry, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, /obj/item/device/assembly/signaler, /obj/item/device/assembly/signaler, /obj/item/device/assembly/voice, @@ -503,13 +503,13 @@ /area/ruin/powered/syndicate_lava_base) "bm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/gun/syringe/syndicate, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe/syndicate, +/obj/item/storage/box/beakers, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -561,11 +561,11 @@ /area/ruin/powered/syndicate_lava_base) "bs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/light{ dir = 1 }, @@ -574,7 +574,7 @@ "bt" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/podhatch{ dir = 6 }, @@ -671,7 +671,7 @@ /area/ruin/powered/syndicate_lava_base) "bG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/infections, +/obj/item/book/manual/wiki/infections, /obj/item/stack/sheet/mineral/silver{ amount = 10 }, @@ -696,14 +696,14 @@ /area/ruin/powered/syndicate_lava_base) "bJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/c20r/toy/unrestricted, -/obj/item/weapon/gun/ballistic/automatic/c20r/toy/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ruin/powered/syndicate_lava_base) "bK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -744,7 +744,7 @@ /area/ruin/powered/syndicate_lava_base) "bO" = ( /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -769,11 +769,11 @@ /area/ruin/powered/syndicate_lava_base) "bS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/podhatch{ dir = 4 }, @@ -795,7 +795,7 @@ /area/ruin/powered/syndicate_lava_base) "bV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, +/obj/item/folder, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, /turf/open/floor/plasteel/vault{ @@ -804,9 +804,9 @@ /area/ruin/powered/syndicate_lava_base) "bW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/suppressor/specialoffer, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted, +/obj/item/suppressor/specialoffer, +/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, +/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -819,13 +819,13 @@ /area/ruin/powered/syndicate_lava_base) "bY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/podhatch, /area/ruin/powered/syndicate_lava_base) "bZ" = ( @@ -865,8 +865,8 @@ /area/ruin/powered/syndicate_lava_base) "cc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light, /turf/open/floor/plasteel/podhatch{ dir = 1 @@ -874,7 +874,7 @@ /area/ruin/powered/syndicate_lava_base) "cd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/stack/sheet/mineral/gold{ amount = 10 }, @@ -947,7 +947,7 @@ }, /area/ruin/powered/syndicate_lava_base) "cm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/podhatch{ @@ -970,7 +970,7 @@ }, /area/ruin/powered/syndicate_lava_base) "cq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -986,12 +986,12 @@ /area/ruin/powered/syndicate_lava_base) "cs" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -1056,7 +1056,7 @@ "cC" = ( /obj/structure/bed/roller, /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1104,15 +1104,15 @@ /area/ruin/powered/syndicate_lava_base) "cI" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/item/device/multitool, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ruin/powered/syndicate_lava_base) "cJ" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -1136,7 +1136,7 @@ pixel_y = 3 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /obj/item/stack/cable_coil/white, /turf/open/floor/plasteel/vault{ dir = 8 @@ -1175,8 +1175,8 @@ }, /area/ruin/powered/syndicate_lava_base) "cQ" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -1184,14 +1184,14 @@ /area/ruin/powered/syndicate_lava_base) "cR" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ruin/powered/syndicate_lava_base) "cS" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /obj/machinery/light/small{ dir = 4 @@ -1209,7 +1209,7 @@ }, /area/ruin/powered/syndicate_lava_base) "cU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/structure/extinguisher_cabinet{ @@ -1244,7 +1244,7 @@ /obj/item/device/assembly/signaler, /obj/item/device/assembly/voice, /obj/item/device/assembly/voice, -/obj/item/weapon/screwdriver/nuke, +/obj/item/screwdriver/nuke, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1271,15 +1271,15 @@ /area/ruin/powered/syndicate_lava_base) "da" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ruin/powered/syndicate_lava_base) "db" = ( /obj/machinery/computer/message_monitor, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1351,15 +1351,15 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /obj/structure/table/reinforced, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade/large, -/obj/item/weapon/grenade/chem_grenade/large, -/obj/item/weapon/grenade/chem_grenade/large, -/obj/item/weapon/grenade/chem_grenade/large, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade/large, +/obj/item/grenade/chem_grenade/large, +/obj/item/grenade/chem_grenade/large, +/obj/item/grenade/chem_grenade/large, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1456,7 +1456,7 @@ }, /area/ruin/powered/syndicate_lava_base) "fM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light/small, @@ -1495,7 +1495,7 @@ /area/ruin/powered/syndicate_lava_base) "fS" = ( /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/machinery/light{ dir = 8 }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm index 0c4dd60fb8d..588000378ba 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_ufo_crash.dmm @@ -79,7 +79,7 @@ }, /area/lavaland/surface/outdoors) "o" = ( -/obj/item/weapon/hemostat/alien, +/obj/item/hemostat/alien, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, @@ -104,7 +104,7 @@ /area/ruin/unpowered) "s" = ( /obj/structure/table/optable/abductor, -/obj/item/weapon/cautery/alien, +/obj/item/cautery/alien, /obj/effect/baseturf_helper/lava_land/surface, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" @@ -112,7 +112,7 @@ /area/ruin/unpowered) "t" = ( /obj/structure/table/abductor, -/obj/item/weapon/storage/box/alienhandcuffs, +/obj/item/storage/box/alienhandcuffs, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, @@ -124,15 +124,15 @@ }, /area/ruin/unpowered) "v" = ( -/obj/item/weapon/scalpel/alien, -/obj/item/weapon/surgical_drapes, +/obj/item/scalpel/alien, +/obj/item/surgical_drapes, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, /area/ruin/unpowered) "w" = ( -/obj/item/weapon/retractor/alien, -/obj/item/weapon/paper/guides/antag/abductor, +/obj/item/retractor/alien, +/obj/item/paper/guides/antag/abductor, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, @@ -151,8 +151,8 @@ /area/ruin/unpowered) "z" = ( /obj/structure/table/abductor, -/obj/item/weapon/surgicaldrill/alien, -/obj/item/weapon/circular_saw/alien, +/obj/item/surgicaldrill/alien, +/obj/item/circular_saw/alien, /turf/open/floor/plating/abductor{ initial_gas_mix = "o2=16;n2=23;TEMP=300" }, diff --git a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm index fed94448d08..d89b4ba3499 100644 --- a/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm +++ b/_maps/RandomRuins/LavaRuins/lavaland_surface_xeno_nest.dmm @@ -70,7 +70,7 @@ /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, /obj/item/clothing/mask/facehugger/impregnated, -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/xenonest) "p" = ( @@ -129,7 +129,7 @@ /obj/item/clothing/mask/facehugger/impregnated, /obj/item/clothing/under/rank/security, /obj/item/clothing/suit/armor/vest, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /obj/item/clothing/head/helmet, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/ruin/xenonest) @@ -215,7 +215,7 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/suit/space/syndicate/orange, /obj/item/clothing/mask/gas, /obj/item/clothing/head/helmet/space/syndicate/orange, diff --git a/_maps/RandomRuins/SpaceRuins/DJstation.dmm b/_maps/RandomRuins/SpaceRuins/DJstation.dmm index 515878e931a..3797fd3a2c7 100644 --- a/_maps/RandomRuins/SpaceRuins/DJstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/DJstation.dmm @@ -44,14 +44,14 @@ /turf/open/floor/plating, /area/djstation) "al" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, /turf/open/floor/plating, /area/djstation) "am" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/djstation) "an" = ( @@ -91,7 +91,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/sign/securearea{ desc = "A warning sign which reads 'HIGH VOLTAGE'"; icon_state = "shock"; @@ -165,7 +165,7 @@ /area/djstation) "aD" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/grimy, /area/djstation) "aE" = ( @@ -249,7 +249,7 @@ /area/djstation) "aR" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/djstation, +/obj/item/paper/fluff/ruins/djstation, /turf/open/floor/plasteel/cafeteria, /area/djstation) "aS" = ( @@ -336,11 +336,11 @@ /area/djstation) "bg" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/cafeteria, /area/djstation) "bh" = ( diff --git a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm index 95f886314cb..4aad40fd396 100644 --- a/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm +++ b/_maps/RandomRuins/SpaceRuins/TheDerelict.dmm @@ -549,19 +549,19 @@ }, /area/derelict/solar_control) "bv" = ( -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plasteel{ icon_state = "damaged4" }, /area/derelict/solar_control) "bw" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/smes, +/obj/item/circuitboard/machine/smes, /turf/open/floor/plasteel, /area/derelict/bridge/ai_upload) "bx" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/microwave, +/obj/item/circuitboard/machine/microwave, /turf/open/floor/plasteel, /area/derelict/bridge/ai_upload) "by" = ( @@ -596,7 +596,7 @@ /area/derelict/solar_control) "bD" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/cryo_tube, +/obj/item/circuitboard/machine/cryo_tube, /turf/open/floor/plasteel, /area/derelict/bridge/ai_upload) "bE" = ( @@ -646,7 +646,7 @@ /turf/template_noop, /area/derelict/bridge/ai_upload) "bM" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /turf/template_noop, /area/derelict/bridge/ai_upload) "bN" = ( @@ -677,13 +677,13 @@ /area/derelict/solar_control) "bT" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/solar_control, +/obj/item/circuitboard/computer/solar_control, /turf/open/floor/plasteel, /area/derelict/bridge/ai_upload) "bU" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/autolathe, -/obj/item/weapon/circuitboard/machine/protolathe{ +/obj/item/circuitboard/machine/autolathe, +/obj/item/circuitboard/machine/protolathe{ pixel_x = -5; pixel_y = -3 }, @@ -691,7 +691,7 @@ /area/derelict/bridge/ai_upload) "bV" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/circuit_imprinter, /turf/open/floor/plasteel, /area/derelict/bridge/ai_upload) "bW" = ( @@ -716,7 +716,7 @@ /area/derelict/bridge/ai_upload) "bY" = ( /obj/structure/frame/computer, -/obj/item/weapon/circuitboard/computer/rdconsole, +/obj/item/circuitboard/computer/rdconsole, /turf/open/floor/plasteel/airless, /area/derelict/bridge/ai_upload) "bZ" = ( @@ -799,9 +799,9 @@ /turf/open/floor/plasteel, /area/derelict/solar_control) "cn" = ( -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/template_noop, /area/template_noop) "co" = ( @@ -818,7 +818,7 @@ }, /area/derelict/gravity_generator) "cq" = ( -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -849,7 +849,7 @@ }, /area/derelict/gravity_generator) "cv" = ( -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /turf/open/floor/plasteel/airless{ icon_state = "damaged4" }, @@ -864,7 +864,7 @@ /area/derelict/bridge/access) "cy" = ( /obj/structure/rack, -/obj/item/weapon/melee/classic_baton, +/obj/item/melee/classic_baton, /turf/open/floor/plasteel, /area/derelict/bridge/access) "cz" = ( @@ -887,18 +887,18 @@ /area/derelict/bridge/access) "cC" = ( /obj/structure/rack, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/apc, /turf/open/floor/plasteel, /area/derelict/bridge/access) "cD" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/smes, +/obj/item/circuitboard/machine/smes, /turf/open/floor/plasteel, /area/derelict/bridge/access) "cE" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, /turf/open/floor/plasteel, /area/derelict/bridge/access) "cF" = ( @@ -910,7 +910,7 @@ /turf/open/floor/plasteel, /area/derelict/bridge/access) "cG" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/airless{ icon_state = "damaged5" }, @@ -922,7 +922,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/gravity_generator) "cI" = ( -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /turf/template_noop, /area/template_noop) "cJ" = ( @@ -990,12 +990,12 @@ /area/derelict/bridge/access) "cR" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/derelict/bridge/access) "cS" = ( @@ -1140,7 +1140,7 @@ icon_state = "0-8" }, /obj/structure/frame/machine, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /turf/open/floor/plating/airless, /area/derelict/gravity_generator) "dj" = ( @@ -1196,7 +1196,7 @@ /turf/open/floor/plasteel, /area/derelict/bridge/access) "dq" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/structure/cable{ d1 = 1; d2 = 8; @@ -1212,7 +1212,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/thederelict/equipment, +/obj/item/paper/fluff/ruins/thederelict/equipment, /turf/open/floor/plasteel/airless, /area/derelict/gravity_generator) "dt" = ( @@ -1227,19 +1227,19 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = -10; pixel_y = 5 }, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plating/airless, /area/derelict/gravity_generator) "dv" = ( -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/template_noop, /area/template_noop) "dw" = ( @@ -1339,14 +1339,14 @@ /area/derelict/bridge) "dM" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, /turf/open/floor/plasteel, /area/derelict/bridge) "dN" = ( -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, /obj/structure/table, /obj/structure/window/reinforced{ dir = 4 @@ -1427,7 +1427,7 @@ /turf/open/floor/plating, /area/derelict/bridge/access) "dZ" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, /area/derelict/bridge) "ea" = ( @@ -1438,7 +1438,7 @@ /area/derelict/bridge) "ec" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/open/floor/plasteel, /area/derelict/bridge) "ed" = ( @@ -1604,14 +1604,14 @@ /area/derelict/bridge) "eE" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell, +/obj/item/stock_parts/cell, /obj/structure/window/reinforced{ dir = 4 }, /turf/open/floor/plasteel, /area/derelict/bridge) "eF" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -1679,7 +1679,7 @@ /turf/open/floor/plasteel, /area/derelict/bridge) "eN" = ( -/obj/item/weapon/paper/fluff/ruins/thederelict/nukie_objectives, +/obj/item/paper/fluff/ruins/thederelict/nukie_objectives, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -1713,12 +1713,12 @@ /area/derelict/bridge) "eT" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel, /area/derelict/bridge) "eU" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/structure/window/reinforced{ dir = 4 }, @@ -1739,7 +1739,7 @@ /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "eX" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/grille/broken, /obj/effect/decal/remains/human{ desc = "This guy seemed to have died in terrible way! Half his remains are dust."; @@ -1759,7 +1759,7 @@ /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fa" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel/airless{ icon_state = "damaged5" }, @@ -1787,7 +1787,7 @@ /area/derelict/singularity_engine) "fe" = ( /obj/structure/table, -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/open/floor/plasteel, /area/derelict/bridge) "ff" = ( @@ -1831,7 +1831,7 @@ /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fl" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/airless, @@ -1924,7 +1924,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/airless, /area/derelict/bridge/access) "fA" = ( @@ -1933,12 +1933,12 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plasteel/airless, /area/derelict/bridge/access) "fB" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, @@ -1958,7 +1958,7 @@ /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fF" = ( -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -2015,13 +2015,13 @@ /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fN" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fO" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless{ @@ -2074,7 +2074,7 @@ }, /area/derelict/singularity_engine) "fV" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "fW" = ( @@ -2084,7 +2084,7 @@ }, /area/derelict/singularity_engine) "fX" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /obj/item/stack/cable_coil/cut, @@ -2167,11 +2167,11 @@ /turf/open/floor/plasteel/airless, /area/derelict/bridge/access) "gh" = ( -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "gi" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "gj" = ( @@ -2230,7 +2230,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -2327,7 +2327,7 @@ }, /area/ruin/unpowered/no_grav) "gI" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless{ @@ -2350,7 +2350,7 @@ /turf/open/floor/plating/airless, /area/derelict/hallway/primary) "gM" = ( -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/airless, /area/derelict/hallway/primary) "gN" = ( @@ -2371,10 +2371,10 @@ /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "gR" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -2462,7 +2462,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/derelict/arrival) "hi" = ( @@ -2485,7 +2485,7 @@ /turf/open/floor/plasteel/black, /area/derelict/medical/chapel) "hm" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/template_noop, /area/template_noop) "hn" = ( @@ -2493,7 +2493,7 @@ /turf/template_noop, /area/derelict/singularity_engine) "ho" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -2546,7 +2546,7 @@ /turf/open/floor/plating/airless, /area/derelict/medical) "hy" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/grille/broken, /turf/open/floor/plating/airless, /area/derelict/medical) @@ -2554,7 +2554,7 @@ /turf/open/floor/plating/airless, /area/derelict/medical) "hA" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -2604,7 +2604,7 @@ /turf/open/floor/plasteel/airless/white, /area/derelict/medical) "hJ" = ( -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/open/floor/plasteel/airless/white, /area/derelict/medical) "hK" = ( @@ -2627,7 +2627,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/airless, @@ -2779,7 +2779,7 @@ /turf/open/floor/plating/airless, /area/derelict/medical) "im" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating/airless, /area/derelict/singularity_engine) "in" = ( @@ -2875,7 +2875,7 @@ dir = 8 }, /obj/structure/window/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/airless/white, /area/derelict/medical) "iC" = ( @@ -2933,7 +2933,7 @@ /turf/open/floor/plating, /area/derelict/medical/chapel) "iL" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/airless/white, @@ -2967,7 +2967,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "iR" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/template_noop, @@ -3032,7 +3032,7 @@ /turf/open/floor/plasteel/airless/white, /area/derelict/medical) "iZ" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/airless/white, /area/derelict/medical) "ja" = ( @@ -3108,7 +3108,7 @@ }, /area/derelict/medical) "jk" = ( -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/airless{ icon_state = "damaged3" }, @@ -3131,11 +3131,11 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "jn" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless, /area/ruin/unpowered/no_grav) "jo" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -3164,7 +3164,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/hallway/primary) "jt" = ( -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/derelict/arrival) "ju" = ( @@ -3744,7 +3744,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/hallway/primary/port) "kU" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/template_noop, /area/template_noop) "kV" = ( @@ -3760,7 +3760,7 @@ /area/derelict/hallway/primary) "kX" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell, +/obj/item/stock_parts/cell, /turf/open/floor/plasteel/airless, /area/derelict/hallway/primary) "kY" = ( @@ -3841,8 +3841,8 @@ lootcount = 2; name = "2maintenance loot spawner" }, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/cultivator, +/obj/item/shovel/spade, +/obj/item/cultivator, /turf/open/floor/plasteel/airless, /area/ruin/unpowered/no_grav) "ll" = ( @@ -3858,11 +3858,11 @@ /turf/open/floor/plasteel, /area/derelict/arrival) "ln" = ( -/obj/item/weapon/stock_parts/manipulator{ +/obj/item/stock_parts/manipulator{ pixel_x = -15; pixel_y = 10 }, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/open/floor/plating/airless, /area/derelict/hallway/primary) "lo" = ( @@ -3881,15 +3881,15 @@ /area/derelict/hallway/primary) "lq" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ list_reagents = list("sacid" = 50) }, -/obj/item/weapon/paper/crumpled/bloody{ +/obj/item/paper/crumpled/bloody{ desc = "Looks like someone started shakily writing a will in space common, but were interrupted by something bloody..."; info = "I, Victor Belyakov, do hereby leave my _- "; name = "unfinished paper scrap" }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/airless, /area/derelict/hallway/primary) "lr" = ( @@ -4093,7 +4093,7 @@ /turf/open/floor/plating, /area/derelict/arrival) "ma" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -4107,7 +4107,7 @@ /obj/machinery/door/window{ dir = 8 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless, @@ -4164,8 +4164,8 @@ /area/derelict/hallway/secondary) "mm" = ( /obj/structure/grille, -/obj/item/weapon/shard, -/obj/item/weapon/shard{ +/obj/item/shard, +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -4209,7 +4209,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/hallway/secondary) "mv" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/template_noop, @@ -4246,7 +4246,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/hallway/secondary) "mC" = ( -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -4306,7 +4306,7 @@ /turf/open/floor/plating/airless, /area/derelict/atmospherics) "mM" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless, @@ -4748,7 +4748,7 @@ /turf/open/floor/plasteel/airless, /area/derelict/se_solar) "nX" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/plasteel/airless, /area/derelict/se_solar) "nY" = ( @@ -4778,7 +4778,7 @@ /turf/open/floor/plating/airless, /area/derelict/se_solar) "oa" = ( -/obj/item/weapon/paper/fluff/ruins/thederelict/syndie_mission, +/obj/item/paper/fluff/ruins/thederelict/syndie_mission, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, diff --git a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm index fda38fb9ce4..f2530ff0264 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedteleporter.dmm @@ -22,7 +22,7 @@ /turf/open/floor/plating/airless, /area/AIsattele) "g" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -58,7 +58,7 @@ /turf/open/floor/plating/airless, /area/AIsattele) "l" = ( -/obj/item/weapon/stock_parts/cell, +/obj/item/stock_parts/cell, /turf/open/floor/plating/airless, /area/AIsattele) "m" = ( @@ -111,8 +111,8 @@ /turf/open/floor/plating/airless, /area/AIsattele) "w" = ( -/obj/item/weapon/shard, -/obj/item/weapon/electronics/apc, +/obj/item/shard, +/obj/item/electronics/apc, /turf/open/floor/plating/airless, /area/AIsattele) "x" = ( @@ -120,7 +120,7 @@ /turf/open/floor/plating/airless, /area/AIsattele) "y" = ( -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -130,9 +130,9 @@ /obj/structure/closet/crate, /obj/item/device/aicard, /obj/item/device/multitool, -/obj/item/weapon/weldingtool, -/obj/item/weapon/wrench, -/obj/item/weapon/circuitboard/computer/teleporter, +/obj/item/weldingtool, +/obj/item/wrench, +/obj/item/circuitboard/computer/teleporter, /turf/open/floor/plating/airless, /area/AIsattele) "A" = ( diff --git a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm index 9cc48a03fa0..6e0d4fda569 100644 --- a/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm +++ b/_maps/RandomRuins/SpaceRuins/abandonedzoo.dmm @@ -153,9 +153,9 @@ /area/ruin/abandonedzoo) "ax" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/clothing/mask/surgical, -/obj/item/weapon/razor, +/obj/item/razor, /obj/machinery/light{ dir = 8 }, @@ -168,11 +168,11 @@ /area/ruin/abandonedzoo) "az" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/machinery/light{ dir = 4 }, @@ -249,7 +249,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/gun/energy/floragun, +/obj/item/gun/energy/floragun, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -317,7 +317,7 @@ /area/ruin/abandonedzoo) "aN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -330,8 +330,8 @@ /area/ruin/abandonedzoo) "aP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/liver_enhance_virion, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/liver_enhance_virion, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -365,7 +365,7 @@ d2 = 4 }, /obj/structure/rack, -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/melee/baton/cattleprod, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel{ icon_state = "dark" @@ -384,15 +384,15 @@ }, /obj/structure/rack, /obj/item/clothing/suit/space/hardsuit/medical, -/obj/item/weapon/tank/internals/emergency_oxygen/double, +/obj/item/tank/internals/emergency_oxygen/double, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/abandonedzoo) "aU" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/shield/riot, +/obj/item/crowbar, +/obj/item/shield/riot, /obj/machinery/light{ dir = 1 }, @@ -408,21 +408,21 @@ /area/ruin/abandonedzoo) "aW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/abandonedzoo) "aX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/chem_grenade/antiweed{ +/obj/item/grenade/chem_grenade/antiweed{ pixel_x = 3; pixel_y = 5 }, -/obj/item/weapon/grenade/chem_grenade/antiweed{ +/obj/item/grenade/chem_grenade/antiweed{ pixel_x = 4 }, -/obj/item/weapon/grenade/chem_grenade/antiweed{ +/obj/item/grenade/chem_grenade/antiweed{ pixel_x = -3; pixel_y = -1 }, @@ -435,7 +435,7 @@ /area/ruin/abandonedzoo) "aY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/temperature{ +/obj/item/gun/energy/temperature{ pin = /obj/item/device/firing_pin }, /turf/open/floor/plasteel{ @@ -444,8 +444,8 @@ /area/ruin/abandonedzoo) "aZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel, +/obj/item/cultivator, +/obj/item/shovel, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -518,21 +518,21 @@ /area/ruin/abandonedzoo) "bi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/hypospray/medipen/stimpack, -/obj/item/weapon/reagent_containers/glass/bottle/mutagen, +/obj/item/reagent_containers/hypospray/medipen/stimpack, +/obj/item/reagent_containers/glass/bottle/mutagen, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/abandonedzoo) "bj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/hemostat, -/obj/item/weapon/scalpel, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/retractor, -/obj/item/weapon/cautery, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/hemostat, +/obj/item/scalpel, +/obj/item/surgical_drapes, +/obj/item/retractor, +/obj/item/cautery, +/obj/item/circular_saw, /obj/machinery/light, /turf/open/floor/plasteel{ icon_state = "dark" @@ -559,7 +559,7 @@ /area/ruin/abandonedzoo) "bn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/carrotfries, +/obj/item/reagent_containers/food/snacks/carrotfries, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -590,7 +590,7 @@ /area/ruin/abandonedzoo) "bp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel{ icon_state = "dark" @@ -602,7 +602,7 @@ pixel_x = 3; pixel_y = -4 }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /turf/open/floor/plating, /area/ruin/abandonedzoo) "br" = ( @@ -750,13 +750,13 @@ density = 0; icon_state = "brokengrille" }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/airless, /area/ruin/abandonedzoo) "bO" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless, /area/ruin/abandonedzoo) "bP" = ( @@ -796,7 +796,7 @@ /area/ruin/abandonedzoo) "bT" = ( /obj/structure/grille, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -813,7 +813,7 @@ /turf/template_noop, /area/template_noop) "bW" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/template_noop, /area/template_noop) "bX" = ( diff --git a/_maps/RandomRuins/SpaceRuins/asteroid3.dmm b/_maps/RandomRuins/SpaceRuins/asteroid3.dmm index c51d254300e..cb02102435b 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid3.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid3.dmm @@ -16,7 +16,7 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "f" = ( -/obj/item/weapon/pickaxe/diamond, +/obj/item/pickaxe/diamond, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) diff --git a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm index bbbd529e8af..7a087eacf66 100644 --- a/_maps/RandomRuins/SpaceRuins/asteroid4.dmm +++ b/_maps/RandomRuins/SpaceRuins/asteroid4.dmm @@ -44,12 +44,12 @@ /obj/structure/chair{ dir = 1 }, -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/mob_spawn/human/clown{ brute_damage = 120; oxy_damage = 75 }, -/obj/item/weapon/paper/fluff/ruins/asteroid4/extraction, +/obj/item/paper/fluff/ruins/asteroid4/extraction, /obj/item/stack/sheet/mineral/bananium{ amount = 15 }, @@ -59,7 +59,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -26 }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm index a9232ea33a2..a9e002fa632 100644 --- a/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm +++ b/_maps/RandomRuins/SpaceRuins/bigderelict1.dmm @@ -83,7 +83,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargobay) "aq" = ( @@ -171,29 +171,29 @@ /area/ruin/derelictoutpost/dockedship) "aE" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aF" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aG" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aH" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aI" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/stock_parts/cell/hyper, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/storage/toolbox/electrical, +/obj/item/stock_parts/cell/hyper, +/obj/item/stock_parts/cell/high, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aJ" = ( @@ -227,10 +227,10 @@ /area/ruin/derelictoutpost/dockedship) "aP" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) @@ -259,7 +259,7 @@ name = "critter crate - mr.tiggles"; opened = 1 }, -/obj/item/weapon/paper/crumpled/ruins/snowdin{ +/obj/item/paper/crumpled/ruins/snowdin{ info = "A crumpled piece of manifest paper, out of the barely legible pen writing, you can see something about a warning involving whatever was originally in the crate." }, /obj/structure/alien/weeds{ @@ -271,7 +271,7 @@ /area/ruin/derelictoutpost/dockedship) "aV" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/alien/weeds{ color = "#4BAE56"; desc = "A thick gelatinous surface covers the floor. Someone get the golashes."; @@ -281,8 +281,8 @@ /area/ruin/derelictoutpost/dockedship) "aW" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/stock_parts/cell/hyper, +/obj/item/storage/toolbox/electrical, +/obj/item/stock_parts/cell/hyper, /turf/open/floor/mineral/titanium/yellow, /area/ruin/derelictoutpost/dockedship) "aX" = ( @@ -311,7 +311,7 @@ /area/ruin/derelictoutpost/powerstorage) "bc" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/hyper, +/obj/item/stock_parts/cell/hyper, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -455,7 +455,7 @@ name = "Tradeport Officer"; random = 1 }, -/obj/item/weapon/paper/crumpled/ruins/snowdin{ +/obj/item/paper/crumpled/ruins/snowdin{ icon_state = "scrap_bloodied"; info = "If anyone finds this, please, don't let my kids know I died a coward.." }, @@ -596,7 +596,7 @@ /turf/open/floor/plasteel, /area/ruin/derelictoutpost/powerstorage) "bI" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911{ +/obj/item/gun/ballistic/automatic/pistol/m1911{ spawnwithmagazine = 0 }, /turf/open/floor/plasteel, @@ -634,7 +634,7 @@ /turf/open/floor/mineral/titanium/blue, /area/ruin/derelictoutpost/dockedship) "bO" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/alien/weeds{ color = "#4BAE56"; desc = "A thick gelatinous surface covers the floor. Someone get the golashes."; @@ -659,7 +659,7 @@ /turf/open/floor/plasteel/darkred, /area/ruin/derelictoutpost) "bR" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/alien/weeds{ color = "#4BAE56"; desc = "A thick gelatinous surface covers the floor. Someone get the golashes."; @@ -778,7 +778,7 @@ /area/ruin/derelictoutpost/dockedship) "cd" = ( /obj/structure/grille/broken, -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/decal/cleanable/blood/old{ icon_state = "trails_1"; name = "dried blood trail" @@ -811,7 +811,7 @@ /turf/open/floor/plasteel/darkred, /area/ruin/derelictoutpost) "cg" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/item/stack/cable_coil{ amount = 2; icon_state = "coil_red2"; @@ -888,13 +888,13 @@ /area/ruin/derelictoutpost) "cn" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/stack/cable_coil, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/powerstorage) "co" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/powerstorage) "cp" = ( @@ -1137,7 +1137,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargobay) "cK" = ( @@ -1213,7 +1213,7 @@ /turf/open/floor/plasteel, /area/ruin/derelictoutpost) "cP" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel, /area/ruin/derelictoutpost) "cQ" = ( @@ -1437,7 +1437,7 @@ desc = "A thick gelatinous surface covers the floor. Someone get the golashes."; name = "gelatinous floor" }, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/asteroid, /area/ruin/derelictoutpost) "dk" = ( @@ -1546,7 +1546,7 @@ desc = "A thick gelatinous surface covers the floor. Someone get the golashes."; name = "gelatinous floor" }, -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911{ +/obj/item/gun/ballistic/automatic/pistol/m1911{ spawnwithmagazine = 0 }, /obj/item/ammo_box/magazine/m45, @@ -1739,7 +1739,7 @@ /turf/open/floor/plating, /area/ruin/derelictoutpost) "dJ" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911{ +/obj/item/gun/ballistic/automatic/pistol/m1911{ spawnwithmagazine = 0 }, /obj/structure/alien/weeds{ @@ -1912,7 +1912,7 @@ /area/ruin/derelictoutpost/cargostorage) "ea" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/pill_bottle/stimulant, +/obj/item/storage/pill_bottle/stimulant, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) @@ -1931,7 +1931,7 @@ /area/ruin/derelictoutpost/cargostorage) "ec" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -1940,11 +1940,11 @@ /area/ruin/derelictoutpost/cargostorage) "ed" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) @@ -2039,14 +2039,14 @@ /area/ruin/unpowered/no_grav) "eo" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/mask/breath, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) "ep" = ( /obj/structure/closet/crate/engineering/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/stack/cable_coil, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -2056,24 +2056,24 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) "er" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) "es" = ( /obj/structure/closet/crate/engineering, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) "et" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/fire, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) @@ -2165,9 +2165,9 @@ /area/ruin/derelictoutpost/cargostorage) "eE" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/storage/firstaid/toxin, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/ruin/derelictoutpost/cargostorage) diff --git a/_maps/RandomRuins/SpaceRuins/bus.dmm b/_maps/RandomRuins/SpaceRuins/bus.dmm index 5af3b742e70..701e8247e27 100644 --- a/_maps/RandomRuins/SpaceRuins/bus.dmm +++ b/_maps/RandomRuins/SpaceRuins/bus.dmm @@ -24,20 +24,20 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/stock_parts/manipulator/femto, +/obj/item/stock_parts/manipulator/femto, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "ah" = ( /obj/item/stack/cable_coil{ amount = 5 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "ai" = ( -/obj/item/weapon/book/random, +/obj/item/book/random, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aj" = ( @@ -52,7 +52,7 @@ /area/ruin/unpowered/no_grav) "al" = ( /obj/effect/decal/cleanable/salt, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "am" = ( @@ -68,7 +68,7 @@ /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" }, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -92,7 +92,7 @@ /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" }, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" @@ -102,7 +102,7 @@ /obj/structure/fluff/bus/passable/seat{ icon_state = "backseat" }, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -112,7 +112,7 @@ icon_state = "driverseat"; pixel_y = 17 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/cherry_bomb, +/obj/item/reagent_containers/food/snacks/grown/cherry_bomb, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" @@ -146,7 +146,7 @@ /area/ruin/unpowered/no_grav) "ay" = ( /obj/structure/fluff/bus/passable, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -160,9 +160,9 @@ "aA" = ( /obj/structure/fluff/bus/passable, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/faggot, -/obj/item/weapon/reagent_containers/food/snacks/faggot, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -176,7 +176,7 @@ /area/ruin/unpowered/no_grav) "aC" = ( /obj/structure/fluff/bus/passable, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" @@ -184,7 +184,7 @@ /area/ruin/unpowered/no_grav) "aD" = ( /obj/structure/fluff/bus/passable, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -212,7 +212,7 @@ /area/ruin/unpowered/no_grav) "aH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aI" = ( @@ -258,15 +258,15 @@ /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aP" = ( -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aQ" = ( -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) "aR" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/decal/cleanable/oil, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered/no_grav) @@ -284,7 +284,7 @@ icon_state = "backseat" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, @@ -320,14 +320,14 @@ "aZ" = ( /obj/structure/fluff/bus/passable, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/faggot, +/obj/item/reagent_containers/food/snacks/faggot, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, /area/ruin/unpowered/no_grav) "ba" = ( /obj/structure/fluff/bus/passable, -/obj/item/weapon/banhammer, +/obj/item/banhammer, /turf/open/floor/plasteel/airless/black{ icon_state = "bus" }, diff --git a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm index c4b1fec1f19..b37a18798c4 100644 --- a/_maps/RandomRuins/SpaceRuins/caravanambush.dmm +++ b/_maps/RandomRuins/SpaceRuins/caravanambush.dmm @@ -66,7 +66,7 @@ /obj/item/stack/sheet/mineral/gold{ amount = 25 }, -/obj/item/weapon/coin/plasma, +/obj/item/coin/plasma, /turf/open/floor/plasteel, /area/ruin/powered) "ao" = ( @@ -74,19 +74,19 @@ /obj/item/stack/sheet/mineral/gold{ amount = 25 }, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/mythril, -/obj/item/weapon/coin/plasma, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/mythril, +/obj/item/coin/plasma, /turf/open/floor/plasteel, /area/ruin/powered) "ap" = ( /obj/structure/table, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/mythril, -/obj/item/weapon/coin/plasma, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/gold, +/obj/item/coin/mythril, +/obj/item/coin/plasma, /turf/open/floor/plasteel, /area/ruin/powered) "aq" = ( @@ -111,7 +111,7 @@ /area/ruin/powered) "at" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/plasteel, /area/ruin/powered) "au" = ( @@ -122,7 +122,7 @@ /area/ruin/powered) "av" = ( /obj/structure/rack, -/obj/item/weapon/storage/bag/money/vault, +/obj/item/storage/bag/money/vault, /turf/open/floor/plasteel, /area/ruin/powered) "aw" = ( @@ -139,7 +139,7 @@ /area/ruin/powered) "az" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/money/vault, +/obj/item/storage/bag/money/vault, /turf/open/floor/plasteel, /area/ruin/powered) "aA" = ( @@ -211,7 +211,7 @@ /turf/closed/wall/mineral/iron, /area/ruin/unpowered/no_grav) "aL" = ( -/obj/item/weapon/coin/mythril, +/obj/item/coin/mythril, /turf/open/floor/plasteel, /area/ruin/powered) "aM" = ( @@ -232,7 +232,7 @@ /area/ruin/unpowered/no_grav) "aP" = ( /obj/structure/chair, -/obj/item/weapon/shard, +/obj/item/shard, /obj/item/stack/sheet/metal, /turf/open/floor/mineral/plastitanium/airless, /area/ruin/unpowered/no_grav) @@ -242,7 +242,7 @@ /turf/open/floor/mineral/plastitanium/airless, /area/ruin/unpowered/no_grav) "aR" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/mineral/plastitanium/airless, /area/ruin/unpowered/no_grav) "aS" = ( @@ -259,9 +259,9 @@ /area/template_noop) "aU" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/plasma/full, -/obj/item/weapon/tank/internals/plasma/full, -/obj/item/weapon/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /turf/open/floor/plasteel, /area/ruin/powered) "aV" = ( @@ -290,8 +290,8 @@ /area/ruin/powered) "aZ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel, /area/ruin/powered) "ba" = ( @@ -320,7 +320,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/item/weapon/shard, +/obj/item/shard, /obj/item/stack/sheet/metal, /obj/effect/decal/cleanable/shreds, /turf/open/floor/mineral/plastitanium/airless, @@ -337,7 +337,7 @@ /area/ruin/unpowered/no_grav) "bh" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/ballistic/automatic/pistol/APS, +/obj/item/gun/ballistic/automatic/pistol/APS, /turf/open/floor/wood/airless, /area/ruin/unpowered/no_grav) "bi" = ( @@ -348,7 +348,7 @@ /area/ruin/unpowered/no_grav) "bj" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/ballistic/shotgun/automatic/dual_tube, +/obj/item/gun/ballistic/shotgun/automatic/dual_tube, /turf/open/floor/wood/airless, /area/ruin/unpowered/no_grav) "bk" = ( @@ -438,7 +438,7 @@ /area/ruin/unpowered) "by" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "bz" = ( @@ -470,7 +470,7 @@ /obj/item/ammo_casing/shotgun/techshell, /obj/item/ammo_casing/shotgun/techshell, /obj/item/ammo_casing/shotgun/pulseslug, -/obj/item/weapon/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "bE" = ( @@ -494,7 +494,7 @@ /area/ruin/unpowered) "bI" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "bJ" = ( @@ -523,8 +523,8 @@ /area/ruin/unpowered) "bN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "bO" = ( @@ -585,8 +585,8 @@ /obj/item/ammo_casing/shotgun/frag12, /obj/item/ammo_casing/shotgun/frag12, /obj/item/ammo_casing/shotgun/frag12, -/obj/item/weapon/storage/box/beanbag, -/obj/item/weapon/storage/box/rubbershot, +/obj/item/storage/box/beanbag, +/obj/item/storage/box/rubbershot, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "bW" = ( @@ -634,7 +634,7 @@ "cd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "ce" = ( @@ -674,7 +674,7 @@ /area/ruin/unpowered) "ck" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/ballistic/revolver/grenadelauncher/unrestricted, +/obj/item/gun/ballistic/revolver/grenadelauncher/unrestricted, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cl" = ( @@ -705,15 +705,15 @@ /area/ruin/unpowered) "cp" = ( /obj/structure/closet/crate/secure/engineering, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cq" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/decal/cleanable/dirt, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) @@ -737,25 +737,25 @@ /area/ruin/powered) "cu" = ( /obj/structure/closet/crate/secure/engineering, -/obj/item/weapon/wrench{ +/obj/item/wrench{ color = "#ff0000"; desc = "A prototype of a new wrench design, allegedly the red color scheme makes it go faster."; name = "experimental wrench"; toolspeed = 3 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ color = "#ff0000"; desc = "A prototype of a new screwdriver design, allegedly the red color scheme makes it go faster."; name = "experimental screwdriver"; toolspeed = 3 }, -/obj/item/weapon/wirecutters{ +/obj/item/wirecutters{ color = "#ff0000"; desc = "A prototype of a new wirecutter design, allegedly the red color scheme makes it go faster."; name = "experimental wirecutters"; toolspeed = 3 }, -/obj/item/weapon/crowbar/red{ +/obj/item/crowbar/red{ color = "#ff0000"; desc = "A prototype of a new crowbar design, allegedly the red color scheme makes it go faster."; name = "experimental crowbar"; @@ -805,20 +805,20 @@ /area/ruin/unpowered) "cA" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cB" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/syringe/syndicate, -/obj/item/weapon/gun/syringe/rapidsyringe, +/obj/item/gun/syringe/syndicate, +/obj/item/gun/syringe/rapidsyringe, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cC" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/ballistic/automatic/c20r/toy/unrestricted, -/obj/item/weapon/gun/ballistic/automatic/c20r/toy/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/toy/unrestricted, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cD" = ( @@ -829,7 +829,7 @@ /area/ruin/unpowered) "cE" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "cF" = ( @@ -855,7 +855,7 @@ /area/ruin/unpowered) "cI" = ( /obj/structure/grille/broken, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ icon_plating = "platingdmg1"; icon_state = "platingdmg1" @@ -889,15 +889,15 @@ /area/ruin/unpowered) "cN" = ( /obj/structure/closet/crate/secure/plasma, -/obj/item/weapon/tank/internals/plasma/full, -/obj/item/weapon/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /obj/item/stack/sheet/mineral/plasma{ amount = 25 }, /turf/open/floor/mineral/titanium/yellow/airless, /area/ruin/unpowered) "cO" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "cP" = ( @@ -950,7 +950,7 @@ /area/ruin/unpowered) "cW" = ( /obj/structure/closet/crate/secure/plasma, -/obj/item/weapon/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /obj/item/stack/sheet/mineral/plasma{ amount = 25 }, @@ -976,7 +976,7 @@ /area/ruin/unpowered) "da" = ( /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /mob/living/simple_animal/hostile/syndicate/melee/space{ environment_smash = 0; name = "Syndicate Salvage Worker" @@ -984,14 +984,14 @@ /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "db" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ icon_plating = "platingdmg1"; icon_state = "platingdmg1" }, /area/ruin/unpowered) "dc" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/template_noop, /area/template_noop) "dd" = ( @@ -1008,8 +1008,8 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 25 }, -/obj/item/weapon/tank/internals/plasma/full, -/obj/item/weapon/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /turf/open/floor/mineral/plastitanium, /area/ruin/powered) "df" = ( @@ -1069,7 +1069,7 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 25 }, -/obj/item/weapon/tank/internals/plasma/full, +/obj/item/tank/internals/plasma/full, /turf/open/floor/mineral/plastitanium, /area/ruin/powered) "dm" = ( @@ -1111,7 +1111,7 @@ /area/ruin/unpowered) "dr" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "ds" = ( diff --git a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm index 618366df7c8..76197719333 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedclownship.dmm @@ -27,11 +27,11 @@ /area/ruin/unpowered) "i" = ( /obj/structure/closet/crate, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "j" = ( @@ -39,7 +39,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/ore/bananium, +/obj/item/ore/bananium, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "k" = ( @@ -78,17 +78,17 @@ /turf/closed/mineral/random, /area/ruin/unpowered) "o" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered) "p" = ( -/obj/item/weapon/ore/bananium, +/obj/item/ore/bananium, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "q" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /obj/structure/chair{ @@ -103,7 +103,7 @@ /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "s" = ( -/obj/item/weapon/paper/fluff/ruins/crashedclownship/true_nation, +/obj/item/paper/fluff/ruins/crashedclownship/true_nation, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "t" = ( @@ -126,36 +126,36 @@ }, /area/ruin/unpowered) "u" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/chair{ dir = 8 }, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "v" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "w" = ( -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "x" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "y" = ( /obj/structure/closet/crate, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) "z" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/mineral/bananium/airless, /area/ruin/unpowered) diff --git a/_maps/RandomRuins/SpaceRuins/crashedship.dmm b/_maps/RandomRuins/SpaceRuins/crashedship.dmm index ecc3332dde4..9b6cce271ec 100644 --- a/_maps/RandomRuins/SpaceRuins/crashedship.dmm +++ b/_maps/RandomRuins/SpaceRuins/crashedship.dmm @@ -3,7 +3,7 @@ /turf/template_noop, /area/template_noop) "ab" = ( -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/structure/lattice, /turf/template_noop, /area/template_noop) @@ -33,7 +33,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/engine, /area/awaymission/BMPship/Aft) @@ -104,15 +104,15 @@ /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "au" = ( -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/structure/closet/crate, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "av" = ( -/obj/item/weapon/scalpel, +/obj/item/scalpel, /obj/structure/closet/crate, -/obj/item/weapon/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "aw" = ( @@ -120,7 +120,7 @@ /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "ax" = ( -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "ay" = ( @@ -157,8 +157,8 @@ "aC" = ( /obj/structure/closet/crate/freezer, /obj/item/organ/appendix, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -167,8 +167,8 @@ "aD" = ( /obj/structure/closet/crate/freezer, /obj/item/organ/brain, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -184,7 +184,7 @@ /area/awaymission/BMPship/Aft) "aF" = ( /obj/structure/table, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/machinery/light/small{ dir = 1 }, @@ -230,11 +230,11 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aN" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aO" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "aP" = ( @@ -261,12 +261,12 @@ /obj/structure/table/wood, /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c100, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/wood, /area/awaymission/BMPship/Fore) "aS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/open/floor/wood, /area/awaymission/BMPship/Fore) "aT" = ( @@ -363,8 +363,8 @@ /area/awaymission/BMPship/Aft) "bh" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "bi" = ( @@ -503,7 +503,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "bF" = ( @@ -520,7 +520,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "bH" = ( @@ -594,10 +594,10 @@ /area/awaymission/BMPship/Aft) "bR" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /obj/item/organ/appendix, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -651,10 +651,10 @@ /area/awaymission/BMPship/Fore) "bX" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, -/obj/item/weapon/screwdriver, -/obj/item/weapon/paper/fluff/ruins/crashedship/scribbled, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, +/obj/item/screwdriver, +/obj/item/paper/fluff/ruins/crashedship/scribbled, +/obj/item/screwdriver, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "bY" = ( @@ -702,14 +702,14 @@ /area/awaymission/BMPship/Midship) "cf" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife/butcher, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/kitchen/knife/butcher, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/snacks/meat, /turf/open/floor/plasteel/barber, /area/awaymission/BMPship/Midship) "cg" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/barber, /area/awaymission/BMPship/Midship) "ch" = ( @@ -729,12 +729,12 @@ /area/awaymission/BMPship/Midship) "cj" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "ck" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "cl" = ( @@ -769,14 +769,14 @@ /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "cp" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "cq" = ( /turf/open/floor/plasteel, /area/awaymission/BMPship/Midship) "cr" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, /area/awaymission/BMPship/Midship) "cs" = ( @@ -858,7 +858,7 @@ /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "cJ" = ( -/obj/item/weapon/reagent_containers/food/snacks/hugemushroomslice, +/obj/item/reagent_containers/food/snacks/hugemushroomslice, /turf/open/floor/plasteel, /area/awaymission/BMPship/Midship) "cK" = ( @@ -890,7 +890,7 @@ /turf/open/floor/plasteel/barber, /area/awaymission/BMPship/Midship) "cP" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "cQ" = ( @@ -909,8 +909,8 @@ /area/awaymission/BMPship/Aft) "cS" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, /turf/open/floor/plasteel/white, /area/awaymission/BMPship/Aft) "cT" = ( @@ -918,7 +918,7 @@ /turf/open/floor/plasteel/white, /area/awaymission/BMPship/Aft) "cU" = ( -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/white, /area/awaymission/BMPship/Aft) "cV" = ( @@ -951,12 +951,12 @@ /area/awaymission/BMPship/Aft) "cY" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/crashedship/captains_log, +/obj/item/paper/fluff/ruins/crashedship/captains_log, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "cZ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "da" = ( @@ -1220,7 +1220,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Fore) "dH" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "dI" = ( @@ -1366,7 +1366,7 @@ /area/awaymission/BMPship/Aft) "dY" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1443,7 +1443,7 @@ /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "eg" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/carpet, @@ -1462,7 +1462,7 @@ /turf/open/floor/plating, /area/awaymission/BMPship/Midship) "ek" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "el" = ( @@ -1528,7 +1528,7 @@ /area/awaymission/BMPship/Aft) "et" = ( /obj/structure/rack, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1639,7 +1639,7 @@ /area/awaymission/BMPship/Aft) "eG" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1757,7 +1757,7 @@ /turf/open/floor/carpet, /area/awaymission/BMPship/Fore) "eV" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/awaymission/BMPship/Midship) "eW" = ( @@ -1781,7 +1781,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "fa" = ( @@ -1790,7 +1790,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "fb" = ( @@ -1836,7 +1836,7 @@ dir = 4; id = "meatConvey2" }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plating, /area/awaymission/BMPship/Midship) "fj" = ( @@ -1924,7 +1924,7 @@ /turf/open/floor/plating/airless, /area/awaymission/BMPship/Fore) "fx" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/structure/cable{ @@ -1960,7 +1960,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/bar, /area/awaymission/BMPship/Midship) "fB" = ( @@ -1994,7 +1994,7 @@ /turf/open/floor/plasteel/showroomfloor, /area/awaymission/BMPship/Aft) "fF" = ( -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plasteel/showroomfloor, /area/awaymission/BMPship/Aft) "fG" = ( @@ -2014,7 +2014,7 @@ }, /area/awaymission/BMPship/Fore) "fJ" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ icon_state = "platingdmg1" }, @@ -2049,11 +2049,11 @@ /area/awaymission/BMPship/Midship) "fO" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat, +/obj/item/reagent_containers/food/snacks/meat, /turf/open/floor/plasteel/showroomfloor, /area/awaymission/BMPship/Aft) "fP" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/showroomfloor, /area/awaymission/BMPship/Aft) "fQ" = ( @@ -2161,13 +2161,13 @@ /area/awaymission/BMPship/Aft) "gh" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/crashedship/old_diary, +/obj/item/paper/fluff/ruins/crashedship/old_diary, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gi" = ( /obj/structure/table, -/obj/item/weapon/pen/red, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/pen/red, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gj" = ( @@ -2192,7 +2192,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/engine, /area/awaymission/BMPship/Fore) @@ -2321,7 +2321,7 @@ dir = 4 }, /obj/structure/grille, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/airless, @@ -2361,8 +2361,8 @@ /area/awaymission/BMPship/Aft) "gO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, -/obj/item/weapon/storage/wallet/random, +/obj/item/bedsheet, +/obj/item/storage/wallet/random, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -2436,7 +2436,7 @@ /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "gZ" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/template_noop, @@ -2453,7 +2453,7 @@ /area/awaymission/BMPship/Aft) "hc" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel, /area/awaymission/BMPship/Aft) "hd" = ( @@ -2488,7 +2488,7 @@ }, /area/awaymission/BMPship/Midship) "hh" = ( -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plating/airless, /area/awaymission/BMPship/Midship) "hi" = ( @@ -2544,16 +2544,16 @@ /turf/open/floor/engine, /area/awaymission/BMPship/Aft) "hq" = ( -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "hr" = ( -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "hs" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, /area/awaymission/BMPship/Aft) "ht" = ( diff --git a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm index 46c2dee271d..c8e0bed7cf3 100644 --- a/_maps/RandomRuins/SpaceRuins/deepstorage.dmm +++ b/_maps/RandomRuins/SpaceRuins/deepstorage.dmm @@ -127,7 +127,7 @@ /area/ruin/deepstorage/kitchen) "as" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -261,11 +261,11 @@ /area/ruin/deepstorage/storage) "aH" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/toolbox/drone, -/obj/item/weapon/storage/toolbox/drone, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/toolbox/drone, +/obj/item/storage/toolbox/drone, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/floorgrime, /area/ruin/deepstorage/storage) @@ -286,11 +286,11 @@ /area/ruin/deepstorage/storage) "aJ" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/storage/box/zipties, -/obj/item/weapon/switchblade, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/zipties, +/obj/item/switchblade, /obj/effect/turf_decal/delivery, /obj/item/device/gps{ gpstag = "DEEP" @@ -422,10 +422,10 @@ /obj/item/device/flashlight, /obj/item/device/flashlight, /obj/item/device/flashlight, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe/drill, -/obj/item/weapon/pickaxe/drill, -/obj/item/weapon/pickaxe/drill, +/obj/item/shovel, +/obj/item/pickaxe/drill, +/obj/item/pickaxe/drill, +/obj/item/pickaxe/drill, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/floorgrime, /area/ruin/deepstorage/storage) @@ -437,9 +437,9 @@ /obj/item/device/tape/random, /obj/item/device/tape/random, /obj/item/device/tape/random, -/obj/item/weapon/storage/box/rxglasses, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/storage/box/rxglasses, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/glasses/night, /obj/item/clothing/glasses/night, /obj/effect/turf_decal/delivery, @@ -447,12 +447,12 @@ /area/ruin/deepstorage/storage) "aT" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers, +/obj/item/storage/box/beakers, +/obj/item/storage/box/matches, +/obj/item/storage/box/bodybags, /obj/item/clothing/glasses/meson/engine, /obj/item/clothing/glasses/meson/engine, /obj/effect/turf_decal/delivery, @@ -460,18 +460,18 @@ /area/ruin/deepstorage/storage) "aU" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/kitchen/knife, -/obj/item/weapon/kitchen/knife, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/knife, +/obj/item/kitchen/knife, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/kitchen/rollingpin, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/floorgrime, /area/ruin/deepstorage/storage) "aV" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/defibrillator, -/obj/item/weapon/storage/box/medipens, +/obj/item/defibrillator, +/obj/item/storage/box/medipens, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel/floorgrime, /area/ruin/deepstorage/storage) @@ -491,16 +491,16 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/storage/box/cups, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/ruin/deepstorage/kitchen) "aY" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/soysauce{ +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/soysauce{ pixel_x = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ @@ -530,15 +530,15 @@ /area/ruin/deepstorage/kitchen) "ba" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 9 }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -598,8 +598,8 @@ /area/ruin/deepstorage/hydroponics) "bh" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/storage/bag/plants, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants, /obj/machinery/atmospherics/pipe/simple/supplymain/hidden{ dir = 4 }, @@ -706,7 +706,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -780,8 +780,8 @@ /area/ruin/deepstorage/hydroponics) "bB" = ( /obj/structure/table, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, +/obj/item/cultivator, +/obj/item/hatchet, /turf/open/floor/plasteel/hydrofloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -830,9 +830,9 @@ /area/ruin/deepstorage/storage) "bI" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/storage/box/ingredients/wildcard, -/obj/item/weapon/storage/box/ingredients/wildcard, -/obj/item/weapon/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -950,12 +950,12 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, /obj/machinery/light{ dir = 8 }, @@ -968,12 +968,12 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, -/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1129,9 +1129,9 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/ruins/deepstorage/water_concern, -/obj/item/weapon/paper/fluff/ruins/deepstorage/hydro_notice, -/obj/item/weapon/paper/fluff/ruins/deepstorage/recycling_notice, +/obj/item/paper/fluff/ruins/deepstorage/water_concern, +/obj/item/paper/fluff/ruins/deepstorage/hydro_notice, +/obj/item/paper/fluff/ruins/deepstorage/recycling_notice, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1152,7 +1152,7 @@ /area/ruin/deepstorage) "cl" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -1209,7 +1209,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1272,11 +1272,11 @@ dir = 4 }, /obj/machinery/light, -/obj/item/weapon/reagent_containers/glass/bucket{ +/obj/item/reagent_containers/glass/bucket{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/hydrofloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1295,7 +1295,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/hydrofloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1323,12 +1323,12 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, -/obj/item/weapon/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, +/obj/item/reagent_containers/glass/beaker/waterbottle/large, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1407,7 +1407,7 @@ /area/ruin/deepstorage) "cJ" = ( /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1585,22 +1585,22 @@ /area/ruin/deepstorage/armory) "dc" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/ruin/deepstorage/armory) "dd" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/machinery/light{ dir = 1 }, @@ -1822,18 +1822,18 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/vending_refill/coffee, -/obj/item/weapon/vending_refill/cigarette, -/obj/item/weapon/vending_refill/cigarette, +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/cigarette, +/obj/item/vending_refill/cigarette, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1843,15 +1843,15 @@ /obj/structure/closet/crate{ name = "food crate" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/vending_refill/coffee, -/obj/item/weapon/vending_refill/cigarette, -/obj/item/weapon/vending_refill/cigarette, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/vending_refill/coffee, +/obj/item/vending_refill/cigarette, +/obj/item/vending_refill/cigarette, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -2259,7 +2259,7 @@ /area/ruin/deepstorage/armory) "eh" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ +/obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /obj/structure/cable/yellow{ @@ -2297,7 +2297,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -2429,11 +2429,11 @@ /area/ruin/deepstorage/armory) "ex" = ( /obj/structure/table, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = -3; pixel_y = 6 }, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = 2 }, /obj/structure/reagent_dispensers/peppertank{ @@ -2445,7 +2445,7 @@ /area/ruin/deepstorage/armory) "ey" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/card/id/away{ +/obj/item/card/id/away{ desc = "A specialized ID meant for accessing some sort of specific door."; icon_state = "centcom"; name = "bunker access ID" @@ -2642,12 +2642,12 @@ /area/ruin/deepstorage/armory) "eN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/pill_bottle/charcoal, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/pill_bottle/charcoal, /obj/machinery/light, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -2672,7 +2672,7 @@ /area/ruin/deepstorage/armory) "eP" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/drone, +/obj/item/storage/toolbox/drone, /obj/item/device/flashlight, /obj/item/device/flashlight, /obj/item/device/flashlight/flare, @@ -3011,7 +3011,7 @@ /obj/machinery/atmospherics/components/unary/portables_connector/visible{ dir = 8 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3573,17 +3573,17 @@ /area/ruin/deepstorage/dorm) "gy" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3819,22 +3819,22 @@ dir = 9 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/ruin/deepstorage/power) "gW" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, diff --git a/_maps/RandomRuins/SpaceRuins/derelict4.dmm b/_maps/RandomRuins/SpaceRuins/derelict4.dmm index 6e8d7c6ff72..be888b990b8 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict4.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict4.dmm @@ -46,7 +46,7 @@ /turf/open/floor/plating/airless, /area/ruin/unpowered) "m" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless, /area/ruin/unpowered) "n" = ( @@ -64,7 +64,7 @@ /turf/open/floor/mineral/titanium/blue/airless, /area/ruin/unpowered) "q" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/chair{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/derelict5.dmm b/_maps/RandomRuins/SpaceRuins/derelict5.dmm index 794c6770e06..9a8e5000b9e 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict5.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict5.dmm @@ -35,7 +35,7 @@ /area/ruin/unpowered) "k" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating, /area/ruin/unpowered) "l" = ( @@ -49,7 +49,7 @@ /area/ruin/unpowered) "n" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/plating, /area/ruin/unpowered) "o" = ( diff --git a/_maps/RandomRuins/SpaceRuins/derelict6.dmm b/_maps/RandomRuins/SpaceRuins/derelict6.dmm index fe6d576a398..4bd8cd0f03a 100644 --- a/_maps/RandomRuins/SpaceRuins/derelict6.dmm +++ b/_maps/RandomRuins/SpaceRuins/derelict6.dmm @@ -218,7 +218,7 @@ /area/ruin/unpowered) "aJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "aK" = ( @@ -268,12 +268,12 @@ /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "aT" = ( -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/airless/bar, /area/ruin/unpowered) "aU" = ( /obj/structure/table/wood, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ icon_plating = "platingdmg3"; icon_state = "platingdmg3" @@ -317,12 +317,12 @@ /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "bb" = ( -/obj/item/weapon/reagent_containers/food/snacks/donkpocket, +/obj/item/reagent_containers/food/snacks/donkpocket, /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "bc" = ( /obj/structure/table, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel/airless/cafeteria, /area/ruin/unpowered) "bd" = ( @@ -395,7 +395,7 @@ /area/ruin/unpowered) "bn" = ( /obj/structure/lattice, -/obj/item/weapon/shard, +/obj/item/shard, /turf/template_noop, /area/template_noop) "bo" = ( diff --git a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm index 2e893f57377..38db99b0589 100644 --- a/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm +++ b/_maps/RandomRuins/SpaceRuins/gasthelizards.dmm @@ -97,42 +97,42 @@ "m" = ( /obj/structure/closet/crate/freezer, /obj/item/stack/sheet/animalhide/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/gasthelizard) "n" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/gasthelizard) "o" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /obj/item/clothing/under/rank/prisoner, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -212,9 +212,9 @@ /area/ruin/gasthelizard) "y" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/knife/butcher, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/kitchen/knife/butcher, +/obj/item/restraints/handcuffs, +/obj/item/reagent_containers/spray/pepper, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -244,8 +244,8 @@ "D" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/straight_jacket, -/obj/item/weapon/reagent_containers/syringe/lethal, -/obj/item/weapon/reagent_containers/syringe/lethal/choral, +/obj/item/reagent_containers/syringe/lethal, +/obj/item/reagent_containers/syringe/lethal/choral, /turf/open/floor/plasteel{ icon_state = "dark" }, @@ -274,22 +274,22 @@ }, /area/ruin/gasthelizard) "I" = ( -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate{ +/obj/item/reagent_containers/glass/bottle/chloralhydrate{ name = "chloral hydrate bottle" }, -/obj/item/weapon/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/glass/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/glass/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 @@ -301,23 +301,23 @@ /area/ruin/gasthelizard) "J" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/drone, -/obj/item/weapon/melee/baton/cattleprod, +/obj/item/storage/toolbox/drone, +/obj/item/melee/baton/cattleprod, /turf/open/floor/plasteel, /area/ruin/gasthelizard) "K" = ( /obj/structure/table, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel, /area/ruin/gasthelizard) "L" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel, /area/ruin/gasthelizard) "M" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /turf/open/floor/plasteel, /area/ruin/gasthelizard) "N" = ( @@ -337,13 +337,13 @@ /area/ruin/gasthelizard) "P" = ( /obj/structure/table/reinforced, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/hemostat, -/obj/item/weapon/scalpel, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/retractor, -/obj/item/weapon/cautery, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/hemostat, +/obj/item/scalpel, +/obj/item/surgical_drapes, +/obj/item/retractor, +/obj/item/cautery, +/obj/item/circular_saw, /obj/machinery/light, /turf/open/floor/plasteel{ icon_state = "dark" @@ -358,11 +358,11 @@ /area/ruin/gasthelizard) "R" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/bottle/mutagen, -/obj/item/weapon/reagent_containers/glass/bottle/mutagen, -/obj/item/weapon/razor, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/mutagen, +/obj/item/reagent_containers/glass/bottle/mutagen, +/obj/item/razor, /turf/open/floor/plasteel{ icon_state = "dark" }, diff --git a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm index 19dd1026dd6..36756044156 100644 --- a/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm +++ b/_maps/RandomRuins/SpaceRuins/intactemptyship.dmm @@ -90,8 +90,8 @@ /area/ruin/powered/authorship) "r" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/authorship) "s" = ( @@ -121,8 +121,8 @@ /area/ruin/powered/authorship) "w" = ( /obj/structure/table/wood, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/mineral/titanium/purple, /area/ruin/powered/authorship) "x" = ( diff --git a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm index 52b25cdffd8..6e648426b46 100644 --- a/_maps/RandomRuins/SpaceRuins/listeningstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/listeningstation.dmm @@ -27,7 +27,7 @@ /area/awaymission/listeningpost) "h" = ( /obj/structure/table, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /obj/item/device/radio/intercom{ desc = "Talk through this. Evilly"; freerange = 1; @@ -69,8 +69,8 @@ /area/awaymission/listeningpost) "o" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/november, -/obj/item/weapon/pen, +/obj/item/paper/fluff/ruins/listeningstation/reports/november, +/obj/item/pen, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "p" = ( @@ -95,8 +95,8 @@ "r" = ( /obj/machinery/door/airlock, /obj/structure/safe/floor, -/obj/item/weapon/paper/fluff/ruins/listeningstation/odd_report, -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/paper/fluff/ruins/listeningstation/odd_report, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "s" = ( @@ -123,7 +123,7 @@ /area/ruin/unpowered/no_grav) "v" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "w" = ( @@ -150,19 +150,19 @@ /area/awaymission/listeningpost) "B" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/april, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/may, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/june, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/july, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/august, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/september, -/obj/item/weapon/paper/fluff/ruins/listeningstation/reports/october, -/obj/item/weapon/paper/fluff/ruins/listeningstation/receipt, +/obj/item/paper/fluff/ruins/listeningstation/reports/april, +/obj/item/paper/fluff/ruins/listeningstation/reports/may, +/obj/item/paper/fluff/ruins/listeningstation/reports/june, +/obj/item/paper/fluff/ruins/listeningstation/reports/july, +/obj/item/paper/fluff/ruins/listeningstation/reports/august, +/obj/item/paper/fluff/ruins/listeningstation/reports/september, +/obj/item/paper/fluff/ruins/listeningstation/reports/october, +/obj/item/paper/fluff/ruins/listeningstation/receipt, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "C" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/ruins/listeningstation/briefing, +/obj/item/paper/fluff/ruins/listeningstation/briefing, /turf/open/floor/plasteel, /area/awaymission/listeningpost) "D" = ( diff --git a/_maps/RandomRuins/SpaceRuins/miracle.dmm b/_maps/RandomRuins/SpaceRuins/miracle.dmm index cdf0fa605b6..031cc37ff26 100644 --- a/_maps/RandomRuins/SpaceRuins/miracle.dmm +++ b/_maps/RandomRuins/SpaceRuins/miracle.dmm @@ -1,7 +1,7 @@ //MAP CONVERTED BY dmm2tgm.py THIS HEADER COMMENT PREVENTS RECONVERSION, DO NOT REMOVE "a" = ( -/obj/item/weapon/storage/backpack/satchel/flat/secret{ - reward_all_of_these = list(/obj/item/weapon/gun/energy/pulse/prize) +/obj/item/storage/backpack/satchel/flat/secret{ + reward_all_of_these = list(/obj/item/gun/energy/pulse/prize) }, /turf/open/floor/fakespace{ initial_gas_mix = "TEMP=2.7" diff --git a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm index 80a6af4f0d7..1c2acb7b979 100644 --- a/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldAIsat.dmm @@ -68,7 +68,7 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "am" = ( -/obj/item/weapon/stock_parts/cell, +/obj/item/stock_parts/cell, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "an" = ( @@ -76,7 +76,7 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "ao" = ( -/obj/item/weapon/coin/clown, +/obj/item/coin/clown, /turf/open/floor/engine, /area/tcommsat/chamber) "ap" = ( @@ -115,7 +115,7 @@ /turf/open/floor/plating/airless, /area/tcommsat/chamber) "av" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "aw" = ( @@ -141,13 +141,13 @@ /area/tcommsat/chamber) "aA" = ( /obj/structure/table, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aB" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /obj/machinery/light/small{ dir = 1 }, @@ -162,7 +162,7 @@ /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aE" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat{ +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{ name = "Cuban Pete-Meat" }, /turf/open/floor/engine, @@ -207,7 +207,7 @@ /turf/template_noop, /area/template_noop) "aM" = ( -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aN" = ( @@ -272,11 +272,11 @@ /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aW" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "aX" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat{ +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat{ name = "Cuban Pete-Meat" }, /obj/item/stack/spacecash, @@ -290,7 +290,7 @@ /area/tcommsat/chamber) "aZ" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "ba" = ( @@ -324,7 +324,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "bf" = ( @@ -332,7 +332,7 @@ /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "bg" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "bh" = ( @@ -446,7 +446,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless/black, @@ -516,7 +516,7 @@ /area/tcommsat/chamber) "bH" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/airless, @@ -564,7 +564,7 @@ /area/tcommsat/chamber) "bN" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, /turf/open/floor/plasteel/airless/black, @@ -573,7 +573,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plasteel/airless/black, @@ -590,7 +590,7 @@ /area/tcommsat/chamber) "bQ" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/teleporter, +/obj/item/circuitboard/computer/teleporter, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "bR" = ( @@ -616,7 +616,7 @@ /obj/effect/decal/cleanable/blood, /obj/structure/chair, /obj/item/clothing/under/rank/centcom_officer, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/effect/decal/remains/human, /turf/open/floor/plating/airless, /area/tcommsat/chamber) @@ -643,7 +643,7 @@ /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "bZ" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "ca" = ( @@ -653,8 +653,8 @@ /area/tcommsat/chamber) "cb" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/syringe/lethal/choral, -/obj/item/weapon/reagent_containers/syringe/lethal{ +/obj/item/reagent_containers/syringe/lethal/choral, +/obj/item/reagent_containers/syringe/lethal{ pixel_y = 4 }, /turf/open/floor/plasteel/airless/black, @@ -673,7 +673,7 @@ /turf/open/floor/plating, /area/tcommsat/chamber) "cd" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "ce" = ( @@ -683,12 +683,12 @@ /area/tcommsat/chamber) "cf" = ( /obj/structure/table, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "cg" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "ch" = ( @@ -760,7 +760,7 @@ /turf/open/floor/plasteel/airless/black, /area/tcommsat/chamber) "cr" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -791,7 +791,7 @@ /area/tcommsat/chamber) "cw" = ( /obj/machinery/light/small, -/obj/item/weapon/paper, +/obj/item/paper, /obj/effect/turf_decal/stripes/corner{ dir = 1 }, @@ -804,7 +804,7 @@ /turf/open/floor/plasteel/airless, /area/tcommsat/chamber) "cy" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/template_noop, @@ -812,7 +812,7 @@ "cz" = ( /obj/structure/lattice, /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/template_noop, @@ -898,7 +898,7 @@ /turf/open/floor/plasteel, /area/tcommsat/chamber) "cN" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/open/floor/plasteel, /area/tcommsat/chamber) "cO" = ( @@ -920,7 +920,7 @@ /turf/open/floor/plasteel, /area/tcommsat/chamber) "cS" = ( -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plating/airless, /area/tcommsat/chamber) "cT" = ( @@ -938,7 +938,7 @@ /turf/open/floor/plasteel, /area/tcommsat/chamber) "cV" = ( -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, diff --git a/_maps/RandomRuins/SpaceRuins/oldstation.dmm b/_maps/RandomRuins/SpaceRuins/oldstation.dmm index 02cba3e76d3..e61760d2811 100644 --- a/_maps/RandomRuins/SpaceRuins/oldstation.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldstation.dmm @@ -44,9 +44,9 @@ /obj/item/stack/sheet/mineral/gold{ amount = 15 }, -/obj/item/weapon/ore/bluespace_crystal, -/obj/item/weapon/ore/bluespace_crystal, -/obj/item/weapon/ore/bluespace_crystal, +/obj/item/ore/bluespace_crystal, +/obj/item/ore/bluespace_crystal, +/obj/item/ore/bluespace_crystal, /turf/open/floor/plasteel/black, /area/ruin/ancientstation/hivebot) "ak" = ( @@ -111,7 +111,7 @@ /area/ruin/ancientstation/hivebot) "as" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/banner, +/obj/item/banner, /turf/open/floor/plasteel/blue/side{ dir = 9 }, @@ -136,7 +136,7 @@ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, -/obj/item/weapon/paper/fluff/ruins/oldstation/damagereport, +/obj/item/paper/fluff/ruins/oldstation/damagereport, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "aw" = ( @@ -145,7 +145,7 @@ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, -/obj/item/weapon/paper/fluff/ruins/oldstation/report, +/obj/item/paper/fluff/ruins/oldstation/report, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "ax" = ( @@ -156,7 +156,7 @@ /area/ruin/ancientstation/comm) "ay" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/banner, +/obj/item/banner, /turf/open/floor/plasteel/blue/side{ dir = 5 }, @@ -225,9 +225,9 @@ "aL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/deck, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/deck, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "aM" = ( @@ -349,20 +349,20 @@ "ba" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "bb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/coin, +/obj/item/coin, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/comm) "bc" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack/old, +/obj/item/storage/backpack/old, /turf/open/floor/plating, /area/ruin/ancientstation) "bd" = ( @@ -389,10 +389,10 @@ "bi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/apc, /turf/open/floor/plating, /area/ruin/ancientstation) "bj" = ( @@ -465,19 +465,19 @@ "bt" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/dice/d6, +/obj/item/dice/d6, /turf/open/floor/plasteel/blue/side, /area/ruin/ancientstation/comm) "bu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plasteel/blue/side, /area/ruin/ancientstation/comm) "bv" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/blue/side{ dir = 6 }, @@ -610,7 +610,7 @@ icon_state = "2-4" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /turf/open/floor/plasteel/floorgrime, @@ -651,7 +651,7 @@ /turf/open/floor/plasteel/airless/floorgrime, /area/ruin/ancientstation) "bW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/effect/decal/cleanable/dirt, @@ -698,13 +698,13 @@ "cd" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/retractor, +/obj/item/hemostat, +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, /turf/open/floor/plating, @@ -869,7 +869,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/deltacorridor) "cz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/structure/cable{ @@ -943,7 +943,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/deltacorridor) "cH" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/effect/decal/cleanable/dirt, @@ -989,7 +989,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation) "cO" = ( @@ -1153,7 +1153,7 @@ /area/ruin/ancientstation/deltacorridor) "di" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/ancient, +/obj/item/storage/firstaid/ancient, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/airless/white/side{ dir = 5 @@ -1194,7 +1194,7 @@ /area/ruin/ancientstation) "dn" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/machinery/light/small{ @@ -1220,7 +1220,7 @@ desc = "A highly-pressurized water tank, this one seems almost empty.."; tank_volume = 1000 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/hydroponics) "dr" = ( @@ -1231,7 +1231,7 @@ /area/ruin/ancientstation/hydroponics) "ds" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/machinery/light/small{ @@ -1388,7 +1388,7 @@ /area/template_noop) "dM" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/item/clothing/mask/breath, @@ -1570,14 +1570,14 @@ desc = "A computer long since rendered non-functional due to lack of maintenance. Spitting out error messages."; name = "Broken Computer" }, -/obj/item/weapon/card/id/away/old/apc, +/obj/item/card/id/away/old/apc, /turf/open/floor/plasteel/yellow/side{ dir = 9 }, /area/ruin/ancientstation/engi) "ek" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, @@ -1611,11 +1611,11 @@ "ep" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/cultivator{ +/obj/item/cultivator{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/hydroponics) @@ -1673,7 +1673,7 @@ "ex" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 5 }, @@ -1735,7 +1735,7 @@ /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) "eG" = ( -/obj/item/weapon/circuitboard/machine/sleeper, +/obj/item/circuitboard/machine/sleeper, /turf/open/floor/plasteel/airless/floorgrime, /area/template_noop) "eH" = ( @@ -1897,7 +1897,7 @@ /area/ruin/ancientstation/deltacorridor) "fa" = ( /obj/item/solar_assembly, -/obj/item/weapon/electronics/tracker, +/obj/item/electronics/tracker, /turf/open/floor/plating/airless, /area/template_noop) "fb" = ( @@ -2022,7 +2022,7 @@ "fq" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/sec) "fr" = ( @@ -2061,7 +2061,7 @@ "fv" = ( /obj/machinery/r_n_d/circuit_imprinter, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) "fw" = ( @@ -2072,7 +2072,7 @@ "fx" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) @@ -2081,7 +2081,7 @@ /obj/structure/table/optable{ name = "Robotics Operating Table" }, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) "fz" = ( @@ -2198,7 +2198,7 @@ "fM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/sec) "fN" = ( @@ -2217,7 +2217,7 @@ /area/ruin/ancientstation/sec) "fP" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/apc, /turf/open/floor/plating, /area/ruin/ancientstation/deltacorridor) "fQ" = ( @@ -2928,7 +2928,7 @@ /area/ruin/ancientstation/rnd) "gN" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -2951,10 +2951,10 @@ /area/ruin/ancientstation/rnd) "gQ" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, @@ -2963,9 +2963,9 @@ /area/ruin/ancientstation/rnd) "gR" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser, /obj/item/stack/cable_coil, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/floorgrime, @@ -3031,7 +3031,7 @@ "hb" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/sec) "hc" = ( @@ -3224,7 +3224,7 @@ "hA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/sec) "hB" = ( @@ -3263,10 +3263,10 @@ /area/ruin/ancientstation/rnd) "hF" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/aluminium{ +/obj/item/reagent_containers/glass/beaker/large/aluminium{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/bromine{ +/obj/item/reagent_containers/glass/beaker/large/bromine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3278,10 +3278,10 @@ /area/ruin/ancientstation/rnd) "hG" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/carbon{ +/obj/item/reagent_containers/glass/beaker/large/carbon{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/chlorine{ +/obj/item/reagent_containers/glass/beaker/large/chlorine{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3293,10 +3293,10 @@ /area/ruin/ancientstation/rnd) "hH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/copper{ +/obj/item/reagent_containers/glass/beaker/large/copper{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/ethanol{ +/obj/item/reagent_containers/glass/beaker/large/ethanol{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3411,13 +3411,13 @@ "hT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria, /area/ruin/ancientstation/kitchen) "hU" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -3446,7 +3446,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/storage/backpack/old, +/obj/item/storage/backpack/old, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -3458,13 +3458,13 @@ /area/ruin/ancientstation/rnd) "hZ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/fluorine{ +/obj/item/reagent_containers/glass/beaker/large/fluorine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/hydrogen{ +/obj/item/reagent_containers/glass/beaker/large/hydrogen{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/water{ +/obj/item/reagent_containers/glass/beaker/large/water{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -3501,7 +3501,7 @@ /obj/machinery/power/solar_control{ name = "Station Solar Control Computer" }, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/paper/guides/jobs/engi/solars, /obj/structure/cable, /turf/open/floor/plasteel/yellow/side{ dir = 10 @@ -3575,7 +3575,7 @@ "im" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/red/side{ dir = 6 @@ -3587,8 +3587,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/broken_bottle, -/obj/item/weapon/soap/nanotrasen, +/obj/item/broken_bottle, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/rnd) "io" = ( @@ -3597,14 +3597,14 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/rnd) "ip" = ( /obj/machinery/chem_master, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -3639,18 +3639,18 @@ /area/ruin/ancientstation/rnd) "it" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/mercury{ +/obj/item/reagent_containers/glass/beaker/large/mercury{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/nitrogen{ +/obj/item/reagent_containers/glass/beaker/large/nitrogen{ pixel_x = -6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/oxygen{ +/obj/item/reagent_containers/glass/beaker/large/oxygen{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/phosphorus{ +/obj/item/reagent_containers/glass/beaker/large/phosphorus{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3658,13 +3658,13 @@ /area/ruin/ancientstation/rnd) "iu" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/iodine{ +/obj/item/reagent_containers/glass/beaker/large/iodine{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/iron{ +/obj/item/reagent_containers/glass/beaker/large/iron{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/lithium{ +/obj/item/reagent_containers/glass/beaker/large/lithium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3696,7 +3696,7 @@ /area/ruin/ancientstation/engi) "iw" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/side, /area/ruin/ancientstation/engi) @@ -3723,11 +3723,11 @@ "iz" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/retro/old{ +/obj/item/gun/energy/laser/retro/old{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/gun/energy/laser/retro/old{ +/obj/item/gun/energy/laser/retro/old{ pixel_x = 2; pixel_y = 2 }, @@ -3790,13 +3790,13 @@ /area/ruin/ancientstation/rnd) "iG" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/potassium{ +/obj/item/reagent_containers/glass/beaker/large/potassium{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/radium{ +/obj/item/reagent_containers/glass/beaker/large/radium{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/welding_fuel{ +/obj/item/reagent_containers/glass/beaker/large/welding_fuel{ pixel_y = 8 }, /obj/effect/decal/cleanable/dirt, @@ -3820,7 +3820,7 @@ "iI" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/cafeteria, /area/ruin/ancientstation/kitchen) "iJ" = ( @@ -3840,11 +3840,11 @@ "iL" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, @@ -3886,10 +3886,10 @@ /area/ruin/ancientstation/rnd) "iQ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/sugar{ +/obj/item/reagent_containers/glass/beaker/large/sugar{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/sulfur{ +/obj/item/reagent_containers/glass/beaker/large/sulfur{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3901,10 +3901,10 @@ /area/ruin/ancientstation/rnd) "iR" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/silver{ +/obj/item/reagent_containers/glass/beaker/large/silver{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/sodium{ +/obj/item/reagent_containers/glass/beaker/large/sodium{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3912,10 +3912,10 @@ /area/ruin/ancientstation/rnd) "iS" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large/sacid{ +/obj/item/reagent_containers/glass/beaker/large/sacid{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/large/silicon{ +/obj/item/reagent_containers/glass/beaker/large/silicon{ pixel_x = -6 }, /obj/effect/decal/cleanable/dirt, @@ -3952,8 +3952,8 @@ /area/ruin/ancientstation/engi) "iW" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/wrench, -/obj/item/weapon/wirecutters, +/obj/item/wrench, +/obj/item/wirecutters, /turf/open/floor/plating, /area/ruin/ancientstation/engi) "iX" = ( @@ -4175,7 +4175,7 @@ /obj/structure/closet/crate, /obj/item/device/assembly/flash/handheld, /obj/item/device/assembly/flash/handheld, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, /turf/open/floor/plating, /area/ruin/ancientstation/deltacorridor) "jA" = ( @@ -4201,7 +4201,7 @@ /obj/item/stack/cable_coil{ amount = 15 }, -/obj/item/weapon/paper, +/obj/item/paper, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/ruin/ancientstation/engi) @@ -4213,7 +4213,7 @@ tag = "" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /turf/open/floor/plasteel/floorgrime, @@ -4244,7 +4244,7 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation) "jJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /obj/structure/cable{ @@ -4288,7 +4288,7 @@ "jN" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/disk/tech_disk, +/obj/item/disk/tech_disk, /turf/open/floor/plating, /area/ruin/ancientstation/deltacorridor) "jO" = ( @@ -4542,7 +4542,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/fluff/ruins/oldstation/protosuit, +/obj/item/paper/fluff/ruins/oldstation/protosuit, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "ku" = ( @@ -4587,7 +4587,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/fluff/ruins/oldstation/protosing, +/obj/item/paper/fluff/ruins/oldstation/protosing, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kA" = ( @@ -4614,7 +4614,7 @@ /area/ruin/ancientstation) "kD" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/flashlight/glowstick, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/floorgrime, @@ -4635,8 +4635,8 @@ "kG" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/spray/weedspray, -/obj/item/weapon/reagent_containers/spray/pestspray, +/obj/item/reagent_containers/spray/weedspray, +/obj/item/reagent_containers/spray/pestspray, /turf/open/floor/plating, /area/ruin/ancientstation) "kH" = ( @@ -4687,7 +4687,7 @@ /area/ruin/ancientstation) "kN" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/flashlight/glowstick, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -4724,7 +4724,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/paper/fluff/ruins/oldstation, +/obj/item/paper/fluff/ruins/oldstation, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation) "kR" = ( @@ -4732,7 +4732,7 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/fluff/ruins/oldstation/protohealth, +/obj/item/paper/fluff/ruins/oldstation/protohealth, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kS" = ( @@ -4750,7 +4750,7 @@ /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, -/obj/item/weapon/paper/fluff/ruins/oldstation/protoinv, +/obj/item/paper/fluff/ruins/oldstation/protoinv, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kU" = ( @@ -4758,7 +4758,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper/fluff/ruins/oldstation/protogun, +/obj/item/paper/fluff/ruins/oldstation/protogun, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "kV" = ( @@ -4800,7 +4800,7 @@ start_charge = 0 }, /obj/structure/cable, -/obj/item/weapon/storage/backpack/old, +/obj/item/storage/backpack/old, /turf/open/floor/plating, /area/ruin/ancientstation) "kZ" = ( @@ -4826,7 +4826,7 @@ /area/ruin/ancientstation/proto) "lc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/e_gun/old, +/obj/item/gun/energy/e_gun/old, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/proto) "ld" = ( @@ -4920,17 +4920,17 @@ /area/ruin/unpowered) "lq" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation/deltacorridor) "lr" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/bluespace_crystal, +/obj/item/ore/bluespace_crystal, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) "ls" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/bluespace_crystal/refined, +/obj/item/ore/bluespace_crystal/refined, /turf/open/floor/plasteel/white, /area/ruin/ancientstation/rnd) "lt" = ( @@ -4942,18 +4942,18 @@ /turf/open/floor/plasteel/floorgrime, /area/ruin/ancientstation) "lu" = ( -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/open/floor/plasteel/airless/floorgrime, /area/template_noop) "lv" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /turf/open/floor/plasteel/airless/white/side{ dir = 4 }, /area/template_noop) "lw" = ( -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plating/airless, /area/template_noop) "lx" = ( diff --git a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm index 1589e96c4c7..10983b2d611 100644 --- a/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm +++ b/_maps/RandomRuins/SpaceRuins/oldteleporter.dmm @@ -48,7 +48,7 @@ /area/ruin/oldteleporter) "l" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, diff --git a/_maps/RandomRuins/SpaceRuins/onehalf.dmm b/_maps/RandomRuins/SpaceRuins/onehalf.dmm index 6cfefd77074..b799c316f74 100644 --- a/_maps/RandomRuins/SpaceRuins/onehalf.dmm +++ b/_maps/RandomRuins/SpaceRuins/onehalf.dmm @@ -81,16 +81,16 @@ /area/ruin/onehalf/dorms_med) "an" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/white, /area/ruin/onehalf/dorms_med) "ao" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plasteel, /area/ruin/onehalf/dorms_med) "ap" = ( @@ -175,11 +175,11 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/ruin/onehalf/dorms_med) "aC" = ( @@ -205,7 +205,7 @@ /area/ruin/onehalf/drone_bay) "aF" = ( /obj/structure/disposalpipe/trunk, -/obj/item/weapon/ore/diamond, +/obj/item/ore/diamond, /turf/open/floor/plating/airless, /area/ruin/onehalf/drone_bay) "aG" = ( @@ -248,8 +248,8 @@ /obj/structure/closet/crate/medical, /obj/item/clothing/neck/stethoscope, /obj/item/device/healthanalyzer, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/machinery/power/apc{ dir = 4; name = "Crew Quarters APC"; @@ -298,7 +298,7 @@ /area/ruin/onehalf/drone_bay) "aS" = ( /obj/structure/lattice, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/template_noop, /area/template_noop) "aT" = ( @@ -826,8 +826,8 @@ /area/ruin/onehalf/bridge) "cb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plasteel, /area/ruin/onehalf/bridge) "cc" = ( @@ -876,7 +876,7 @@ icon_state = "pipe-j1"; dir = 1 }, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ broken = 1; icon_state = "platingdmg2" @@ -900,7 +900,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/template_noop, @@ -923,7 +923,7 @@ icon_state = "pipe-c" }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ total_paper = 12 }, /turf/open/floor/plasteel, @@ -955,7 +955,7 @@ icon_state = "2-4" }, /obj/structure/table/reinforced, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel, /area/ruin/onehalf/bridge) "cq" = ( @@ -993,7 +993,7 @@ /area/template_noop) "ct" = ( /obj/structure/lattice, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/template_noop, @@ -1088,18 +1088,18 @@ /turf/open/floor/plasteel, /area/ruin/onehalf/bridge) "cH" = ( -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/item/device/multitool, /turf/open/floor/plating, /area/ruin/onehalf/bridge) "cI" = ( /obj/structure/safe/floor, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas/syndicate, /obj/item/clothing/suit/space/hardsuit/syndi, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, -/obj/item/weapon/folder/syndicate/mining, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/rum, +/obj/item/folder/syndicate/mining, /turf/open/floor/plating, /area/ruin/onehalf/bridge) "cJ" = ( @@ -1220,8 +1220,8 @@ /area/ruin/onehalf/bridge) "cZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/ore/bluespace_crystal, -/obj/item/weapon/coin/plasma, +/obj/item/ore/bluespace_crystal, +/obj/item/coin/plasma, /turf/open/floor/plasteel, /area/ruin/onehalf/bridge) "da" = ( @@ -1231,7 +1231,7 @@ "db" = ( /obj/machinery/light, /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/ruin/onehalf/bridge) "dc" = ( @@ -1251,7 +1251,7 @@ /area/ruin/onehalf/hallway) "dd" = ( /obj/structure/grille, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless{ icon_state = "platingdmg3" }, @@ -1320,7 +1320,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /obj/structure/lattice/catwalk, diff --git a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm index 6388f49c50f..73bf43342e3 100644 --- a/_maps/RandomRuins/SpaceRuins/originalcontent.dmm +++ b/_maps/RandomRuins/SpaceRuins/originalcontent.dmm @@ -106,7 +106,7 @@ /turf/open/indestructible/paper, /area/ruin/powered) "as" = ( -/obj/item/weapon/paper/crumpled/ruins/originalcontent, +/obj/item/paper/crumpled/ruins/originalcontent, /turf/open/indestructible/paper, /area/ruin/powered) "at" = ( @@ -493,7 +493,7 @@ /turf/open/indestructible/paper, /area/ruin/powered) "bt" = ( -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/indestructible/paper, /area/ruin/powered) "bu" = ( @@ -541,7 +541,7 @@ /area/ruin/powered) "bB" = ( /obj/structure/easel, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ icon = 'icons/obj/fluff.dmi'; icon_state = "painting4"; info = "This picture depicts a crudely-drawn stickman firing a crudely-drawn gun."; @@ -596,9 +596,9 @@ dir = 9 }, /obj/structure/closet/crate/bin, -/obj/item/weapon/paper/crumpled/ruins/originalcontent, -/obj/item/weapon/paper/crumpled/ruins/originalcontent, -/obj/item/weapon/paper/crumpled/ruins/originalcontent, +/obj/item/paper/crumpled/ruins/originalcontent, +/obj/item/paper/crumpled/ruins/originalcontent, +/obj/item/paper/crumpled/ruins/originalcontent, /obj/item/device/gps{ gpstag = "Pulpy Signal" }, @@ -609,7 +609,7 @@ dir = 1 }, /obj/structure/easel, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ icon = 'icons/obj/fluff.dmi'; icon_state = "painting1"; info = "This picture depicts a sunny day on a lush hillside, set under a shaded tree."; @@ -622,7 +622,7 @@ dir = 5 }, /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/indestructible/paper, /area/ruin/powered) "bL" = ( @@ -716,7 +716,7 @@ dir = 8 }, /obj/structure/easel, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ icon = 'icons/obj/fluff.dmi'; icon_state = "painting3"; info = "This picture depicts a smiling clown. Something doesn't feel right about this.."; @@ -737,7 +737,7 @@ dir = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/open/indestructible/paper, /area/ruin/powered) "ca" = ( @@ -745,7 +745,7 @@ dir = 10 }, /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/indestructible/paper, /area/ruin/powered) "cb" = ( @@ -789,12 +789,12 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/indestructible/paper, /area/ruin/powered) "ch" = ( /obj/structure/fluff/paper, -/obj/item/weapon/paper/crumpled/ruins/originalcontent, +/obj/item/paper/crumpled/ruins/originalcontent, /turf/open/indestructible/paper, /area/ruin/powered) "ci" = ( @@ -830,8 +830,8 @@ "cm" = ( /obj/structure/fluff/paper, /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/indestructible/paper, /area/ruin/powered) "cn" = ( @@ -839,9 +839,9 @@ dir = 6 }, /obj/structure/table/wood, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas, -/obj/item/weapon/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas, +/obj/item/canvas/nineteenXnineteen, /turf/open/indestructible/paper, /area/ruin/powered) "co" = ( @@ -862,14 +862,14 @@ "cq" = ( /obj/structure/fluff/paper, /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/pen/fourcolor, +/obj/item/storage/crayons, +/obj/item/pen/fourcolor, /turf/open/indestructible/paper, /area/ruin/powered) "cr" = ( /obj/structure/fluff/paper, /obj/structure/easel, -/obj/item/weapon/paper/pamphlet{ +/obj/item/paper/pamphlet{ icon = 'icons/obj/fluff.dmi'; icon_state = "painting2"; info = "This picture depicts a man yelling on a bridge for no apparent reason."; diff --git a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm index a4baf770b06..31d10f5f1db 100644 --- a/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm +++ b/_maps/RandomRuins/SpaceRuins/shuttlerelic.dmm @@ -92,7 +92,7 @@ icon_state = "chairold"; dir = 1 }, -/obj/item/weapon/crowbar/large{ +/obj/item/crowbar/large{ desc = "It's a big crowbar. It doesn't fit in your pockets, because it's big. It feels oddly heavy.."; force = 20; name = "heavy crowbar" diff --git a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm index a99838b8fd7..878ab25c2f3 100644 --- a/_maps/RandomRuins/SpaceRuins/spacehotel.dmm +++ b/_maps/RandomRuins/SpaceRuins/spacehotel.dmm @@ -161,7 +161,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 3" @@ -201,7 +201,7 @@ name = "Hotel Guest Room 3" }) "aD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02" }, /turf/open/floor/wood, @@ -218,7 +218,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 4" @@ -258,7 +258,7 @@ name = "Hotel Guest Room 4" }) "aL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16" }, /turf/open/floor/wood, @@ -275,7 +275,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 5" @@ -315,7 +315,7 @@ name = "Hotel Guest Room 5" }) "aT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16" }, /turf/open/floor/wood, @@ -332,7 +332,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 6" @@ -372,7 +372,7 @@ name = "Hotel Guest Room 6" }) "bb" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18" }, /turf/open/floor/wood, @@ -409,8 +409,8 @@ }) "bg" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 3" @@ -429,7 +429,7 @@ }) "bj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 3" @@ -453,8 +453,8 @@ }) "bm" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 4" @@ -473,7 +473,7 @@ }) "bp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 4" @@ -497,8 +497,8 @@ }) "bs" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 5" @@ -517,7 +517,7 @@ }) "bv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 5" @@ -541,8 +541,8 @@ }) "by" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 6" @@ -561,7 +561,7 @@ }) "bB" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 6" @@ -769,7 +769,7 @@ }) "bX" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick, +/obj/item/lipstick, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 4" @@ -1356,7 +1356,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 2" @@ -1421,7 +1421,7 @@ name = "Hotel Guest Room 2" }) "dq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/wood, @@ -1438,7 +1438,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 1" @@ -1503,7 +1503,7 @@ name = "Hotel Guest Room 1" }) "dy" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14" }, /turf/open/floor/wood, @@ -1545,7 +1545,7 @@ /area/ruin/hotel/workroom) "dE" = ( /obj/structure/table, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/white, /area/ruin/hotel/workroom) "dF" = ( @@ -1573,8 +1573,8 @@ }) "dJ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 2" @@ -1598,7 +1598,7 @@ }) "dN" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 2" @@ -1619,8 +1619,8 @@ }) "dQ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 1" @@ -1644,7 +1644,7 @@ }) "dU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 1" @@ -1844,7 +1844,7 @@ }) "eu" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood, /area/ruin/hotel/guestroom{ name = "Hotel Guest Room 2" @@ -1906,13 +1906,13 @@ /area/ruin/hotel/workroom) "eE" = ( /obj/structure/closet/crate, -/obj/item/weapon/bedsheet/patriot, +/obj/item/bedsheet/patriot, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/ruin/hotel/workroom) "eF" = ( /obj/structure/closet/crate, -/obj/item/weapon/card/id/away/hotel, +/obj/item/card/id/away/hotel, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/white, /area/ruin/hotel/workroom) @@ -2227,8 +2227,8 @@ /area/ruin/hotel/bar) "fF" = ( /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/bar, /area/ruin/hotel/bar) "fG" = ( @@ -2239,7 +2239,7 @@ /turf/open/floor/plasteel/bar, /area/ruin/hotel/bar) "fI" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02" }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ @@ -2296,29 +2296,29 @@ /area/ruin/hotel/bar) "fR" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "fS" = ( @@ -2336,7 +2336,7 @@ /area/ruin/hotel/bar) "fU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel/bar, /area/ruin/hotel/bar) "fV" = ( @@ -2361,7 +2361,7 @@ /area/ruin/hotel/dock) "fY" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /obj/machinery/light{ dir = 8 }, @@ -2378,19 +2378,19 @@ /area/ruin/hotel/bar) "gb" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "gc" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "gd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/bar, /area/ruin/hotel/bar) "ge" = ( @@ -2411,7 +2411,7 @@ }, /area/ruin/hotel/dock) "gh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood, @@ -2467,7 +2467,7 @@ /area/ruin/hotel/bar) "gq" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "gr" = ( @@ -2520,9 +2520,9 @@ /area/ruin/hotel/dock) "gx" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/item/device/multitool, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/machinery/light{ dir = 1 }, @@ -2554,16 +2554,16 @@ /area/ruin/hotel/bar) "gD" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "gE" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce, -/obj/item/weapon/reagent_containers/food/condiment/pack/ketchup, -/obj/item/weapon/reagent_containers/food/condiment/pack/ketchup, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/pack/hotsauce, +/obj/item/reagent_containers/food/condiment/pack/hotsauce, +/obj/item/reagent_containers/food/condiment/pack/ketchup, +/obj/item/reagent_containers/food/condiment/pack/ketchup, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "gF" = ( @@ -2578,14 +2578,14 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/black, /area/ruin/hotel/workroom) "gI" = ( /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/ruins/spacehotel/notice, +/obj/item/paper/fluff/ruins/spacehotel/notice, /turf/open/floor/plasteel/black, /area/ruin/hotel/workroom) "gJ" = ( @@ -2599,7 +2599,7 @@ /area/ruin/hotel/workroom) "gL" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/structure/sign/nosmoking_1{ pixel_y = 32 }, @@ -2639,9 +2639,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, /obj/structure/closet/secure_closet/freezer/fridge{ req_access_txt = "200" }, @@ -2674,10 +2674,10 @@ /area/ruin/hotel/bar) "gY" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -4 }, /turf/open/floor/plasteel/bar, @@ -2702,16 +2702,16 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper/pamphlet/ruin/spacehotel, -/obj/item/weapon/paper/pamphlet/ruin/spacehotel, -/obj/item/weapon/paper/pamphlet/ruin/spacehotel, -/obj/item/weapon/paper/pamphlet/ruin/spacehotel, -/obj/item/weapon/paper/pamphlet/ruin/spacehotel, +/obj/item/paper/pamphlet/ruin/spacehotel, +/obj/item/paper/pamphlet/ruin/spacehotel, +/obj/item/paper/pamphlet/ruin/spacehotel, +/obj/item/paper/pamphlet/ruin/spacehotel, +/obj/item/paper/pamphlet/ruin/spacehotel, /turf/open/floor/plasteel/grimy, /area/ruin/hotel/dock) "hd" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/mug/tea, +/obj/item/reagent_containers/food/drinks/mug/tea, /turf/open/floor/carpet, /area/ruin/hotel/dock) "he" = ( @@ -2773,10 +2773,10 @@ /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "hm" = ( -/obj/item/weapon/reagent_containers/food/condiment/rice, -/obj/item/weapon/reagent_containers/food/condiment/rice, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, /obj/structure/closet/secure_closet/freezer/kitchen{ req_access = null; req_access_txt = "200" @@ -2799,7 +2799,7 @@ /turf/open/floor/carpet, /area/ruin/hotel) "hq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18" }, /turf/open/floor/plasteel/black, @@ -2814,57 +2814,57 @@ /area/ruin/hotel/dock) "ht" = ( /obj/structure/table, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "hu" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/pug, +/obj/item/reagent_containers/food/snacks/meat/slab/pug, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant, /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "hv" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/pug, +/obj/item/reagent_containers/food/snacks/meat/slab/pug, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant, /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "hw" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/freezer, /area/ruin/hotel/bar) "hx" = ( -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -4 }, /obj/structure/table, @@ -2872,7 +2872,7 @@ /area/ruin/hotel/bar) "hy" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "hz" = ( @@ -2915,17 +2915,17 @@ /area/ruin/hotel/workroom) "hE" = ( /obj/structure/table, -/obj/item/weapon/card/id/away/hotel, -/obj/item/weapon/card/id/away/hotel, -/obj/item/weapon/card/id/away/hotel, -/obj/item/weapon/card/id/away/hotel, -/obj/item/weapon/card/id/away/hotel, -/obj/item/weapon/card/id/away/hotel, +/obj/item/card/id/away/hotel, +/obj/item/card/id/away/hotel, +/obj/item/card/id/away/hotel, +/obj/item/card/id/away/hotel, +/obj/item/card/id/away/hotel, +/obj/item/card/id/away/hotel, /turf/open/floor/plasteel/black, /area/ruin/hotel/workroom) "hF" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/black, /area/ruin/hotel/workroom) "hG" = ( @@ -2953,7 +2953,7 @@ /area/ruin/hotel/bar) "hJ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/soysauce, +/obj/item/reagent_containers/food/condiment/soysauce, /turf/open/floor/plasteel/cafeteria, /area/ruin/hotel/bar) "hK" = ( @@ -3353,7 +3353,7 @@ /area/ruin/hotel/dock) "iH" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, /obj/machinery/light{ dir = 8 @@ -3391,7 +3391,7 @@ }, /area/ruin/hotel/power) "iM" = ( -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/wood, /area/ruin/hotel) "iN" = ( @@ -3421,7 +3421,7 @@ /area/ruin/hotel/dock) "iR" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/head/welding, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; @@ -3605,8 +3605,8 @@ "ji" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 8 @@ -3736,8 +3736,8 @@ "jA" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/cable{ d1 = 2; d2 = 4; @@ -3836,7 +3836,7 @@ /area/ruin/hotel/security) "jO" = ( /obj/structure/closet, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/open/floor/plasteel/darkyellow, /area/ruin/hotel/security) "jP" = ( @@ -4092,14 +4092,14 @@ /area/ruin/hotel/security) "kz" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/blue, +/obj/item/folder/red, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/ruin/hotel/security) "kA" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel, /area/ruin/hotel/security) "kB" = ( @@ -4162,7 +4162,7 @@ /area/ruin/hotel/power) "kK" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 8 @@ -4170,14 +4170,14 @@ /area/ruin/hotel/security) "kL" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/ruin/hotel/security) "kM" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel, /area/ruin/hotel/security) "kN" = ( @@ -4288,7 +4288,7 @@ /area/ruin/hotel/security) "lc" = ( /obj/structure/table, -/obj/item/weapon/papercutter, +/obj/item/papercutter, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -4296,7 +4296,7 @@ /area/ruin/hotel/security) "ld" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/ruin/hotel/security) "le" = ( @@ -4380,8 +4380,8 @@ /area/ruin/hotel/power) "lr" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 8 @@ -4433,7 +4433,7 @@ /area/ruin/hotel/security) "lA" = ( /obj/structure/closet, -/obj/item/weapon/dice/d1, +/obj/item/dice/d1, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" }, @@ -4550,7 +4550,7 @@ /turf/open/floor/plasteel/darkred, /area/ruin/hotel/security) "lP" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plating/beach/water{ baseturf = /turf/open/space }, @@ -4565,7 +4565,7 @@ /area/ruin/hotel/pool) "lS" = ( /obj/structure/table, -/obj/item/weapon/card/id/away/hotel/securty, +/obj/item/card/id/away/hotel/securty, /turf/open/floor/plasteel/darkred, /area/ruin/hotel/security) "lT" = ( @@ -4573,7 +4573,7 @@ req_access = null; req_access_txt = "203" }, -/obj/item/weapon/gun/energy/laser/scatter/shotty, +/obj/item/gun/energy/laser/scatter/shotty, /obj/item/clothing/head/helmet/justice, /turf/open/floor/plasteel/darkred, /area/ruin/hotel/security) @@ -4649,7 +4649,7 @@ /area/ruin/hotel) "mb" = ( /obj/structure/table, -/obj/item/weapon/lipstick, +/obj/item/lipstick, /turf/open/floor/plasteel/showroomfloor, /area/ruin/hotel/pool) "mc" = ( @@ -4677,7 +4677,7 @@ /area/ruin/hotel/custodial) "mg" = ( /obj/structure/janitorialcart, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plasteel/neutral, /area/ruin/hotel/custodial) "mh" = ( @@ -4686,15 +4686,15 @@ /area/ruin/hotel/custodial) "mi" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/neutral, /area/ruin/hotel/custodial) "mj" = ( /obj/structure/table, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/open/floor/plasteel/neutral, /area/ruin/hotel/custodial) "mk" = ( @@ -4840,7 +4840,7 @@ }, /area/ruin/hotel/pool) "mD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-25" }, /turf/open/floor/plasteel/neutral, @@ -4863,7 +4863,7 @@ /area/ruin/hotel/custodial) "mI" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/open/floor/plasteel/neutral, /area/ruin/hotel/custodial) "mJ" = ( diff --git a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm index e7d60c5ebe0..5596b4dc917 100644 --- a/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm +++ b/_maps/RandomRuins/SpaceRuins/turretedoutpost.dmm @@ -15,7 +15,7 @@ /area/ruin/turretedoutpost) "e" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/hyper, +/obj/item/stock_parts/cell/hyper, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) "f" = ( @@ -49,7 +49,7 @@ /area/ruin/turretedoutpost) "m" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, +/obj/item/folder, /obj/item/device/radio, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) @@ -87,14 +87,14 @@ }, /area/ruin/turretedoutpost) "t" = ( -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 8 }, /area/ruin/turretedoutpost) "u" = ( -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /obj/machinery/light{ dir = 1 }, @@ -147,7 +147,7 @@ /area/ruin/turretedoutpost) "C" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/light{ dir = 1 }, @@ -180,7 +180,7 @@ /area/ruin/turretedoutpost) "H" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/machinery/light{ dir = 4 }, @@ -196,8 +196,8 @@ /area/ruin/turretedoutpost) "J" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/paper/crumpled, +/obj/item/crowbar/red, +/obj/item/paper/crumpled, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 8 @@ -215,19 +215,19 @@ /area/ruin/turretedoutpost) "M" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) "N" = ( /obj/structure/rack, -/obj/item/weapon/grenade/chem_grenade/teargas, +/obj/item/grenade/chem_grenade/teargas, /turf/open/floor/plasteel{ icon_state = "dark" }, /area/ruin/turretedoutpost) "O" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/open/floor/plasteel{ dir = 4; icon_state = "darkredfull" @@ -241,28 +241,28 @@ /area/ruin/turretedoutpost) "Q" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) "R" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) "S" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ pixel_x = 3 }, /turf/open/floor/plasteel, /area/ruin/turretedoutpost) "T" = ( /obj/structure/rack, -/obj/item/weapon/storage/belt/military, +/obj/item/storage/belt/military, /obj/machinery/light, /turf/open/floor/plasteel{ icon_state = "vault"; @@ -279,7 +279,7 @@ /area/ruin/turretedoutpost) "V" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/breadslice/meat, +/obj/item/reagent_containers/food/snacks/breadslice/meat, /obj/machinery/light{ dir = 8 }, diff --git a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm index 4b741bc8edf..d26dab97573 100644 --- a/_maps/RandomRuins/SpaceRuins/vaporwave.dmm +++ b/_maps/RandomRuins/SpaceRuins/vaporwave.dmm @@ -95,7 +95,7 @@ /turf/open/floor/holofloor/beach/coast_t, /area/ruin/powered/aesthetic) "v" = ( -/obj/item/weapon/statuebust, +/obj/item/statuebust, /turf/open/floor/plasteel/vaporwave, /area/ruin/powered/aesthetic) "w" = ( diff --git a/_maps/RandomZLevels/Academy.dmm b/_maps/RandomZLevels/Academy.dmm index 0fe71c9faf5..4a769a74a20 100644 --- a/_maps/RandomZLevels/Academy.dmm +++ b/_maps/RandomZLevels/Academy.dmm @@ -23,12 +23,12 @@ /area/awaymission/academy/headmaster) "af" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "ag" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "ah" = ( @@ -103,12 +103,12 @@ /area/awaymission/academy/headmaster) "aq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "ar" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/fluff/awaymissions/academy/console_maint, +/obj/item/paper/fluff/awaymissions/academy/console_maint, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "as" = ( @@ -148,7 +148,7 @@ /area/awaymission/academy/headmaster) "aw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "ax" = ( @@ -183,12 +183,12 @@ /area/awaymission/academy/headmaster) "aB" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "aC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/mug/tea, +/obj/item/reagent_containers/food/drinks/mug/tea, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "aD" = ( @@ -225,7 +225,7 @@ /area/awaymission/academy/headmaster) "aJ" = ( /obj/structure/destructible/cult/tome, -/obj/item/weapon/dice/d20/fate, +/obj/item/dice/d20/fate, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "aK" = ( @@ -239,12 +239,12 @@ /area/awaymission/academy/academycellar) "aM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "aN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/coin/plasma, +/obj/item/coin/plasma, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "aO" = ( @@ -303,12 +303,12 @@ /area/awaymission/academy/headmaster) "aY" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "aZ" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "ba" = ( @@ -318,22 +318,22 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "bb" = ( /obj/structure/table/wood, -/obj/item/weapon/staff, +/obj/item/staff, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "bc" = ( /obj/structure/table/wood, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "bd" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "be" = ( @@ -344,7 +344,7 @@ /area/awaymission/academy/headmaster) "bf" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "bg" = ( @@ -358,17 +358,17 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "bi" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/mug/tea, +/obj/item/reagent_containers/food/drinks/mug/tea, /turf/open/floor/carpet, /area/awaymission/academy/headmaster) "bj" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "bk" = ( @@ -390,7 +390,7 @@ /area/awaymission/academy/headmaster) "bm" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/wood, /area/awaymission/academy/headmaster) "bn" = ( @@ -631,7 +631,7 @@ /area/awaymission/academy/headmaster) "cc" = ( /obj/structure/table, -/obj/item/weapon/lighter/greyscale, +/obj/item/lighter/greyscale, /turf/open/floor/plasteel, /area/awaymission/academy/headmaster) "cd" = ( @@ -719,7 +719,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "cr" = ( @@ -898,13 +898,13 @@ /area/awaymission/academy/headmaster) "cU" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/internals/oxygen, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen/red, /turf/open/floor/plasteel/black, /area/awaymission/academy/headmaster) "cV" = ( /obj/structure/closet/crate, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -971,7 +971,7 @@ /area/awaymission/academy/classrooms) "dg" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/magic/wand/fireball, +/obj/item/gun/magic/wand/fireball, /turf/open/floor/wood, /area/awaymission/academy/classrooms) "dh" = ( @@ -1118,7 +1118,7 @@ /area/awaymission/academy/headmaster) "dD" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "dE" = ( @@ -1284,7 +1284,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/awaymissions/academy/class/automotive, +/obj/item/paper/fluff/awaymissions/academy/class/automotive, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "eh" = ( @@ -1297,7 +1297,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/awaymissions/academy/class/pyromancy, +/obj/item/paper/fluff/awaymissions/academy/class/pyromancy, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "ej" = ( @@ -1510,7 +1510,7 @@ /area/awaymission/academy/classrooms) "eR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/bag/tray, +/obj/item/storage/bag/tray, /turf/open/floor/plasteel/barber{ dir = 8 }, @@ -1564,7 +1564,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/burger/spell, +/obj/item/reagent_containers/food/snacks/burger/spell, /turf/open/floor/plasteel/barber{ dir = 8 }, @@ -1772,7 +1772,7 @@ /obj/structure/noticeboard{ pixel_y = -32 }, -/obj/item/weapon/paper/fluff/awaymissions/academy/class/biology, +/obj/item/paper/fluff/awaymissions/academy/class/biology, /turf/open/floor/plasteel/grimy, /area/awaymission/academy/classrooms) "fz" = ( @@ -1968,12 +1968,12 @@ /area/awaymission/academy/classrooms) "gb" = ( /obj/structure/table, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "gc" = ( /obj/structure/table, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /turf/open/floor/plasteel/white/side{ dir = 4 }, @@ -2039,7 +2039,7 @@ /area/awaymission/academy/classrooms) "gl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2060,7 +2060,7 @@ /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "go" = ( -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plating, /area/awaymission/academy/classrooms) "gp" = ( @@ -2165,7 +2165,7 @@ /area/awaymission/academy/classrooms) "gD" = ( /obj/structure/table, -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "gE" = ( @@ -2196,16 +2196,16 @@ /area/awaymission/academy/academyaft) "gH" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/awaymissions/academy/grade/aplus, -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/paper/fluff/awaymissions/academy/grade/aplus, +/obj/item/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/awaymission/academy/classrooms) "gI" = ( /obj/structure/table, -/obj/item/weapon/gun/ballistic/revolver/russian, -/obj/item/weapon/paper/fluff/awaymissions/academy/grade/bminus, +/obj/item/gun/ballistic/revolver/russian, +/obj/item/paper/fluff/awaymissions/academy/grade/bminus, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2303,8 +2303,8 @@ /area/awaymission/academy/classrooms) "gW" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/floragun, -/obj/item/weapon/paper/fluff/awaymissions/academy/grade/dminus, +/obj/item/gun/energy/floragun, +/obj/item/paper/fluff/awaymissions/academy/grade/dminus, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2456,7 +2456,7 @@ }, /area/awaymission/academy/academyaft) "hr" = ( -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/green/side{ dir = 4 }, @@ -2643,7 +2643,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plasteel/green/side{ dir = 4 }, @@ -2695,12 +2695,12 @@ /obj/structure/closet, /obj/item/candle, /obj/item/candle, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "hT" = ( /obj/structure/closet, -/obj/item/weapon/storage/belt/soulstone, +/obj/item/storage/belt/soulstone, /obj/item/clothing/under/schoolgirl, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) @@ -2718,7 +2718,7 @@ /area/awaymission/academy/academyaft) "hW" = ( /obj/structure/closet, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/item/clothing/under/schoolgirl, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) @@ -2728,12 +2728,12 @@ "hY" = ( /obj/structure/closet, /obj/item/clothing/under/color/lightpurple, -/obj/item/weapon/staff, +/obj/item/staff, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "hZ" = ( /obj/structure/closet, -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) @@ -2745,16 +2745,16 @@ /area/awaymission/academy/academyaft) "ib" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/item/clothing/under/color/lightpurple, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "ic" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/snappops, -/obj/item/weapon/storage/backpack, -/obj/item/weapon/paper/fluff/awaymissions/academy/grade/failure, +/obj/item/storage/box/snappops, +/obj/item/storage/backpack, +/obj/item/paper/fluff/awaymissions/academy/grade/failure, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "id" = ( @@ -2796,9 +2796,9 @@ /area/awaymission/academy/academyaft) "ij" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/relay, /turf/open/floor/plasteel/hydrofloor, /area/awaymission/academy/academyaft) "ik" = ( @@ -2830,12 +2830,12 @@ /area/awaymission/academy/academyaft) "io" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "ip" = ( @@ -2856,19 +2856,19 @@ /area/awaymission/academy/academyaft) "is" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/ansible, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/ansible, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "it" = ( -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/open/floor/plasteel/hydrofloor, /area/awaymission/academy/academyaft) "iu" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/awaymission/academy/academyaft) "iv" = ( @@ -2920,8 +2920,8 @@ /area/awaymission/academy/academyaft) "iB" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/subspace/filter, /turf/open/floor/plasteel/hydrofloor, /area/awaymission/academy/academyaft) "iC" = ( @@ -2963,7 +2963,7 @@ }, /area/awaymission/academy/academyaft) "iH" = ( -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/wood, /area/awaymission/academy/academyaft) "iI" = ( @@ -3264,7 +3264,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/floor/circuit/green, /area/awaymission/academy/classrooms) "jq" = ( @@ -3293,13 +3293,13 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/airless, /area/awaymission/academy/academyaft) "ju" = ( /obj/structure/window/reinforced, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/food/drinks/trophy/gold_cup, /turf/open/floor/plasteel/red/side, /area/awaymission/academy/academyaft) "jv" = ( @@ -3339,7 +3339,7 @@ }, /area/awaymission/academy/academyaft) "jB" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/space, @@ -3731,11 +3731,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/book/manual/ripley_build_and_repair, /turf/open/floor/plasteel, /area/awaymission/academy/classrooms) "kL" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/open/floor/plating, /area/awaymission/academy/classrooms) "kM" = ( @@ -3785,7 +3785,7 @@ /area/awaymission/academy/academycellar) "kT" = ( /obj/structure/table/wood, -/obj/item/weapon/kitchen/knife/ritual, +/obj/item/kitchen/knife/ritual, /obj/item/candle/infinite, /turf/open/floor/engine/cult, /area/awaymission/academy/academycellar) @@ -3843,7 +3843,7 @@ /area/awaymission/academy/academycellar) "lg" = ( /obj/structure/table/wood, -/obj/item/weapon/guardiancreator/choose, +/obj/item/guardiancreator/choose, /turf/open/floor/engine/cult, /area/awaymission/academy/academycellar) "lh" = ( @@ -3861,7 +3861,7 @@ "lk" = ( /obj/structure/safe/floor, /obj/item/voodoo, -/obj/item/weapon/gun/magic/wand/fireball, +/obj/item/gun/magic/wand/fireball, /obj/item/clothing/suit/space/hardsuit/wizard, /turf/open/floor/wood, /area/awaymission/academy/headmaster) @@ -3931,7 +3931,7 @@ /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lw" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lx" = ( @@ -3941,12 +3941,12 @@ "ly" = ( /obj/effect/decal/cleanable/oil, /obj/structure/table, -/obj/item/weapon/staff, +/obj/item/staff, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lz" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lA" = ( @@ -3964,7 +3964,7 @@ /area/awaymission/academy/academyengine) "lD" = ( /obj/structure/table, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lE" = ( @@ -4025,7 +4025,7 @@ /area/awaymission/academy/academyengine) "lN" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lO" = ( @@ -4046,7 +4046,7 @@ /area/awaymission/academy/academyengine) "lQ" = ( /obj/structure/table, -/obj/item/weapon/gun/magic/wand/polymorph, +/obj/item/gun/magic/wand/polymorph, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "lR" = ( @@ -4144,13 +4144,13 @@ /area/awaymission/academy/academyengine) "mj" = ( /obj/structure/rack, -/obj/item/weapon/spellbook/oneuse/summonitem, -/obj/item/weapon/pen/fourcolor, +/obj/item/spellbook/oneuse/summonitem, +/obj/item/pen/fourcolor, /turf/open/floor/vault, /area/awaymission/academy/academyengine) "mk" = ( /obj/structure/rack, -/obj/item/weapon/claymore, +/obj/item/claymore, /obj/item/toy/figure/wizard, /turf/open/floor/vault, /area/awaymission/academy/academyengine) @@ -4164,12 +4164,12 @@ /area/awaymission/academy/academyengine) "mn" = ( /obj/structure/rack, -/obj/item/weapon/gun/magic/wand, +/obj/item/gun/magic/wand, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "mo" = ( /obj/structure/rack, -/obj/item/weapon/staff, +/obj/item/staff, /turf/open/floor/plating, /area/awaymission/academy/academyengine) "mp" = ( @@ -4263,7 +4263,7 @@ /area/awaymission/academy/academyengine) "mJ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mK" = ( @@ -4272,7 +4272,7 @@ /area/awaymission/academy/academyengine) "mL" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/wood, /area/awaymission/academy/academyengine) "mM" = ( @@ -4313,7 +4313,7 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mU" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab, +/obj/item/reagent_containers/food/snacks/meat/slab, /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "mV" = ( @@ -4398,7 +4398,7 @@ /area/awaymission/academy/academyengine) "nj" = ( /obj/structure/rack, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/open/floor/plating/asteroid/snow, /area/awaymission/academy/academycellar) "nk" = ( diff --git a/_maps/RandomZLevels/Cabin.dmm b/_maps/RandomZLevels/Cabin.dmm index a03b3b148e4..a0a4907b021 100644 --- a/_maps/RandomZLevels/Cabin.dmm +++ b/_maps/RandomZLevels/Cabin.dmm @@ -12,7 +12,7 @@ /turf/closed/wall/mineral/wood, /area/awaymission/snowforest/lumbermill) "ae" = ( -/obj/item/weapon/grown/log/tree, +/obj/item/grown/log/tree, /turf/open/floor/plating/asteroid/snow/temperatre, /area/awaymission/snowforest) "af" = ( @@ -40,7 +40,7 @@ /turf/open/floor/wood/cold, /area/awaymission/snowforest/lumbermill) "aj" = ( -/obj/item/weapon/grown/log/tree, +/obj/item/grown/log/tree, /turf/open/floor/wood/cold, /area/awaymission/snowforest/lumbermill) "ak" = ( @@ -49,12 +49,12 @@ /area/awaymission/snowforest/lumbermill) "al" = ( /obj/structure/table/wood, -/obj/item/weapon/grown/log/tree, +/obj/item/grown/log/tree, /turf/open/floor/wood/cold, /area/awaymission/snowforest/lumbermill) "am" = ( /obj/structure/table/wood, -/obj/item/weapon/twohanded/required/chainsaw, +/obj/item/twohanded/required/chainsaw, /turf/open/floor/wood/cold, /area/awaymission/snowforest/lumbermill) "an" = ( @@ -147,7 +147,7 @@ /area/awaymission/cabin) "aA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/wood, /area/awaymission/cabin) "aB" = ( @@ -193,7 +193,7 @@ /turf/open/floor/plating, /area/awaymission/cabin) "aG" = ( -/obj/item/weapon/reagent_containers/pill/patch/styptic, +/obj/item/reagent_containers/pill/patch/styptic, /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) "aH" = ( @@ -298,12 +298,12 @@ /area/awaymission/cabin) "aY" = ( /obj/structure/table/wood, -/obj/item/weapon/phone, +/obj/item/phone, /turf/open/floor/carpet, /area/awaymission/cabin) "aZ" = ( /obj/structure/guncase/shotgun, -/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, /turf/open/floor/carpet, /area/awaymission/cabin) "ba" = ( @@ -318,7 +318,7 @@ /area/awaymission/cabin) "bc" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/carpet, /area/awaymission/cabin) "bd" = ( @@ -493,12 +493,12 @@ /area/awaymission/cabin) "bK" = ( /obj/effect/decal/cleanable/blood, -/obj/item/weapon/reagent_containers/pill/patch/styptic, +/obj/item/reagent_containers/pill/patch/styptic, /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) "bL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/patriot, +/obj/item/bedsheet/patriot, /turf/open/floor/wood, /area/awaymission/cabin) "bM" = ( @@ -543,12 +543,12 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/wood, /area/awaymission/cabin) "bV" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife/butcher, +/obj/item/kitchen/knife/butcher, /turf/open/floor/plasteel/cafeteria, /area/awaymission/cabin) "bW" = ( @@ -575,12 +575,12 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, -/obj/item/weapon/cautery, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/scalpel, -/obj/item/weapon/hemostat, +/obj/item/surgicaldrill, +/obj/item/circular_saw, +/obj/item/cautery, +/obj/item/surgical_drapes, +/obj/item/scalpel, +/obj/item/hemostat, /turf/open/floor/plasteel/white, /area/awaymission/cabin) "ca" = ( @@ -654,7 +654,7 @@ /area/awaymission/cabin) "cn" = ( /obj/structure/bed/roller, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/white, /area/awaymission/cabin) "co" = ( @@ -681,7 +681,7 @@ /area/awaymission/snowforest) "cs" = ( /obj/structure/table/wood, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/wood, /area/awaymission/cabin) "ct" = ( @@ -699,9 +699,9 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/white, /area/awaymission/cabin) "cw" = ( @@ -914,7 +914,7 @@ /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) "dl" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) "dm" = ( @@ -937,7 +937,7 @@ /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) "dq" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/decal/cleanable/blood, /turf/open/floor/plating/snowed/temperatre, /area/awaymission/snowforest) @@ -961,7 +961,7 @@ "du" = ( /obj/structure/closet/toolcloset, /obj/item/device/lightreplacer, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/cabin) "dv" = ( diff --git a/_maps/RandomZLevels/beach.dmm b/_maps/RandomZLevels/beach.dmm index 3d22ecf5610..fdfaa7f9b50 100644 --- a/_maps/RandomZLevels/beach.dmm +++ b/_maps/RandomZLevels/beach.dmm @@ -131,10 +131,10 @@ /area/awaymission/beach) "ay" = ( /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/storage/box/beakers, /turf/open/floor/wood, /area/awaymission/beach) "az" = ( @@ -150,7 +150,7 @@ /area/awaymission/beach) "aB" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/wood, /area/awaymission/beach) "aC" = ( diff --git a/_maps/RandomZLevels/beach2.dmm b/_maps/RandomZLevels/beach2.dmm index c2641f7c40d..7f48402838c 100644 --- a/_maps/RandomZLevels/beach2.dmm +++ b/_maps/RandomZLevels/beach2.dmm @@ -122,7 +122,7 @@ }, /area/awaymission/beach) "ax" = ( -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /obj/structure/bed, /obj/machinery/button/door{ id = "loveshack"; @@ -148,8 +148,8 @@ /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "aA" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, +/obj/item/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/rum, /obj/structure/table/wood, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand @@ -250,21 +250,21 @@ /area/awaymission/beach) "aO" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, /area/awaymission/beach) "aP" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, /area/awaymission/beach) "aQ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, @@ -272,7 +272,7 @@ "aR" = ( /obj/structure/table/wood, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, @@ -315,7 +315,7 @@ /area/awaymission/beach) "aY" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/food/drinks/ale, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, @@ -328,14 +328,14 @@ /area/awaymission/beach) "ba" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, /area/awaymission/beach) "bb" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime, +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/beach/sand }, @@ -346,12 +346,12 @@ /area/awaymission/beach) "bd" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "be" = ( @@ -377,17 +377,17 @@ /area/awaymission/beach) "bh" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bi" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bj" = ( @@ -399,23 +399,23 @@ /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bl" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime, +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bm" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bn" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist, +/obj/item/reagent_containers/food/drinks/soda_cans/starkist, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bo" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bp" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind, +/obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind, /turf/open/floor/plating/beach/sand, /area/awaymission/beach) "bq" = ( diff --git a/_maps/RandomZLevels/caves.dmm b/_maps/RandomZLevels/caves.dmm index c1df4a80902..024abd19689 100644 --- a/_maps/RandomZLevels/caves.dmm +++ b/_maps/RandomZLevels/caves.dmm @@ -29,7 +29,7 @@ name = "\improper BMP Asteroid Level 3" }) "af" = ( -/obj/item/weapon/greentext, +/obj/item/greentext, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -117,7 +117,7 @@ name = "\improper BMP Asteroid Level 4" }) "aq" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, @@ -156,7 +156,7 @@ /obj/item/stack/sheet/runed_metal{ amount = 25 }, -/obj/item/weapon/veilrender/honkrender, +/obj/item/veilrender/honkrender, /obj/item/clothing/mask/gas/clown_hat, /obj/item/organ/heart/demon, /turf/open/floor/engine/cult{ @@ -200,11 +200,11 @@ }) "ay" = ( /obj/structure/destructible/cult/tome, -/obj/item/weapon/tome, +/obj/item/tome, /obj/item/stack/sheet/runed_metal{ amount = 25 }, -/obj/item/weapon/coin/antagtoken, +/obj/item/coin/antagtoken, /turf/open/floor/engine/cult{ baseturf = /turf/open/lava/smooth; initial_gas_mix = "n2=23;o2=14" @@ -242,7 +242,7 @@ }) "aC" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cult, +/obj/item/bedsheet/cult, /turf/open/floor/engine/cult{ baseturf = /turf/open/lava/smooth; initial_gas_mix = "n2=23;o2=14" @@ -264,8 +264,8 @@ /obj/item/stack/sheet/runed_metal{ amount = 25 }, -/obj/item/weapon/coin/antagtoken, -/obj/item/weapon/spellbook/oneuse/summonitem{ +/obj/item/coin/antagtoken, +/obj/item/spellbook/oneuse/summonitem{ name = "an extremely flamboyant book" }, /turf/open/floor/engine/cult{ @@ -290,7 +290,7 @@ name = "\improper BMP Asteroid Level 4" }) "aG" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/open/floor/engine/cult{ baseturf = /turf/open/lava/smooth; initial_gas_mix = "n2=23;o2=14" @@ -496,7 +496,7 @@ }) "ba" = ( /obj/structure/destructible/cult/talisman, -/obj/item/weapon/plasma_fist_scroll, +/obj/item/plasma_fist_scroll, /turf/open/floor/engine/cult{ baseturf = /turf/open/lava/smooth; initial_gas_mix = "n2=23;o2=14" @@ -724,7 +724,7 @@ name = "\improper BMP Asteroid Level 3" }) "by" = ( -/obj/item/weapon/twohanded/mjollnir, +/obj/item/twohanded/mjollnir, /mob/living/simple_animal/hostile/poison/giant_spider/nurse, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" @@ -803,7 +803,7 @@ name = "\improper BMP Asteroid Level 3" }) "bG" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol/deagle/gold, +/obj/item/gun/ballistic/automatic/pistol/deagle/gold, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, @@ -820,7 +820,7 @@ name = "\improper BMP Asteroid Level 4" }) "bI" = ( -/obj/item/weapon/bedsheet/patriot, +/obj/item/bedsheet/patriot, /turf/open/floor/plating/asteroid/basalt/lava{ initial_gas_mix = "n2=23;o2=14" }, @@ -942,7 +942,7 @@ }) "bX" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/awaymissions/caves/unsafe_area, +/obj/item/paper/crumpled/awaymissions/caves/unsafe_area, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -978,7 +978,7 @@ /obj/structure/closet/crate/miningcar{ name = "Mining cart" }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -1043,7 +1043,7 @@ }, /area/awaymission/research) "ci" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -1089,7 +1089,7 @@ dir = 1 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/caves/omega, +/obj/item/paper/fluff/awaymissions/caves/omega, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1117,14 +1117,14 @@ }, /area/awaymission/research) "cs" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" }, /area/awaymission/research) "ct" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/item/stack/rods, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plasteel{ @@ -1190,8 +1190,8 @@ /area/awaymission/research) "cC" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs/cable, -/obj/item/weapon/restraints/handcuffs/cable, +/obj/item/restraints/handcuffs/cable, +/obj/item/restraints/handcuffs/cable, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1308,7 +1308,7 @@ }, /area/awaymission/research) "cQ" = ( -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -1381,7 +1381,7 @@ /area/awaymission/research) "cX" = ( /obj/structure/table, -/obj/item/weapon/melee/baton, +/obj/item/melee/baton, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1413,7 +1413,7 @@ "db" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/crap, +/obj/item/stock_parts/cell/crap, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1452,9 +1452,9 @@ /obj/structure/closet/secure_closet/miner{ name = "weapon equipment" }, -/obj/item/weapon/grenade/syndieminibomb/concussion, -/obj/item/weapon/grenade/syndieminibomb/concussion, -/obj/item/weapon/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; initial_gas_mix = "n2=23;o2=14" @@ -1482,8 +1482,8 @@ }) "di" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/awaymissions/caves/magma, -/obj/item/weapon/pen, +/obj/item/paper/fluff/awaymissions/caves/magma, +/obj/item/pen, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -1547,7 +1547,7 @@ }) "dp" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -1576,7 +1576,7 @@ }) "ds" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -1613,7 +1613,7 @@ }) "dw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/awaystart, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -1624,7 +1624,7 @@ "dx" = ( /obj/structure/closet/secure_closet/personal, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/sord, +/obj/item/sord, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -1642,7 +1642,7 @@ /area/awaymission/northblock) "dA" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -1677,7 +1677,7 @@ /area/awaymission/northblock) "dF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -1692,7 +1692,7 @@ /area/awaymission/northblock) "dH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/awaystart, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -1804,7 +1804,7 @@ /area/awaymission/BMPship) "dY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/landmark/awaystart, /turf/open/floor/wood{ @@ -1878,8 +1878,8 @@ /area/awaymission/BMPship) "ei" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -1901,7 +1901,7 @@ /area/awaymission/BMPship) "el" = ( /obj/structure/closet/secure_closet/personal, -/obj/item/weapon/gun/energy/laser/captain/scattershot, +/obj/item/gun/energy/laser/captain/scattershot, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -1987,8 +1987,8 @@ "ex" = ( /obj/structure/closet/secure_closet/miner, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/survivalcapsule, -/obj/item/weapon/extinguisher/mini, +/obj/item/survivalcapsule, +/obj/item/extinguisher/mini, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2013,7 +2013,7 @@ /area/awaymission/BMPship) "eA" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/awaymissions/caves/work_notice, +/obj/item/paper/fluff/awaymissions/caves/work_notice, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2037,8 +2037,8 @@ /area/awaymission/BMPship) "eD" = ( /obj/structure/closet/secure_closet/miner, -/obj/item/weapon/survivalcapsule, -/obj/item/weapon/extinguisher/mini, +/obj/item/survivalcapsule, +/obj/item/extinguisher/mini, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2067,8 +2067,8 @@ /area/awaymission/BMPship) "eI" = ( /obj/structure/closet/crate/trashcart, -/obj/item/weapon/switchblade, -/obj/item/weapon/switchblade, +/obj/item/switchblade, +/obj/item/switchblade, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2080,8 +2080,8 @@ /area/awaymission/listeningpost) "eK" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/kinetic_accelerator, -/obj/item/weapon/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, +/obj/item/gun/energy/kinetic_accelerator, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -2098,7 +2098,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/device/multitool, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -2118,7 +2118,7 @@ /area/awaymission/listeningpost) "eP" = ( /obj/structure/table, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -2126,7 +2126,7 @@ pixel_x = 5; throwforce = 1 }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -2168,8 +2168,8 @@ /area/awaymission/BMPship) "eU" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2186,7 +2186,7 @@ /area/awaymission/listeningpost) "eX" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2209,8 +2209,8 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_notice, -/obj/item/weapon/paper/fluff/awaymissions/caves/saftey_notice, +/obj/item/paper/fluff/awaymissions/caves/shipment_notice, +/obj/item/paper/fluff/awaymissions/caves/saftey_notice, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2225,13 +2225,13 @@ }) "fc" = ( /obj/structure/closet/crate, -/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_receipt, -/obj/item/weapon/gun/energy/laser/captain/scattershot, -/obj/item/weapon/gun/energy/laser/captain/scattershot, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/grenade/syndieminibomb/concussion, -/obj/item/weapon/grenade/syndieminibomb/concussion, -/obj/item/weapon/grenade/syndieminibomb/concussion, +/obj/item/paper/fluff/awaymissions/caves/shipment_receipt, +/obj/item/gun/energy/laser/captain/scattershot, +/obj/item/gun/energy/laser/captain/scattershot, +/obj/item/gun/energy/laser, +/obj/item/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, /obj/item/slimepotion/fireproof, /obj/item/slimepotion/fireproof, /obj/item/clothing/glasses/thermal, @@ -2294,7 +2294,7 @@ name = "\improper BMP Asteroid Level 2" }) "fk" = ( -/obj/item/weapon/grenade/syndieminibomb/concussion, +/obj/item/grenade/syndieminibomb/concussion, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -2319,9 +2319,9 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/paper/fluff/awaymissions/caves/shipment_receipt, +/obj/item/paper/fluff/awaymissions/caves/shipment_receipt, /obj/item/organ/eyes/robotic/thermals, -/obj/item/weapon/gun/energy/laser/captain/scattershot, +/obj/item/gun/energy/laser/captain/scattershot, /obj/item/slimepotion/fireproof, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" @@ -2369,15 +2369,15 @@ /area/awaymission/BMPship) "fs" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, /area/awaymission/BMPship) "ft" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/structure/spider/stickyweb, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt @@ -2385,8 +2385,8 @@ /area/awaymission/BMPship) "fu" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/reagent_containers/blood/OPlus, +/obj/item/storage/firstaid/brute, +/obj/item/reagent_containers/blood/OPlus, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2400,7 +2400,7 @@ name = "\improper BMP Asteroid Level 2" }) "fw" = ( -/obj/item/weapon/gun/energy/laser/captain/scattershot, +/obj/item/gun/energy/laser/captain/scattershot, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -2559,9 +2559,9 @@ }) "fS" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/reagent_containers/blood/OPlus, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/reagent_containers/blood/OPlus, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2597,7 +2597,7 @@ /obj/structure/closet/crate/miningcar{ name = "Mining cart" }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ attack_verb = list("ineffectively hit"); desc = "A pickaxe thats been left to rust."; force = 1; @@ -2672,14 +2672,14 @@ /area/awaymission/BMPship) "gf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, /area/awaymission/BMPship) "gg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plating{ baseturf = /turf/open/lava/smooth; initial_gas_mix = "n2=23;o2=14" @@ -2729,7 +2729,7 @@ }, /area/awaymission/BMPship) "gn" = ( -/obj/item/weapon/grown/log, +/obj/item/grown/log, /turf/open/floor/plating/asteroid/basalt{ initial_gas_mix = "n2=23;o2=14" }, @@ -2758,7 +2758,7 @@ /area/awaymission/BMPship) "gr" = ( /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2798,14 +2798,14 @@ /area/awaymission/BMPship) "gx" = ( /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/item/trash/plate, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, /area/awaymission/BMPship) "gy" = ( -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt }, @@ -2855,7 +2855,7 @@ /area/awaymission/BMPship) "gF" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/glasses/material, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/basalt; @@ -2869,7 +2869,7 @@ "gH" = ( /obj/structure/table, /obj/item/mecha_parts/mecha_equipment/drill/diamonddrill, -/obj/item/weapon/paper/fluff/awaymissions/caves/mech_notice, +/obj/item/paper/fluff/awaymissions/caves/mech_notice, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/basalt }, diff --git a/_maps/RandomZLevels/centcomAway.dmm b/_maps/RandomZLevels/centcomAway.dmm index ea3d101368b..ad069e31599 100644 --- a/_maps/RandomZLevels/centcomAway.dmm +++ b/_maps/RandomZLevels/centcomAway.dmm @@ -101,19 +101,19 @@ /area/awaymission/centcomAway/cafe) "ar" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/green{ dir = 1 }, /area/awaymission/centcomAway/cafe) "as" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/green{ dir = 1 }, @@ -136,7 +136,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/cafe) "av" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/cafe) "aw" = ( @@ -149,7 +149,7 @@ /area/awaymission/centcomAway/cafe) "ay" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife/butcher, +/obj/item/kitchen/knife/butcher, /turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "az" = ( @@ -225,7 +225,7 @@ /area/awaymission/centcomAway/cafe) "aL" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/cafeteria, /area/awaymission/centcomAway/cafe) "aM" = ( @@ -254,7 +254,7 @@ /area/awaymission/centcomAway/maint) "aQ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet, /area/awaymission/centcomAway/cafe) "aR" = ( @@ -365,8 +365,8 @@ /area/awaymission/centcomAway/cafe) "bg" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/plasteel/green{ dir = 1 }, @@ -481,7 +481,7 @@ /area/awaymission/centcomAway/cafe) "bA" = ( /obj/structure/rack, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/gloves/color/black, /turf/open/floor/plating, @@ -597,17 +597,17 @@ /area/awaymission/centcomAway/hangar) "bW" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "bX" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = -2; pixel_y = 4 }, @@ -615,10 +615,10 @@ /area/awaymission/centcomAway/hangar) "bY" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -640,12 +640,12 @@ }, /area/awaymission/centcomAway/hangar) "cb" = ( -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/table, /turf/open/floor/plasteel/redyellow, /area/awaymission/centcomAway/cafe) "cc" = ( -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/structure/table, /turf/open/floor/plasteel/redyellow, /area/awaymission/centcomAway/cafe) @@ -681,7 +681,7 @@ /area/awaymission/centcomAway/cafe) "ch" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, /turf/open/floor/plasteel/hydrofloor, @@ -717,7 +717,7 @@ /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "co" = ( -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table, /turf/open/floor/plasteel/redyellow, /area/awaymission/centcomAway/cafe) @@ -826,17 +826,17 @@ /area/awaymission/centcomAway/hangar) "cJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cM" = ( @@ -903,8 +903,8 @@ /area/awaymission/centcomAway/hangar) "cX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp, +/obj/item/clipboard, +/obj/item/stamp, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "cY" = ( @@ -975,7 +975,7 @@ /area/awaymission/centcomAway/cafe) "dl" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/centcomAway/hangar) "dm" = ( @@ -1084,7 +1084,7 @@ /area/awaymission/centcomAway/hangar) "dC" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/redyellow, /area/awaymission/centcomAway/cafe) "dD" = ( @@ -1230,12 +1230,12 @@ /area/awaymission/centcomAway/hangar) "ea" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "eb" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "ec" = ( @@ -1320,17 +1320,17 @@ /area/awaymission/centcomAway/cafe) "eo" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/red, /area/awaymission/centcomAway/cafe) "ep" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/red, /area/awaymission/centcomAway/cafe) "eq" = ( @@ -1439,7 +1439,7 @@ /area/awaymission/centcomAway/general) "eK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath/medical, /turf/open/floor/plasteel/white, /area/awaymission/centcomAway/general) @@ -1449,7 +1449,7 @@ /area/awaymission/centcomAway/general) "eM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -1529,7 +1529,7 @@ /area/awaymission/centcomAway/courtroom) "eZ" = ( /obj/structure/table, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fa" = ( @@ -1542,13 +1542,13 @@ /area/awaymission/centcomAway/hangar) "fc" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/pen, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/mineral/titanium/blue, /area/awaymission/centcomAway/hangar) "fe" = ( @@ -1580,12 +1580,12 @@ /area/awaymission/centcomAway/general) "fj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet, /area/awaymission/centcomAway/courtroom) "fk" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /turf/open/floor/carpet, /area/awaymission/centcomAway/courtroom) "fl" = ( @@ -1695,7 +1695,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -1713,7 +1713,7 @@ /area/awaymission/centcomAway/general) "fC" = ( /obj/machinery/computer/scan_consolenew, -/obj/item/weapon/dnainjector/telemut/darkbundle, +/obj/item/dnainjector/telemut/darkbundle, /turf/open/floor/plasteel/white, /area/awaymission/centcomAway/general) "fD" = ( @@ -1988,7 +1988,7 @@ /area/awaymission/centcomAway/general) "gt" = ( /obj/machinery/photocopier, -/obj/item/weapon/paper/fluff/awaymissions/centcom/gateway_memo, +/obj/item/paper/fluff/awaymissions/centcom/gateway_memo, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -2004,7 +2004,7 @@ /area/awaymission/centcomAway/general) "gv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/hand_labeler_refill, /turf/open/floor/plasteel{ icon_state = "floor" @@ -2012,7 +2012,7 @@ /area/awaymission/centcomAway/general) "gw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -2151,7 +2151,7 @@ /area/awaymission/centcomAway/hangar) "gU" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/awaymissions/centcom/gateway_memo, +/obj/item/paper/fluff/awaymissions/centcom/gateway_memo, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "gV" = ( @@ -2240,14 +2240,14 @@ /area/awaymission/centcomAway/general) "hj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/PDAs, +/obj/item/storage/box/PDAs, /turf/open/floor/plasteel{ icon_state = "floor" }, /area/awaymission/centcomAway/general) "hk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -2272,7 +2272,7 @@ /area/awaymission/centcomAway/general) "ho" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -2356,7 +2356,7 @@ "hx" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_y = 5 }, /turf/open/floor/plating, @@ -2412,12 +2412,12 @@ /area/awaymission/centcomAway/courtroom) "hG" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/awaymission/centcomAway/hangar) "hH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/engine, /area/awaymission/centcomAway/general) "hI" = ( @@ -2488,7 +2488,7 @@ /area/awaymission/centcomAway/courtroom) "hS" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/awaymission/centcomAway/courtroom) "hT" = ( @@ -2504,7 +2504,7 @@ /turf/open/floor/engine, /area/awaymission/centcomAway/general) "hW" = ( -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2611,8 +2611,8 @@ /area/awaymission/centcomAway/general) "ir" = ( /obj/structure/closet/crate/trashcart, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "is" = ( @@ -2805,31 +2805,31 @@ dir = 9 }, /obj/item/clothing/mask/cigarette/cigar/havana, -/obj/item/weapon/reagent_containers/food/drinks/sillycup, +/obj/item/reagent_containers/food/drinks/sillycup, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "iU" = ( /obj/structure/table/wood{ dir = 5 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "iV" = ( /obj/structure/table/wood{ dir = 5 }, -/obj/item/weapon/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "iW" = ( /obj/machinery/computer/card/centcom, -/obj/item/weapon/card/id/centcom, +/obj/item/card/id/centcom, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "iX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "iY" = ( @@ -2884,7 +2884,7 @@ /area/awaymission/centcomAway/general) "jg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "jh" = ( @@ -2923,7 +2923,7 @@ /area/awaymission/centcomAway/general) "jn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "jo" = ( @@ -2935,7 +2935,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "jq" = ( -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 4 @@ -2943,7 +2943,7 @@ /area/awaymission/centcomAway/general) "jr" = ( /obj/structure/table, -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /turf/open/floor/plasteel/vault, /area/awaymission/centcomAway/hangar) "js" = ( @@ -2969,7 +2969,7 @@ /area/awaymission/centcomAway/hangar) "jv" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/vault, /area/awaymission/centcomAway/hangar) "jw" = ( @@ -3131,7 +3131,7 @@ /area/awaymission/centcomAway/general) "jQ" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /turf/open/floor/plasteel{ icon_state = "floor" }, @@ -3328,7 +3328,7 @@ /area/awaymission/centcomAway/hangar) "kq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -3354,7 +3354,7 @@ }, /area/awaymission/centcomAway/general) "ku" = ( -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/table/reinforced, /turf/open/floor/plasteel{ icon_state = "floor" @@ -3410,10 +3410,10 @@ }, /area/awaymission/centcomAway/general) "kC" = ( -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/structure/table, /obj/item/device/taperecorder, -/obj/item/weapon/stamp, +/obj/item/stamp, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -3457,8 +3457,8 @@ /area/awaymission/centcomAway/general) "kJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/stamp, +/obj/item/storage/box/handcuffs, +/obj/item/stamp, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -3499,7 +3499,7 @@ /area/awaymission/centcomAway/general) "kP" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/food/drinks/trophy/gold_cup, /turf/open/floor/carpet, /area/awaymission/centcomAway/general) "kQ" = ( @@ -3653,7 +3653,7 @@ /area/awaymission/centcomAway/thunderdome) "lp" = ( /obj/structure/table, -/obj/item/weapon/lipstick, +/obj/item/lipstick, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -3693,8 +3693,8 @@ /area/awaymission/centcomAway/thunderdome) "lv" = ( /obj/structure/rack, -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/twohanded/fireaxe, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/twohanded/fireaxe, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "lw" = ( @@ -3741,7 +3741,7 @@ /turf/open/floor/plasteel, /area/awaymission/centcomAway/thunderdome) "lB" = ( -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/general) "lC" = ( @@ -3773,8 +3773,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/hatchet, -/obj/item/weapon/shield/riot, +/obj/item/hatchet, +/obj/item/shield/riot, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "lH" = ( @@ -3806,8 +3806,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/hatchet, -/obj/item/weapon/shield/riot, +/obj/item/hatchet, +/obj/item/shield/riot, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "lM" = ( @@ -3880,7 +3880,7 @@ /area/awaymission/centcomAway/thunderdome) "lX" = ( /obj/machinery/chem_dispenser, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/open/floor/plasteel/green{ dir = 1 }, @@ -3911,12 +3911,12 @@ /turf/open/floor/plasteel, /area/awaymission/centcomAway/thunderdome) "mc" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/white, /area/awaymission/centcomAway/thunderdome) "md" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/plasteel/black, /area/awaymission/centcomAway/thunderdome) "me" = ( @@ -3940,7 +3940,7 @@ /area/awaymission/centcomAway/thunderdome) "mh" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, /turf/open/floor/plasteel/redyellow{ dir = 5 }, @@ -3959,7 +3959,7 @@ /area/awaymission/centcomAway/cafe) "mk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/popcorn, +/obj/item/reagent_containers/food/snacks/popcorn, /turf/open/floor/plasteel/barber{ dir = 8; heat_capacity = 1 @@ -4003,21 +4003,21 @@ /area/awaymission/centcomAway/thunderdome) "mq" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/open/floor/plasteel/redyellow{ dir = 5 }, /area/awaymission/centcomAway/thunderdome) "mr" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/redyellow{ dir = 5 }, /area/awaymission/centcomAway/thunderdome) "ms" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/redyellow{ dir = 5 }, @@ -4086,7 +4086,7 @@ /area/awaymission/centcomAway/cafe) "mB" = ( /obj/machinery/chem_dispenser, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/open/floor/plasteel/red, /area/awaymission/centcomAway/cafe) "mC" = ( @@ -4146,8 +4146,8 @@ /area/awaymission/centcomAway/cafe) "mL" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/plasteel/red, /area/awaymission/centcomAway/cafe) "mM" = ( @@ -4180,7 +4180,7 @@ /obj/structure/safe/floor, /obj/item/clothing/under/rank/centcom_officer, /obj/item/clothing/suit/det_suit, -/obj/item/weapon/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "mR" = ( @@ -4201,8 +4201,8 @@ /area/awaymission/centcomAway/hangar) "mU" = ( /obj/structure/rack, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/secure/briefcase, +/obj/item/storage/belt/utility/full, /turf/open/floor/plasteel/grimy, /area/awaymission/centcomAway/general) "mV" = ( @@ -4370,9 +4370,9 @@ /area/awaymission/centcomAway/thunderdome) "nz" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/drinks/ice, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/drinks/ice, /turf/open/floor/plasteel/barber{ dir = 8; heat_capacity = 1 diff --git a/_maps/RandomZLevels/challenge.dmm b/_maps/RandomZLevels/challenge.dmm index 8ab66089fa5..a7ed222e90e 100644 --- a/_maps/RandomZLevels/challenge.dmm +++ b/_maps/RandomZLevels/challenge.dmm @@ -76,7 +76,7 @@ /turf/open/floor/plasteel/airless, /area/awaymission/challenge/start) "ap" = ( -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/plasteel/airless, /area/awaymission/challenge/start) "aq" = ( @@ -243,7 +243,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating/airless, /area/awaymission/challenge/main) @@ -395,7 +395,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating, /area/awaymission/challenge/main) @@ -416,7 +416,7 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bt" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/airless, /area/awaymission/challenge/main) "bu" = ( @@ -503,7 +503,7 @@ /turf/open/floor/plating/airless, /area/awaymission/challenge/main) "bE" = ( -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/airless, /area/awaymission/challenge/main) "bF" = ( @@ -584,7 +584,7 @@ }, /area/awaymission/challenge/end) "bQ" = ( -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/plasteel/white/side{ dir = 2 }, @@ -720,7 +720,7 @@ /area/awaymission/challenge/end) "ck" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /turf/open/floor/wood, /area/awaymission/challenge/end) "cl" = ( @@ -749,14 +749,14 @@ /area/space) "cq" = ( /obj/structure/table/wood, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/stamp, +/obj/item/melee/chainofcommand, +/obj/item/stamp, /turf/open/floor/carpet, /area/awaymission/challenge/end) "cr" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/fluff/gateway, -/obj/item/weapon/folder/blue, +/obj/item/paper/fluff/gateway, +/obj/item/folder/blue, /turf/open/floor/carpet, /area/awaymission/challenge/end) "cs" = ( @@ -784,7 +784,7 @@ /area/awaymission/challenge/end) "cw" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/l6_saw, +/obj/item/gun/ballistic/automatic/l6_saw, /turf/open/floor/wood, /area/awaymission/challenge/end) "cx" = ( @@ -824,7 +824,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "cC" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/circuit, /area/awaymission/challenge/end) "cD" = ( @@ -1046,12 +1046,12 @@ /area/awaymission/challenge/end) "df" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "dg" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/black, /area/awaymission/challenge/end) "dh" = ( @@ -1063,14 +1063,14 @@ /area/awaymission/challenge/end) "di" = ( /obj/structure/table, -/obj/item/weapon/implanter/explosive, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive, +/obj/item/implanter/explosive{ pixel_y = 4 }, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive{ pixel_y = 8 }, -/obj/item/weapon/implanter/explosive{ +/obj/item/implanter/explosive{ pixel_y = 12 }, /turf/open/floor/plasteel/black, diff --git a/_maps/RandomZLevels/moonoutpost19.dmm b/_maps/RandomZLevels/moonoutpost19.dmm index 71b778c7d61..10c6448d5d3 100644 --- a/_maps/RandomZLevels/moonoutpost19.dmm +++ b/_maps/RandomZLevels/moonoutpost19.dmm @@ -236,7 +236,7 @@ /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, /obj/item/clothing/mask/facehugger/impregnated, -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plating/asteroid{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -435,7 +435,7 @@ /obj/item/clothing/mask/facehugger/impregnated, /obj/item/clothing/under/rank/security, /obj/item/clothing/suit/armor/vest, -/obj/item/weapon/melee/baton/loaded, +/obj/item/melee/baton/loaded, /obj/item/clothing/head/helmet, /turf/open/floor/plating/asteroid{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -632,7 +632,7 @@ name = "Syndicate Outpost" }) "aS" = ( -/obj/item/weapon/ore/iron{ +/obj/item/ore/iron{ pixel_x = 7; pixel_y = -6 }, @@ -906,7 +906,7 @@ name = "Syndicate Outpost" }) "bn" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -969,12 +969,12 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal, +/obj/item/pen, +/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -1011,7 +1011,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -1091,7 +1091,7 @@ pixel_x = 32 }, /obj/item/trash/plate, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -1203,7 +1203,7 @@ }) "bJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -1296,7 +1296,7 @@ icon_state = "2-4" }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -1581,8 +1581,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/engineering, +/obj/item/stock_parts/cell/high, +/obj/item/paper/fluff/awaymissions/moonoutpost19/engineering, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -1703,7 +1703,7 @@ name = "Dormitories" }, /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel{ @@ -1931,7 +1931,7 @@ }, /obj/item/stack/rods, /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/alien/weeds, /turf/open/floor/plating{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -2006,7 +2006,7 @@ name = "Syndicate Outpost" }) "cM" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -2219,7 +2219,7 @@ specialfunctions = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/syndie, +/obj/item/bedsheet/syndie, /turf/open/floor/wood{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -2438,11 +2438,11 @@ }) "dp" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /obj/structure/alien/weeds, /obj/item/device/mining_scanner, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe, +/obj/item/shovel, +/obj/item/pickaxe, /turf/open/floor/plating{ broken = 1; initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; @@ -2456,8 +2456,8 @@ }) "dq" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/personal_2, +/obj/item/pen, +/obj/item/paper/fluff/awaymissions/moonoutpost19/log/personal_2, /obj/structure/sign/poster/contraband/c20r{ pixel_y = -32 }, @@ -2483,7 +2483,7 @@ /obj/item/ammo_box/magazine/m10mm{ icon_state = "9x19p-8" }, -/obj/item/weapon/suppressor, +/obj/item/suppressor, /turf/open/floor/wood{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -2494,7 +2494,7 @@ }) "ds" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/syndie, +/obj/item/bedsheet/syndie, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood{ heat_capacity = 1e+006 @@ -2537,8 +2537,8 @@ name = "Syndicate Outpost" }) "dv" = ( -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron{ +/obj/item/ore/iron, +/obj/item/ore/iron{ pixel_x = -7; pixel_y = -4 }, @@ -2592,7 +2592,7 @@ /obj/structure/rack, /obj/item/clothing/suit/space/syndicate/orange, /obj/item/clothing/mask/gas, -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /obj/item/clothing/head/helmet/space/syndicate/orange, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -2607,7 +2607,7 @@ name = "Syndicate Outpost" }) "dz" = ( -/obj/item/weapon/ore/iron{ +/obj/item/ore/iron{ pixel_x = -3; pixel_y = 9 }, @@ -2785,7 +2785,7 @@ name = "Syndicate Outpost" }) "dJ" = ( -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating/asteroid{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -2801,7 +2801,7 @@ poweralm = 0 }) "dK" = ( -/obj/item/weapon/pickaxe/drill, +/obj/item/pickaxe/drill, /turf/open/floor/plating/asteroid{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -2850,7 +2850,7 @@ poweralm = 0 }) "dN" = ( -/obj/item/weapon/ore/iron{ +/obj/item/ore/iron{ pixel_x = -7; pixel_y = -4 }, @@ -2872,7 +2872,7 @@ /obj/structure/alien/weeds, /obj/structure/bed/nest, /obj/effect/decal/cleanable/blood/gibs, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/suit/space/syndicate/orange, /obj/item/clothing/mask/gas, /obj/item/clothing/head/helmet/space/syndicate/orange, @@ -3677,7 +3677,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -3831,11 +3831,11 @@ pixel_y = 24 }, /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/structure/alien/weeds, /turf/open/floor/plasteel{ heat_capacity = 1e+006 @@ -4158,7 +4158,7 @@ /obj/item/stack/cable_coil{ amount = 5 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/turf_decal/stripes/line{ @@ -4186,7 +4186,7 @@ /obj/item/stack/cable_coil{ amount = 5 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /obj/structure/cable{ @@ -4292,7 +4292,7 @@ name = "MO19 Research" }) "fM" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -4373,7 +4373,7 @@ }) "fS" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/kenneth, +/obj/item/paper/fluff/awaymissions/moonoutpost19/log/kenneth, /turf/open/floor/plasteel/red/side{ dir = 9; heat_capacity = 1e+006 @@ -4390,10 +4390,10 @@ req_access_txt = "201" }, /obj/item/clothing/suit/armor/vest, -/obj/item/weapon/reagent_containers/spray/pepper, -/obj/item/weapon/grenade/flashbang, -/obj/item/weapon/storage/belt/security, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/spray/pepper, +/obj/item/grenade/flashbang, +/obj/item/storage/belt/security, +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = -3; pixel_y = -2 }, @@ -4413,7 +4413,7 @@ }) "fU" = ( /obj/item/device/radio/off, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/structure/sign/poster/official/safety_report{ @@ -4532,7 +4532,7 @@ /obj/structure/alien/weeds, /obj/effect/decal/cleanable/blood, /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/engine, @@ -4658,11 +4658,11 @@ }) "gn" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/razor{ +/obj/item/circular_saw, +/obj/item/razor{ pixel_y = 5 }, /obj/structure/alien/weeds, @@ -4799,7 +4799,7 @@ /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/device/radio/off, /turf/open/floor/plating{ heat_capacity = 1e+006 @@ -4810,7 +4810,7 @@ }) "gx" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/ivan, +/obj/item/paper/fluff/awaymissions/moonoutpost19/log/ivan, /turf/open/floor/plating{ broken = 1; heat_capacity = 1e+006; @@ -4876,7 +4876,7 @@ }) "gD" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/decal/cleanable/blood/tracks{ @@ -4900,7 +4900,7 @@ }, /obj/item/stack/rods, /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -4943,8 +4943,8 @@ }) "gH" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/alien/weeds, /turf/open/floor/plasteel/white, /area/awaycontent/a2{ @@ -4953,7 +4953,7 @@ }) "gI" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/machinery/light/small{ active_power_usage = 0; dir = 4; @@ -4974,11 +4974,11 @@ icon_state = "bulb-broken"; status = 2 }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_social, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_psych, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/facehugger, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_social, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_queen, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_adult, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_psych, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/facehugger, /obj/structure/alien/weeds, /turf/open/floor/plasteel/white, /area/awaycontent/a2{ @@ -4988,11 +4988,11 @@ "gK" = ( /obj/structure/table/reinforced, /obj/structure/alien/weeds, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/device/radio/off, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -5164,19 +5164,19 @@ }) "gW" = ( /obj/structure/filingcabinet/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind{ +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_hivemind{ info = "Researcher: Dr. Mark Douglas
Date: 17/06/2554

Report:
Earlier today we have observed a new phenomenon with our subjects. While feeding them our last monkey subject and throwing out the box, the aliens merely looked at us instead of infecting the monkey right away. They looked to be collectively distressed as they would no longer be given hosts, where instead we would move to the next phase of the experiment. When I glanced at the gas tanks and piping leading to their cell, I looked back to see all of them were up against the glass, even the queen! It was as if they all understood what was going to happen, even though we knew only the queen had the cognitive capability to do so.

The only explanation for this is a form of communication between the aliens, but we have seen no such action take place anywhere in the cell until now. We also know that regular drone and hunter xenomorphs have no personality or instinct to survive by themselves. Perhaps the queen has a direct link to them? A form of a commander or overseer that controls their every move? A hivemind?"; name = "The Hivemind Hypothesis" }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior{ +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_behavior{ info = "Researcher: Dr. Sakuma Sano
Date: 08/06/2554

Report:
The xenomorphs we have come to study here are a remarkable species. They are almost universally aggressive across all castes, showing no remorse or guilt or pause before or after acts of violence. They appear to be a species entirely designed to kill. Oddly enough, even their method of reproduction is a brutal two-for-one method of birthing a new xenomorph and killing its host.

The lone xenomorph we studied only five days ago showed little sign of intelligence. Only a simple drone that flung itself at the safety glass and shields repeatedly and thankfully without success. Once the drone molted into a queen, it became much more calm and calculating, merely looking at us and waiting while building its nest. As the hive grew in size and in numbers, so too did the intelligence of the common hunter and drone. We are still researching how they can communicate with one another and the relationship between the different castes and the queen. We will continue to update our research as we learn more about the species."; name = "A Preliminary Study of Alien Behavior" }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes{ +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/xeno_castes{ info = "Researcher: Dr. Mark Douglas
Date: 06/06/2554

Report:
While observing the growing number of aliens in the containment cell, we began to notice subtle differences that were consistently repeating. Like ants, these creatures clearly have different specialized variations that determine their roles in the hive. We have dubbed the three currently observed castes as Hunters, Drones, and Sentinels.

Hunters have been observed to be by far the most aggressive and agile of the three, constantly running on every surface and frequently swiping at the windows. They are also remarkably good at camouflaging themselves in darkness and on their resin structures, appearing almost invisible to the unwary observer. They are always the first to reach the monkeys we send in leading us to believe that this caste is primarily used for finding and retrieving hosts.

Drones on the other hand are much more docile and seem more shy by comparison, though not any less aggressive than the other castes. They have been observed to have a much wider head and lack dorsal tubes. They have shown to be less agile and visibly more fragile than any other caste. The drone however has never been observed to interact with the monkeys directly and instead preferring maintenance of the hive by building walls of resin and moving eggs around the nest. As far as we know, we have only ever observed a drone become a queen, and we have no way of knowing if the other castes have that capability.

Lastly, we have the Sentinels, which appear at first glance to be the guards of the hive. They have so far been only observed to remain near the queen and the eggs, frequently curled up against the walls. We have only observed one instance where they have interacted with a monkey who strayed too closely to the queen, and was pounced and held down immediately until it was applied with a facehugger. Their lack of movement makes it difficult to determine their exact purpose as guards, sentries, or other role."; name = "The Xenomorph 'Castes'" }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy{ +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/larva_autopsy{ info = "Researcher: Dr. Mark Douglas
Date: 04/06/2554

Report:
After an extremely dangerous, time consuming and costly dissection, we have managed to record and identify several of the organs inside of the first stage of the xenomorph cycle: the larva. This procedure took an extensive amount of time because these creatures have incredibly, almost-comically acidic blood that can melt through almost anything in a few moments. We had to use over a dozen scalpels and retractors to complete the autopsy.

The larva seems to possess far fewer and quite different organs than that of a human. There is a stomach, with no digestive tract, a heart, which seems to lack any blood-oxygen circulation purpose, and an elongated brain, even though its as dumb as any large cat. It also lacks any liver, kidneys, or other basic organs.

We can't determine the exact nature of how these creatures grow, nor if they gain organs as they become adults. The larger breeds of xenomorph are too dangerous to kill and capture to give us an accurate answer to these questions. All that we can conclude is that being able to function with so little and yet be so deadly means that these creatures are highly evolved and likely to be extremely durable to various hazards that would otherwise be lethal to humans."; name = "Larva Xenomorph Autopsy Report" }, @@ -5312,7 +5312,7 @@ }) "hg" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, @@ -5326,7 +5326,7 @@ }) "hh" = ( /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/red/side{ heat_capacity = 1e+006 }, @@ -5336,11 +5336,11 @@ }) "hi" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 6; heat_capacity = 1e+006 @@ -5422,7 +5422,7 @@ }) "ho" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/white/corner{ dir = 8; heat_capacity = 1e+006 @@ -5454,7 +5454,7 @@ name = "research director's locker"; req_access_txt = "201" }, -/obj/item/weapon/storage/backpack/satchel/tox, +/obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -5465,8 +5465,8 @@ }) "hr" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, @@ -5495,7 +5495,7 @@ pixel_y = 23; req_access = null }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/log/gerald, +/obj/item/paper/fluff/awaymissions/moonoutpost19/log/gerald, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -5553,7 +5553,7 @@ }, /obj/item/stack/rods, /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating{ @@ -5565,7 +5565,7 @@ }) "hy" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/white{ @@ -5578,7 +5578,7 @@ "hz" = ( /obj/effect/decal/cleanable/robot_debris, /obj/effect/decal/cleanable/oil, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -5600,7 +5600,7 @@ }) "hA" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -5660,7 +5660,7 @@ icon_state = "bulb-broken"; status = 2 }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/research/evacuation, +/obj/item/paper/fluff/awaymissions/moonoutpost19/research/evacuation, /obj/machinery/camera{ c_tag = "Research Division"; dir = 1; @@ -5697,7 +5697,7 @@ }) "hH" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 8; @@ -5728,8 +5728,8 @@ }) "hK" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/poster/random_contraband, +/obj/item/storage/box/lights/mixed, +/obj/item/poster/random_contraband, /turf/open/floor/plating{ broken = 1; heat_capacity = 1e+006; @@ -5895,8 +5895,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/rd{ +/obj/item/folder/white, +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -5909,7 +5909,7 @@ }) "hY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -5954,7 +5954,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/circuitboard/computer/teleporter, +/obj/item/circuitboard/computer/teleporter, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -6097,7 +6097,7 @@ name = "MO19 Arrivals" }) "il" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/light/small{ dir = 8 }, @@ -6198,12 +6198,12 @@ name = "MO19 Research" }) "it" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /obj/effect/decal/cleanable/blood/splatter, -/obj/item/weapon/pen, -/obj/item/weapon/paper/crumpled/awaymissions/moonoutpost19/hastey_note, +/obj/item/pen, +/obj/item/paper/crumpled/awaymissions/moonoutpost19/hastey_note, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -6294,7 +6294,7 @@ /obj/machinery/shower{ dir = 8 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer{ heat_capacity = 1e+006 }, @@ -6314,7 +6314,7 @@ }) "iC" = ( /obj/structure/table, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -6443,7 +6443,7 @@ }) "iM" = ( /obj/structure/table, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/item/device/taperecorder{ pixel_x = -3 }, @@ -6616,7 +6616,7 @@ }) "ja" = ( /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/asteroid{ initial_gas_mix = "co2=48.7;n2=13.2;o2=32.4;TEMP=251"; heat_capacity = 1e+006 @@ -6645,7 +6645,7 @@ }) "jc" = ( /obj/structure/table, -/obj/item/weapon/book/manual/detective, +/obj/item/book/manual/detective, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 @@ -6745,10 +6745,10 @@ "jm" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, /obj/machinery/door/poddoor/shutters{ @@ -6800,7 +6800,7 @@ name = "MO19 Research" }) "jq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; layer = 4.1; pixel_y = 3 @@ -6837,7 +6837,7 @@ }) "jt" = ( /obj/structure/table, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 @@ -7051,7 +7051,7 @@ /obj/structure/noticeboard{ pixel_y = 32 }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/food_specials, +/obj/item/paper/fluff/awaymissions/moonoutpost19/food_specials, /turf/open/floor/plasteel{ burnt = 1; dir = 8; @@ -7073,7 +7073,7 @@ name = "MO19 Arrivals" }) "jN" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -7097,10 +7097,10 @@ }) "jP" = ( /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes{ +/obj/item/book/manual/barman_recipes{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -7110,7 +7110,7 @@ }) "jQ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -7209,7 +7209,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 @@ -7477,7 +7477,7 @@ "kn" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/glass/rag{ +/obj/item/reagent_containers/glass/rag{ pixel_y = 5 }, /obj/machinery/door/poddoor/shutters{ @@ -7502,8 +7502,8 @@ }) "kp" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -7513,7 +7513,7 @@ }) "kq" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes{ +/obj/item/book/manual/chef_recipes{ pixel_x = 2; pixel_y = 6 }, @@ -7783,7 +7783,7 @@ "kM" = ( /obj/structure/closet/crate/bin, /obj/item/trash/plate, -/obj/item/weapon/reagent_containers/food/snacks/badrecipe, +/obj/item/reagent_containers/food/snacks/badrecipe, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -7821,7 +7821,7 @@ icon_state = "brokengrille" }, /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating{ @@ -7934,7 +7934,7 @@ }) "kX" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -7950,7 +7950,7 @@ "kY" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -8039,7 +8039,7 @@ name = "MO19 Arrivals" }) "lg" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 @@ -8064,7 +8064,7 @@ }) "li" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/asteroid{ @@ -8173,7 +8173,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/machinery/airalarm{ dir = 4; frequency = 1439; @@ -8272,7 +8272,7 @@ desc = "It's a storage unit for kitchen clothes and equipment."; name = "Kitchen Crate" }, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/item/clothing/under/waiter, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; @@ -8377,7 +8377,7 @@ }) "lH" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -8412,7 +8412,7 @@ }) "lK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -8422,7 +8422,7 @@ }) "lL" = ( /obj/structure/table/wood, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/machinery/newscaster{ pixel_x = 30 }, @@ -8509,7 +8509,7 @@ /obj/effect/decal/remains/human{ desc = "They look like human remains. The skeleton is sitting upright with its legs tucked in and hands still holding onto its arms." }, -/obj/item/weapon/gun/ballistic/shotgun/sc_pump, +/obj/item/gun/ballistic/shotgun/sc_pump, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; temperature = 273.15 @@ -8527,7 +8527,7 @@ }) "lW" = ( /obj/structure/table, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/open/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; @@ -8673,7 +8673,7 @@ }) "ml" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/satchel/leather/withwallet, +/obj/item/storage/backpack/satchel/leather/withwallet, /turf/open/floor/plasteel/black, /area/awaycontent/a1{ has_gravity = 1; @@ -8686,9 +8686,9 @@ name = "kitchen Cabinet"; req_access_txt = "201" }, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; @@ -8705,10 +8705,10 @@ name = "meat fridge"; req_access_txt = "201" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; temperature = 273.15 @@ -8724,10 +8724,10 @@ name = "refrigerator"; req_access_txt = "201" }, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/storage/fancy/egg_box, /turf/open/floor/plasteel/showroomfloor{ heat_capacity = 1e+006; temperature = 273.15 @@ -8738,7 +8738,7 @@ }) "mp" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; @@ -8899,15 +8899,15 @@ }) "mE" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 3 }, /turf/open/floor/plasteel/black, @@ -8995,7 +8995,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/welcome, +/obj/item/paper/fluff/awaymissions/moonoutpost19/welcome, /obj/machinery/camera{ c_tag = "Arrivals South"; dir = 8; @@ -9119,8 +9119,8 @@ }) "mV" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/pen, /turf/open/floor/mineral/titanium/blue, /area/awaycontent/a1{ has_gravity = 1; @@ -9172,7 +9172,7 @@ }) "na" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/decal/cleanable/blood, /turf/open/floor/carpet{ heat_capacity = 1e+006 @@ -9299,7 +9299,7 @@ name = "MO19 Arrivals" }) "nl" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -9520,7 +9520,7 @@ }) "nC" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/decal/cleanable/blood/tracks{ @@ -9549,7 +9549,7 @@ icon_state = "brokengrille" }, /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/decal/cleanable/blood/tracks{ desc = "Your instincts say you shouldn't be following these."; dir = 8; @@ -9617,7 +9617,7 @@ }) "nH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "awaydorm3"; name = "Door Bolt Control"; @@ -9639,7 +9639,7 @@ }) "nI" = ( /obj/structure/dresser, -/obj/item/weapon/paper/fluff/awaymissions/moonoutpost19/goodbye_note, +/obj/item/paper/fluff/awaymissions/moonoutpost19/goodbye_note, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -9721,8 +9721,8 @@ name = "MO19 Arrivals" }) "nP" = ( -/obj/item/weapon/pen, -/obj/item/weapon/storage/pill_bottle{ +/obj/item/pen, +/obj/item/storage/pill_bottle{ pixel_y = 6 }, /turf/open/floor/carpet{ @@ -9744,7 +9744,7 @@ }) "nR" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -9881,7 +9881,7 @@ name = "MO19 Arrivals" }) "ob" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ desc = "A plastic potted plant."; layer = 4.1; pixel_y = 3 @@ -9918,7 +9918,7 @@ poweralm = 0 }) "od" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating/asteroid{ @@ -9952,7 +9952,7 @@ poweralm = 0 }) "of" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/mineral/titanium, /area/awaycontent/a3{ always_unpowered = 1; @@ -9965,7 +9965,7 @@ poweralm = 0 }) "og" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/titanium, @@ -9980,7 +9980,7 @@ poweralm = 0 }) "oh" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/mineral/titanium, @@ -10624,7 +10624,7 @@ req_access_txt = "201" }, /obj/item/clothing/suit/toggle/labcoat, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ diff --git a/_maps/RandomZLevels/research.dmm b/_maps/RandomZLevels/research.dmm index 1702e83e3a9..8228dfe16d6 100644 --- a/_maps/RandomZLevels/research.dmm +++ b/_maps/RandomZLevels/research.dmm @@ -101,23 +101,23 @@ /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "av" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/structure/frame/machine, -/obj/item/weapon/circuitboard/machine/smes, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high/empty, +/obj/item/circuitboard/machine/smes, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high/empty, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aw" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/whiteyellow/side, /area/awaymission/research/interior/engineering) "ax" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; layer = 4.1; pixel_y = 3 @@ -135,12 +135,12 @@ /area/awaymission/research/interior/engineering) "az" = ( /obj/effect/gibspawner/human, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aA" = ( /obj/item/stack/sheet/plasteel, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aB" = ( @@ -163,11 +163,11 @@ "aF" = ( /obj/item/stack/rods, /obj/item/stack/sheet/metal, -/obj/item/weapon/stock_parts/cell/high/empty, +/obj/item/stock_parts/cell/high/empty, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aG" = ( -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aH" = ( @@ -192,17 +192,17 @@ /area/awaymission/research/interior/engineering) "aL" = ( /obj/structure/table, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/mineral/plastitanium, /area/awaymission/research/interior/engineering) "aM" = ( -/obj/item/weapon/stock_parts/cell/high/empty, +/obj/item/stock_parts/cell/high/empty, /turf/open/floor/plating, /area/awaymission/research/interior/engineering) "aN" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/item/stack/cable_coil{ @@ -296,7 +296,7 @@ /turf/open/floor/plasteel/whiteyellow, /area/awaymission/research/interior/engineering) "bb" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel{ @@ -344,7 +344,7 @@ /area/awaymission/research/interior/engineering) "bi" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/clothing/gloves/color/yellow, /turf/open/floor/plasteel/whiteyellow/side{ dir = 8 @@ -355,7 +355,7 @@ /turf/open/floor/plating/asteroid/airless, /area/awaymission/research/exterior) "bk" = ( -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /turf/open/floor/plating/asteroid/airless, /area/space) "bl" = ( @@ -387,7 +387,7 @@ }, /area/awaymission/research/interior/engineering) "bo" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/item/stack/cable_coil{ amount = 1 }, @@ -408,7 +408,7 @@ /turf/open/floor/plasteel/whiteyellow, /area/awaymission/research/interior/engineering) "br" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel{ @@ -441,7 +441,7 @@ /area/awaymission/research/interior/engineering) "bw" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/whiteyellow/side{ dir = 8 }, @@ -537,7 +537,7 @@ /turf/open/floor/plasteel/whiteyellow, /area/awaymission/research/interior/engineering) "bK" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/whiteyellow/side{ dir = 9 }, @@ -549,7 +549,7 @@ }, /area/awaymission/research/interior/engineering) "bM" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel/whiteyellow/side{ dir = 1 @@ -807,7 +807,7 @@ /area/awaymission/research/interior/engineering) "ct" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/airalarm{ dir = 4; pixel_x = -32 @@ -896,8 +896,8 @@ icon_state = "1-8" }, /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/gateway) "cG" = ( @@ -908,7 +908,7 @@ /area/awaymission/research/interior/genetics) "cH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/machinery/button/door{ id = "cryopodg2"; name = "panic lockdown button" @@ -1059,7 +1059,7 @@ /area/awaymission/research/interior/secure) "dd" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 @@ -1074,19 +1074,19 @@ /area/awaymission/research/interior/secure) "df" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off."; fields = list("label" = "Buffer1:Kr-$$@##", "UI" = "f8f603857000f930127c4", "SE" = "414401462231053131010241514651403453121613263463440351136366", "UE" = "340008485c321e542aed4df7032ac04d", "name" = "Krystal Symers", "blood_type" = "A+"); name = "dusty genetics data disk"; read_only = 1 }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/dnainjector/xraymut, -/obj/item/weapon/dnainjector/xraymut, +/obj/item/dnainjector/xraymut, +/obj/item/dnainjector/xraymut, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "dg" = ( @@ -1142,14 +1142,14 @@ /area/awaymission/research/interior/security) "dp" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/dnainjector/telemut, -/obj/item/weapon/dnainjector/telemut, -/obj/item/weapon/dnainjector/chavmut, +/obj/item/dnainjector/telemut, +/obj/item/dnainjector/telemut, +/obj/item/dnainjector/chavmut, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "dq" = ( @@ -1169,7 +1169,7 @@ /turf/open/floor/plasteel/darkpurple, /area/awaymission/research/interior/genetics) "dt" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/darkpurple, @@ -1250,7 +1250,7 @@ /area/awaymission/research/interior/security) "dF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/red, /area/awaymission/research/interior/security) "dG" = ( @@ -1288,38 +1288,38 @@ /area/awaymission/research/interior/secure) "dL" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A data disk used to store cloning and genetic records. The name on the label appears to be scratched off with the words 'DO NOT CLONE' hastily written over it."; fields = list("label" = "Buffer1:George Melons", "UI" = "3c300f11b5421ca7014d8", "SE" = "430431205660551642142504334461413202111310233445620533134255", "UE" = "6893e6a0b0076a41897776b10cc2b324", "name" = "George Melons", "blood_type" = "B+"); name = "old genetics data disk" }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/device/firing_pin/dna, -/obj/item/weapon/dnainjector/dwarf, -/obj/item/weapon/dnainjector/dwarf, +/obj/item/dnainjector/dwarf, +/obj/item/dnainjector/dwarf, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "dM" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/dnainjector/chameleonmut, +/obj/item/dnainjector/chameleonmut, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "dN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -1368,8 +1368,8 @@ /area/awaymission/research/interior/security) "dU" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/wt550, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/ammo_box/magazine/wt550m9, /obj/item/ammo_box/magazine/wt550m9, /turf/open/floor/plasteel/red, @@ -1494,8 +1494,8 @@ /area/awaymission/research/interior/security) "ep" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911, -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911, +/obj/item/gun/ballistic/automatic/pistol/m1911, +/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/item/ammo_box/magazine/m45, /obj/item/ammo_box/magazine/m45, /turf/open/floor/plasteel/red, @@ -1691,7 +1691,7 @@ /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "eU" = ( -/obj/item/weapon/paper/crumpled/awaymissions/research/sensitive_info, +/obj/item/paper/crumpled/awaymissions/research/sensitive_info, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "eV" = ( @@ -1746,11 +1746,11 @@ /area/awaymission/research/interior/cryo) "fd" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -7; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -7; pixel_y = 1 }, @@ -1758,11 +1758,11 @@ /area/awaymission/research/interior/cryo) "fe" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -2057,13 +2057,13 @@ /area/awaymission/research/interior/security) "ga" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/whitered, /area/awaymission/research/interior/security) "gb" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/whitered, /area/awaymission/research/interior/security) "gc" = ( @@ -2400,8 +2400,8 @@ icon_state = "4-8" }, /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/whitered, /area/awaymission/research/interior/security) "gO" = ( @@ -2431,11 +2431,11 @@ }, /area/awaymission/research/interior/cryo) "gR" = ( -/obj/item/weapon/melee/classic_baton/telescopic, +/obj/item/melee/classic_baton/telescopic, /turf/open/floor/plasteel/whitepurple, /area/awaymission/research/interior/cryo) "gS" = ( -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/effect/decal/cleanable/blood/drip, /turf/open/floor/plasteel/whitepurple/side{ dir = 9 @@ -2515,8 +2515,8 @@ /area/awaymission/research/interior/security) "hf" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /turf/open/floor/plasteel/whitered, /area/awaymission/research/interior/security) "hg" = ( @@ -2791,12 +2791,12 @@ /area/awaymission/research/interior/security) "hS" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines. This one has the initials 'C.P' marked on the front. "; name = "encrypted genetic data disk"; read_only = 1 @@ -2809,26 +2809,26 @@ /area/awaymission/research/interior/secure) "hT" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/device/firing_pin/dna, -/obj/item/weapon/dnainjector/hulkmut, +/obj/item/dnainjector/hulkmut, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "hU" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel/purple, /area/awaymission/research/interior/genetics) "hV" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -2910,7 +2910,7 @@ /turf/open/floor/plasteel/red, /area/awaymission/research/interior/security) "ii" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ desc = "A potted plant, it doesn't look very healthy..."; name = "dead potted plant" }, @@ -2946,15 +2946,15 @@ /area/awaymission/research/interior/security) "il" = ( /obj/structure/closet/crate, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ desc = "A specialized data disk for holding critical genetic backup data. Without proper passwords, information will turn up blank on most DNA machines."; name = "encrypted genetic data disk"; read_only = 1 }, /obj/item/device/firing_pin/dna/dredd, /obj/item/device/firing_pin/dna/dredd, -/obj/item/weapon/dnainjector/lasereyesmut, -/obj/item/weapon/dnainjector/lasereyesmut, +/obj/item/dnainjector/lasereyesmut, +/obj/item/dnainjector/lasereyesmut, /turf/open/floor/plasteel/black, /area/awaymission/research/interior/secure) "im" = ( @@ -3142,7 +3142,7 @@ /area/awaymission/research/interior/genetics) "iH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/machinery/button/door{ id = "cryopodg1"; name = "panic lockdown button" @@ -3273,7 +3273,7 @@ /area/awaymission/research/interior/medbay) "jd" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/whiteblue/side, /area/awaymission/research/interior/medbay) "je" = ( @@ -3311,7 +3311,7 @@ /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "jm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -3507,7 +3507,7 @@ /area/awaymission/research/interior/medbay) "jS" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, @@ -3523,7 +3523,7 @@ /area/awaymission/research/interior/dorm) "jU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/effect/landmark/awaystart, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) @@ -3538,7 +3538,7 @@ /area/awaymission/research/interior/dorm) "jW" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "jX" = ( @@ -3552,7 +3552,7 @@ /area/awaymission/research/interior/dorm) "jY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "jZ" = ( @@ -3637,14 +3637,14 @@ /area/awaymission/research/interior/medbay) "km" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, /area/awaymission/research/interior/medbay) "kn" = ( /obj/structure/table, -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -3695,7 +3695,7 @@ /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "kt" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911, +/obj/item/gun/ballistic/automatic/pistol/m1911, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) "ku" = ( @@ -3716,7 +3716,7 @@ /area/awaymission/research/interior/medbay) "kx" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/whiteblue/side{ @@ -3748,7 +3748,7 @@ /turf/open/floor/plating, /area/awaymission/research/interior/medbay) "kC" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/yellowsiding{ @@ -3857,13 +3857,13 @@ /area/awaymission/research/interior/dorm) "kS" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) "kT" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel, /area/awaymission/research/interior/dorm) "kU" = ( @@ -3884,7 +3884,7 @@ /area/awaymission/research/interior/medbay) "kX" = ( /obj/item/stack/rods, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/whiteblue/side, @@ -3898,7 +3898,7 @@ /turf/open/floor/plasteel/whiteblue/side, /area/awaymission/research/interior/medbay) "la" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -3921,19 +3921,19 @@ /area/awaymission/research/interior/dorm) "ld" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, /area/awaymission/research/interior/medbay) "le" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -3947,7 +3947,7 @@ "lg" = ( /obj/effect/decal/cleanable/blood/drip, /obj/item/ammo_casing/c45, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plasteel/whiteblue, @@ -3976,7 +3976,7 @@ /area/awaymission/research/interior/medbay) "ll" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light{ dir = 4 }, @@ -4018,8 +4018,8 @@ /area/awaymission/research/interior/medbay) "ls" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -4032,7 +4032,7 @@ "lu" = ( /obj/item/ammo_casing/c45, /obj/item/ammo_casing/c45, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating, @@ -4054,13 +4054,13 @@ /area/awaymission/research/interior/medbay) "lx" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, /area/awaymission/research/interior/medbay) "ly" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -4095,8 +4095,8 @@ /area/awaymission/research/interior/medbay) "lE" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, @@ -4181,7 +4181,7 @@ /area/awaymission/research/interior/dorm) "lP" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "lQ" = ( @@ -4195,7 +4195,7 @@ /area/awaymission/research/interior/dorm) "lR" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) "lS" = ( @@ -4209,7 +4209,7 @@ /area/awaymission/research/interior/dorm) "lT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/patriot, +/obj/item/bedsheet/patriot, /obj/effect/landmark/awaystart, /turf/open/floor/wood, /area/awaymission/research/interior/dorm) @@ -4278,7 +4278,7 @@ /area/awaymission/research/interior/escapepods) "mc" = ( /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/asteroid, /area/awaymission/research/exterior) "md" = ( @@ -4347,7 +4347,7 @@ /area/awaymission/research/exterior) "mr" = ( /obj/item/stack/rods, -/obj/item/weapon/shard, +/obj/item/shard, /obj/effect/mob_spawn/human/doctor{ brute_damage = 200 }, @@ -4470,7 +4470,7 @@ }, /area/awaymission/research/interior/escapepods) "mJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 4.1 }, /turf/open/floor/plasteel/whitegreen/side{ @@ -4505,7 +4505,7 @@ /turf/open/floor/grass, /area/awaymission/research/interior/escapepods) "mN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; layer = 4.1 }, @@ -4597,7 +4597,7 @@ /area/space) "nb" = ( /obj/structure/table/wood, -/obj/item/weapon/spellbook/oneuse/random, +/obj/item/spellbook/oneuse/random, /turf/open/floor/mineral/plasma, /area/space) "nc" = ( diff --git a/_maps/RandomZLevels/snowdin.dmm b/_maps/RandomZLevels/snowdin.dmm index 9eb3b2e55b7..b8fb38ca510 100644 --- a/_maps/RandomZLevels/snowdin.dmm +++ b/_maps/RandomZLevels/snowdin.dmm @@ -26,7 +26,7 @@ "ag" = ( /obj/effect/decal/cleanable/oil, /obj/structure/table, -/obj/item/weapon/tank/internals/plasma{ +/obj/item/tank/internals/plasma{ desc = "An emptied plasma tank, the oil on the nozzle seems to implied it was used for more than plasma storage."; name = "dusty plasma tank" }, @@ -72,7 +72,7 @@ /area/awaymission/snowdin/post) "an" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/light/small{ dir = 8 }, @@ -95,7 +95,7 @@ "aq" = ( /obj/structure/table/reinforced, /obj/machinery/door/window/westright, -/obj/item/weapon/paper/crumpled/ruins/snowdin/keys, +/obj/item/paper/crumpled/ruins/snowdin/keys, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -123,13 +123,13 @@ /area/awaymission/snowdin/base) "at" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/secnotice, +/obj/item/paper/fluff/awaymissions/snowdin/secnotice, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/base) "au" = ( -/obj/item/weapon/gun/ballistic/shotgun/boltaction, +/obj/item/gun/ballistic/shotgun/boltaction, /obj/item/ammo_box/a762, /obj/item/ammo_box/a762, /obj/structure/closet/secure_closet{ @@ -138,16 +138,16 @@ name = "security officer's locker"; req_access_txt = "201" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, -/obj/item/weapon/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/base) "av" = ( /obj/effect/decal/cleanable/oil, -/obj/item/weapon/tank/internals/plasma{ +/obj/item/tank/internals/plasma{ desc = "An emptied plasma tank, the oil on the nozzle seems to implied it was used for more than plasma storage."; name = "dusty plasma tank" }, @@ -174,8 +174,8 @@ /area/awaymission/snowdin/base) "ay" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/item/key, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -322,7 +322,7 @@ /area/awaymission/snowdin/base) "aR" = ( /obj/structure/closet/crate, -/obj/item/weapon/survivalcapsule, +/obj/item/survivalcapsule, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, /obj/item/clothing/suit/hooded/wintercoat, @@ -336,9 +336,9 @@ /area/awaymission/snowdin/base) "aS" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/pill_bottle/stimulant, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire, +/obj/item/storage/pill_bottle/stimulant, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -367,9 +367,9 @@ /area/awaymission/snowdin) "aY" = ( /obj/structure/guncase/shotgun, -/obj/item/weapon/gun/ballistic/shotgun/automatic, -/obj/item/weapon/gun/ballistic/shotgun/automatic, -/obj/item/weapon/gun/ballistic/shotgun/automatic, +/obj/item/gun/ballistic/shotgun/automatic, +/obj/item/gun/ballistic/shotgun/automatic, +/obj/item/gun/ballistic/shotgun/automatic, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -423,8 +423,8 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/soap/nanotrasen, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/soap/nanotrasen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -463,7 +463,7 @@ /area/awaymission/snowdin/base) "bl" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -509,18 +509,18 @@ /area/awaymission/snowdin/base) "bq" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod, -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -538,16 +538,16 @@ /area/awaymission/snowdin/base) "bs" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/base) "bt" = ( /obj/structure/table, -/obj/item/weapon/shovel, -/obj/item/weapon/paper/crumpled/ruins/snowdin/shovel, +/obj/item/shovel, +/obj/item/paper/crumpled/ruins/snowdin/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -616,10 +616,10 @@ /area/awaymission/snowdin/base) "bA" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -627,8 +627,8 @@ /area/awaymission/snowdin/base) "bB" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -659,7 +659,7 @@ name = "Central command action figure"; toysay = "Fire the BSA cannons!" }, -/obj/item/weapon/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, /obj/item/key, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -762,7 +762,7 @@ /area/awaymission/snowdin/base) "bP" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/awaystart, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -824,8 +824,8 @@ /area/awaymission/snowdin/base) "bY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -908,7 +908,7 @@ }, /area/awaymission/snowdin/base) "ck" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -975,21 +975,21 @@ /area/awaymission/snowdin/base) "cu" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/base) "cv" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/crumpled/ruins/snowdin/snowdingatewaynotice, +/obj/item/paper/crumpled/ruins/snowdin/snowdingatewaynotice, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/base) "cw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/gibspawner/human, /turf/open/floor/carpet{ @@ -1067,7 +1067,7 @@ dir = 8 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/log, +/obj/item/paper/fluff/awaymissions/snowdin/log, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1139,7 +1139,7 @@ }, /area/awaymission/snowdin/igloo) "cT" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating{ temperature = 220 }, @@ -1219,7 +1219,7 @@ /area/awaymission/snowdin/post) "dh" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 140 @@ -1242,7 +1242,7 @@ /area/awaymission/snowdin/post) "dk" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 140 @@ -1290,7 +1290,7 @@ /area/awaymission/snowdin/dungeon1) "dr" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; @@ -1311,7 +1311,7 @@ }, /area/awaymission/snowdin/post) "dt" = ( -/obj/item/weapon/paper/crumpled/ruins/snowdin/lootstructures, +/obj/item/paper/crumpled/ruins/snowdin/lootstructures, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -1433,8 +1433,8 @@ /obj/item/clothing/shoes/winterboots, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/shovel, -/obj/item/weapon/switchblade, +/obj/item/shovel, +/obj/item/switchblade, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1555,7 +1555,7 @@ /area/awaymission/snowdin/post) "dZ" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/ruins/snowdin/syndielava, +/obj/item/paper/crumpled/ruins/snowdin/syndielava, /obj/machinery/light/small{ active_power_usage = 0; dir = 4; @@ -1819,12 +1819,12 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/hemostat, -/obj/item/weapon/scalpel{ +/obj/item/surgicaldrill, +/obj/item/hemostat, +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, /turf/open/floor/plasteel/whiteblue{ @@ -1933,9 +1933,9 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/weapon/implanter/storage, +/obj/item/implanter/storage, /obj/item/clothing/shoes/jackboots, -/obj/item/weapon/switchblade, +/obj/item/switchblade, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1976,7 +1976,7 @@ /obj/item/clothing/shoes/winterboots, /obj/item/clothing/suit/hooded/wintercoat, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -1994,7 +1994,7 @@ }, /area/awaymission/snowdin/post) "fs" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2075,15 +2075,15 @@ /turf/open/floor/plating/snowed/colder, /area/awaymission/snowdin/post) "fG" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "fH" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -2098,7 +2098,7 @@ }, /area/awaymission/snowdin/post) "fJ" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "fK" = ( @@ -2158,7 +2158,7 @@ }, /area/awaymission/snowdin/post) "fS" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 140; @@ -2180,7 +2180,7 @@ /area/awaymission/snowdin/post) "fV" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /obj/item/key, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow; @@ -2220,7 +2220,7 @@ /area/awaymission/snowdin/post) "ga" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 140 @@ -2265,7 +2265,7 @@ /turf/open/floor/plating/ice, /area/awaymission/snowdin/cave) "gg" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "gh" = ( @@ -2354,9 +2354,9 @@ /area/awaymission/snowdin/post) "gt" = ( /obj/structure/frame/machine, -/obj/item/weapon/circuitboard/machine/smes, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/circuitboard/machine/smes, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/light/small{ dir = 1 }, @@ -2365,21 +2365,21 @@ }, /area/awaymission/snowdin/post) "gu" = ( -/obj/item/weapon/stock_parts/cell/high/empty, +/obj/item/stock_parts/cell/high/empty, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/post) "gv" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/post) "gw" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2407,10 +2407,10 @@ /area/awaymission/snowdin/post) "gA" = ( /obj/structure/closet/secure_closet/contraband/armory, -/obj/item/weapon/gun/ballistic/automatic/speargun, -/obj/item/weapon/twohanded/spear, -/obj/item/weapon/twohanded/spear, -/obj/item/weapon/twohanded/spear, +/obj/item/gun/ballistic/automatic/speargun, +/obj/item/twohanded/spear, +/obj/item/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2436,13 +2436,13 @@ /area/awaymission/snowdin/post) "gD" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/post) "gE" = ( -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 180 @@ -2450,7 +2450,7 @@ /area/awaymission/snowdin/post) "gF" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow; temperature = 180 @@ -2550,7 +2550,7 @@ /area/awaymission/snowdin/post) "gS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2671,8 +2671,8 @@ /area/awaymission/snowdin/post) "hi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2700,7 +2700,7 @@ }, /area/awaymission/snowdin/post) "hm" = ( -/obj/item/weapon/gun/ballistic/shotgun/boltaction, +/obj/item/gun/ballistic/shotgun/boltaction, /obj/item/ammo_box/a762, /obj/item/ammo_box/a762, /obj/structure/closet/secure_closet{ @@ -2709,7 +2709,7 @@ name = "security officer's locker"; req_access_txt = "201" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -2717,7 +2717,7 @@ /area/awaymission/snowdin/post) "hn" = ( /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/secnotice, +/obj/item/paper/fluff/awaymissions/snowdin/secnotice, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2792,7 +2792,7 @@ /area/awaymission/snowdin/cave) "hz" = ( /obj/effect/decal/cleanable/blood/gibs/old, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin/cave) "hA" = ( @@ -2816,11 +2816,11 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin/cave) "hF" = ( -/obj/item/weapon/twohanded/fireaxe, +/obj/item/twohanded/fireaxe, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin/cave) "hG" = ( -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin/cave) "hH" = ( @@ -2845,7 +2845,7 @@ /area/awaymission/snowdin/post) "hK" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/item/key, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -2853,8 +2853,8 @@ /area/awaymission/snowdin/post) "hL" = ( /obj/structure/table, -/obj/item/weapon/shovel, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/shovel, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2916,7 +2916,7 @@ /area/awaymission/snowdin/sekret) "hW" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -2949,8 +2949,8 @@ /area/awaymission/snowdin/sekret) "ib" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -2972,14 +2972,14 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "if" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3015,7 +3015,7 @@ /area/awaymission/snowdin/dungeon1) "ik" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/machinery/light/small{ dir = 4 }, @@ -3059,7 +3059,7 @@ }, /area/awaymission/snowdin/sekret) "ir" = ( -/obj/item/weapon/gun/ballistic/shotgun/boltaction, +/obj/item/gun/ballistic/shotgun/boltaction, /obj/item/ammo_box/a762, /obj/item/ammo_box/a762, /obj/structure/closet/secure_closet{ @@ -3068,9 +3068,9 @@ name = "security officer's locker"; req_access_txt = "201" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, -/obj/item/weapon/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3118,8 +3118,8 @@ /area/awaymission/snowdin/sekret) "iy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3132,32 +3132,32 @@ /area/awaymission/snowdin/sekret) "iA" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "iB" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "iC" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "iD" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3315,7 +3315,7 @@ /turf/open/floor/plating/snowed, /area/awaymission/snowdin) "ja" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -3484,7 +3484,7 @@ }, /area/awaymission/snowdin) "jy" = ( -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -3519,7 +3519,7 @@ }, /area/awaymission/snowdin) "jC" = ( -/obj/item/weapon/tank/internals/plasma{ +/obj/item/tank/internals/plasma{ desc = "An emptied plasma tank, the oil on the nozzle seems to implied it was used for more than plasma storage."; name = "dusty plasma tank" }, @@ -3633,12 +3633,12 @@ /area/awaymission/snowdin/sekret) "jR" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/cmo{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3666,14 +3666,14 @@ /area/awaymission/snowdin) "jV" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/ruins/snowdin/misc1, +/obj/item/paper/crumpled/ruins/snowdin/misc1, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin) "jW" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3836,8 +3836,8 @@ /area/awaymission/snowdin/sekret) "kr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small{ dir = 8 }, @@ -3861,9 +3861,9 @@ /area/awaymission/snowdin/sekret) "ku" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/speargun, -/obj/item/weapon/twohanded/spear, -/obj/item/weapon/twohanded/spear, +/obj/item/gun/ballistic/automatic/speargun, +/obj/item/twohanded/spear, +/obj/item/twohanded/spear, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3884,12 +3884,12 @@ /area/awaymission/snowdin/sekret) "kx" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/l6_saw/unrestricted, +/obj/item/gun/ballistic/automatic/l6_saw/unrestricted, /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/saw_usage, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/paper/fluff/awaymissions/snowdin/saw_usage, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3904,7 +3904,7 @@ }, /area/awaymission/snowdin/sekret) "kz" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -3922,14 +3922,14 @@ }, /area/awaymission/snowdin) "kB" = ( -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = 1 }, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "kC" = ( -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/decal/cleanable/vomit, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -3943,7 +3943,7 @@ /area/awaymission/snowdin/sekret) "kE" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/syndienotice, +/obj/item/paper/fluff/awaymissions/snowdin/syndienotice, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -3962,7 +3962,7 @@ }, /area/awaymission/snowdin/sekret) "kH" = ( -/obj/item/weapon/gun/ballistic/shotgun/boltaction, +/obj/item/gun/ballistic/shotgun/boltaction, /obj/item/ammo_box/a762, /obj/item/ammo_box/a762, /obj/structure/closet/secure_closet{ @@ -3971,17 +3971,17 @@ name = "security officer's locker"; req_access_txt = "201" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, -/obj/item/weapon/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, /turf/open/floor/plasteel/darkred{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "kI" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/c20r/unrestricted, -/obj/item/weapon/gun/ballistic/automatic/c20r/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/unrestricted, +/obj/item/gun/ballistic/automatic/c20r/unrestricted, /obj/machinery/light/small{ dir = 8 }, @@ -4007,7 +4007,7 @@ /area/awaymission/snowdin/sekret) "kL" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/revolver, +/obj/item/gun/ballistic/revolver, /obj/machinery/light/small{ dir = 4 }, @@ -4056,8 +4056,8 @@ /area/awaymission/snowdin/sekret) "kS" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/mini_uzi, -/obj/item/weapon/gun/ballistic/automatic/mini_uzi, +/obj/item/gun/ballistic/automatic/mini_uzi, +/obj/item/gun/ballistic/automatic/mini_uzi, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -4067,8 +4067,8 @@ /area/awaymission/snowdin/sekret) "kT" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted, -/obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog/unrestricted, +/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted, +/obj/item/gun/ballistic/automatic/shotgun/bulldog/unrestricted, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -4087,7 +4087,7 @@ }, /area/awaymission/snowdin) "kW" = ( -/obj/item/weapon/storage/box/zipties{ +/obj/item/storage/box/zipties{ pixel_x = 1; pixel_y = 2 }, @@ -4099,7 +4099,7 @@ /obj/structure/chair{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/food/drinks/ale, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4154,7 +4154,7 @@ /area/awaymission/snowdin/sekret) "lf" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/awaystart, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow @@ -4184,7 +4184,7 @@ }, /area/awaymission/snowdin) "lj" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4202,8 +4202,8 @@ "lm" = ( /obj/structure/table/wood, /obj/item/trash/candle, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4252,13 +4252,13 @@ /area/awaymission/snowdin) "lt" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin) "lu" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/plastitanium/brig{ @@ -4285,14 +4285,14 @@ /area/awaymission/snowdin) "lx" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/nuclear, +/obj/item/book/manual/nuclear, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "ly" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4361,7 +4361,7 @@ /area/awaymission/snowdin) "lH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/light/built{ dir = 4 }, @@ -4417,23 +4417,23 @@ }, /area/awaymission/snowdin) "lN" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin) "lO" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin/sekret) "lP" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/purple{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4463,7 +4463,7 @@ subspace_transmission = 1; syndie = 1 }, -/obj/item/weapon/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/food/drinks/ale, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4518,7 +4518,7 @@ /area/awaymission/snowdin/sekret) "ma" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/automatic/c20r/toy, +/obj/item/gun/ballistic/automatic/c20r/toy, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4532,7 +4532,7 @@ "mc" = ( /obj/machinery/light, /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4579,7 +4579,7 @@ /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "mj" = ( -/obj/item/weapon/reagent_containers/syringe/charcoal{ +/obj/item/reagent_containers/syringe/charcoal{ pixel_y = 4 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -4598,7 +4598,7 @@ name = "Infirmary"; req_access_txt = "150" }, -/obj/item/weapon/reagent_containers/syringe/charcoal{ +/obj/item/reagent_containers/syringe/charcoal{ pixel_y = 4 }, /turf/open/floor/mineral/plastitanium/brig{ @@ -4615,7 +4615,7 @@ }, /area/awaymission/snowdin) "mn" = ( -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4690,7 +4690,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/firstaid/tactical, +/obj/item/storage/firstaid/tactical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -4698,7 +4698,7 @@ /area/awaymission/snowdin/sekret) "mw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/tactical, +/obj/item/storage/firstaid/tactical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -4706,7 +4706,7 @@ /area/awaymission/snowdin/sekret) "mx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/backpack/duffelbag/syndie/ammo/smg, +/obj/item/storage/backpack/duffelbag/syndie/ammo/smg, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -4762,13 +4762,13 @@ }, /area/awaymission/snowdin) "mD" = ( -/obj/item/weapon/storage/toolbox/syndicate, +/obj/item/storage/toolbox/syndicate, /turf/open/floor/mineral/plastitanium/brig{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin) "mE" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /turf/open/floor/plating{ @@ -4831,7 +4831,7 @@ }, /area/awaymission/snowdin) "mM" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating{ @@ -4862,7 +4862,7 @@ }, /area/awaymission/snowdin) "mP" = ( -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -4893,7 +4893,7 @@ }, /area/awaymission/snowdin/sekret) "mT" = ( -/obj/item/weapon/gun/syringe{ +/obj/item/gun/syringe{ pixel_x = 1; pixel_y = 2 }, @@ -4963,15 +4963,15 @@ /area/awaymission/snowdin) "nc" = ( /obj/structure/table, -/obj/item/weapon/paper/crumpled/ruins/snowdin/shovel, +/obj/item/paper/crumpled/ruins/snowdin/shovel, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, /area/awaymission/snowdin) "nd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -4993,8 +4993,8 @@ /area/awaymission/snowdin) "ng" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -5010,7 +5010,7 @@ /area/awaymission/snowdin) "ni" = ( /obj/structure/flora/grass/green, -/obj/item/weapon/a_gift, +/obj/item/a_gift, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "nj" = ( @@ -5051,7 +5051,7 @@ }, /area/awaymission/snowdin) "nn" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -5060,8 +5060,8 @@ /area/awaymission/snowdin) "no" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; @@ -5133,7 +5133,7 @@ /area/awaymission/snowdin/sekret) "nx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -5141,9 +5141,9 @@ /area/awaymission/snowdin/sekret) "ny" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/lethalshot, -/obj/item/weapon/storage/box/lethalshot, -/obj/item/weapon/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, +/obj/item/storage/box/lethalshot, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -5151,7 +5151,7 @@ /area/awaymission/snowdin/sekret) "nz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/snow; wet = 0 @@ -5168,7 +5168,7 @@ dir = 8 }, /obj/structure/filingcabinet, -/obj/item/weapon/paper/fluff/awaymissions/snowdin/log2, +/obj/item/paper/fluff/awaymissions/snowdin/log2, /turf/open/floor/plasteel/darkbrown{ baseturf = /turf/open/floor/plating/asteroid/snow }, @@ -5235,7 +5235,7 @@ "nK" = ( /obj/structure/flora/grass/green, /obj/structure/flora/tree/pine/xmas, -/obj/item/weapon/a_gift, +/obj/item/a_gift, /turf/open/floor/plating/asteroid/snow, /area/awaymission/snowdin) "nL" = ( @@ -5260,7 +5260,7 @@ /area/awaymission/snowdin) "nO" = ( /obj/structure/closet/crate, -/obj/item/weapon/survivalcapsule, +/obj/item/survivalcapsule, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/snow; icon = 'icons/turf/snow.dmi'; diff --git a/_maps/RandomZLevels/spacebattle.dmm b/_maps/RandomZLevels/spacebattle.dmm index f5fdd3d4965..ae49190ce32 100644 --- a/_maps/RandomZLevels/spacebattle.dmm +++ b/_maps/RandomZLevels/spacebattle.dmm @@ -73,7 +73,7 @@ /area/awaymission/spacebattle/syndicate2) "ap" = ( /mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/weapon/gun/ballistic/automatic/c20r,/obj/item/weapon/shield/energy) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) @@ -83,7 +83,7 @@ /area/awaymission/spacebattle/syndicate2) "ar" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "as" = ( @@ -93,7 +93,7 @@ /area/awaymission/spacebattle/syndicate2) "at" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "au" = ( @@ -134,7 +134,7 @@ /area/awaymission/spacebattle/syndicate3) "aA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate2) "aB" = ( @@ -294,7 +294,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate2) @@ -343,7 +343,7 @@ /area/awaymission/spacebattle/syndicate2) "bl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) "bm" = ( @@ -352,17 +352,17 @@ /area/awaymission/spacebattle/syndicate1) "bn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "bo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/spawnergrenade/manhacks, +/obj/item/grenade/spawnergrenade/manhacks, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "bp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "bq" = ( @@ -384,7 +384,7 @@ /area/awaymission/spacebattle/syndicate3) "bt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/melee/transforming/energy/sword/saber/red, +/obj/item/melee/transforming/energy/sword/saber/red, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) "bu" = ( @@ -414,7 +414,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate3) @@ -461,7 +461,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating, /area/awaymission/spacebattle/syndicate1) @@ -725,7 +725,7 @@ /area/awaymission/spacebattle/cruiser) "cA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "cB" = ( @@ -734,28 +734,28 @@ /area/awaymission/spacebattle/cruiser) "cC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "cD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "cE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "cF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, @@ -834,14 +834,14 @@ /area/awaymission/spacebattle/cruiser) "cU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/fries, +/obj/item/reagent_containers/food/snacks/fries, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "cV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/soup/stew, +/obj/item/reagent_containers/food/snacks/soup/stew, /turf/open/floor/plasteel/cafeteria{ dir = 2 }, @@ -877,7 +877,7 @@ /area/awaymission/spacebattle/cruiser) "db" = ( /mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/weapon/gun/ballistic/automatic/c20r,/obj/item/weapon/shield/energy) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate3) @@ -1130,7 +1130,7 @@ /area/awaymission/spacebattle/cruiser) "dR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) "dS" = ( @@ -1184,7 +1184,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) @@ -1344,7 +1344,7 @@ mob_name = "Davis Hume"; name = "Davis Hume" }, -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "ez" = ( @@ -1353,7 +1353,7 @@ /area/awaymission/spacebattle/cruiser) "eA" = ( /mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/weapon/gun/ballistic/automatic/c20r,/obj/item/weapon/shield/energy) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) }, /turf/open/floor/mineral/plastitanium, /area/awaymission/spacebattle/syndicate1) @@ -1429,7 +1429,7 @@ }, /area/awaymission/spacebattle/cruiser) "eN" = ( -/obj/item/weapon/shield/energy, +/obj/item/shield/energy, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "eO" = ( @@ -1469,17 +1469,17 @@ /area/awaymission/spacebattle/cruiser) "eU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) "eV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/bar, /area/awaymission/spacebattle/cruiser) "eW" = ( /obj/effect/mob_spawn/human/syndicatesoldier, -/obj/item/weapon/melee/transforming/energy/sword/saber/red, +/obj/item/melee/transforming/energy/sword/saber/red, /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -1488,7 +1488,7 @@ mob_name = "Kurt Kliest"; name = "Kurt Kliest" }, -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/ammo_casing/shotgun, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -1540,7 +1540,7 @@ /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "fg" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "fh" = ( @@ -1580,9 +1580,9 @@ /area/awaymission/spacebattle/cruiser) "fn" = ( /obj/structure/closet/crate, -/obj/item/weapon/light/tube, -/obj/item/weapon/light/tube, -/obj/item/weapon/light/tube, +/obj/item/light/tube, +/obj/item/light/tube, +/obj/item/light/tube, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "fo" = ( @@ -1592,7 +1592,7 @@ /area/awaymission/spacebattle/cruiser) "fp" = ( /obj/effect/mob_spawn/human/syndicatesoldier, -/obj/item/weapon/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_casing/c10mm, /obj/item/ammo_casing/c10mm, /obj/effect/decal/cleanable/blood, @@ -1609,7 +1609,7 @@ /area/awaymission/spacebattle/cruiser) "fr" = ( /obj/effect/mob_spawn/human/nanotrasensoldier, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "fs" = ( @@ -1621,7 +1621,7 @@ "ft" = ( /obj/item/ammo_casing/a357, /obj/item/ammo_casing/a357, -/obj/item/weapon/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /obj/effect/mob_spawn/human/commander{ mob_name = "Aaron Bowden"; name = "Aaron Bowden" @@ -1744,7 +1744,7 @@ /area/awaymission/spacebattle/cruiser) "fN" = ( /obj/effect/mob_spawn/human/syndicatesoldier, -/obj/item/weapon/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /obj/item/ammo_casing/c10mm, /obj/item/ammo_casing/c10mm, /obj/effect/decal/cleanable/blood, @@ -1836,7 +1836,7 @@ /area/awaymission/spacebattle/cruiser) "gc" = ( /obj/structure/closet/crate, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "gd" = ( @@ -1922,8 +1922,8 @@ /area/awaymission/spacebattle/cruiser) "gq" = ( /obj/structure/closet/crate, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade, +/obj/item/lipstick/black, +/obj/item/lipstick/jade, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "gr" = ( @@ -1943,29 +1943,29 @@ /area/awaymission/spacebattle/cruiser) "gt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel, -/obj/item/weapon/circular_saw, +/obj/item/scalpel, +/obj/item/circular_saw, /turf/open/floor/plasteel/white/side{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "gu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/white/side{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "gv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/plasteel/white/side{ dir = 2 }, /area/awaymission/spacebattle/cruiser) "gw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/plasteel/white/side{ dir = 2 }, @@ -1978,7 +1978,7 @@ /turf/open/floor/wood, /area/awaymission/spacebattle/cruiser) "gz" = ( -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/gun/ballistic/shotgun/automatic/combat, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "gA" = ( @@ -1996,7 +1996,7 @@ /area/awaymission/spacebattle/syndicate4) "gC" = ( /obj/structure/closet/crate/secure/weapon, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "gD" = ( @@ -2063,7 +2063,7 @@ /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/plating/airless, /area/awaymission/spacebattle/syndicate7) @@ -2086,11 +2086,11 @@ /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "gT" = ( -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, -/obj/item/weapon/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, +/obj/item/ore/bananium, /obj/structure/closet/crate, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) @@ -2154,18 +2154,18 @@ /turf/open/space, /area/awaymission/spacebattle/syndicate4) "he" = ( -/obj/item/weapon/pickaxe, -/obj/item/weapon/gun/energy/plasmacutter, +/obj/item/pickaxe, +/obj/item/gun/energy/plasmacutter, /obj/structure/closet/crate, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "hf" = ( -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "hg" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/awaymission/spacebattle/cruiser) "hh" = ( @@ -2223,7 +2223,7 @@ /area/awaymission/spacebattle/cruiser) "hp" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "hq" = ( @@ -2269,7 +2269,7 @@ /area/awaymission/spacebattle/cruiser) "hx" = ( /obj/structure/closet/crate, -/obj/item/weapon/paint/anycolor, +/obj/item/paint/anycolor, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "hy" = ( @@ -2278,7 +2278,7 @@ /area/awaymission/spacebattle/cruiser) "hz" = ( /obj/structure/closet/crate/medical, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "hA" = ( @@ -2296,7 +2296,7 @@ /area/awaymission/spacebattle/cruiser) "hD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "hE" = ( @@ -2329,7 +2329,7 @@ /area/awaymission/spacebattle/cruiser) "hJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/open/floor/wood, /area/awaymission/spacebattle/cruiser) "hK" = ( @@ -2376,7 +2376,7 @@ /area/awaymission/spacebattle/cruiser) "hR" = ( /mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/weapon/gun/ballistic/automatic/c20r,/obj/item/weapon/shield/energy) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) }, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -2400,7 +2400,7 @@ icon_state = "shower"; dir = 4 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer, /area/awaymission/spacebattle/cruiser) "hW" = ( @@ -2419,7 +2419,7 @@ /area/awaymission/spacebattle/cruiser) "hZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "ia" = ( @@ -2437,12 +2437,12 @@ }, /area/awaymission/spacebattle/cruiser) "id" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "ie" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) "if" = ( @@ -2457,7 +2457,7 @@ icon_state = "shower"; dir = 8 }, -/obj/item/weapon/soap, +/obj/item/soap, /turf/open/floor/plasteel/freezer, /area/awaymission/spacebattle/cruiser) "ih" = ( @@ -2465,8 +2465,8 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "ii" = ( @@ -2535,7 +2535,7 @@ mob_name = "Cyrion"; name = "Cyrion" }, -/obj/item/weapon/flamethrower/full, +/obj/item/flamethrower/full, /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -2545,7 +2545,7 @@ /area/awaymission/spacebattle/cruiser) "iu" = ( /obj/effect/mob_spawn/human/syndicatesoldier, -/obj/item/weapon/gun/ballistic/automatic/c20r, +/obj/item/gun/ballistic/automatic/c20r, /turf/open/floor/plasteel{ icon_state = "damaged2" }, @@ -2786,7 +2786,7 @@ /obj/structure/closet/crate{ name = "Gold Crate" }, -/obj/item/weapon/gun/medbeam/mech, +/obj/item/gun/medbeam/mech, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) "jr" = ( @@ -2798,18 +2798,18 @@ /area/awaymission/spacebattle/cruiser) "js" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/laser, +/obj/item/gun/ballistic/automatic/laser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jt" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "ju" = ( /obj/structure/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jv" = ( @@ -2862,7 +2862,7 @@ "jB" = ( /obj/structure/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jC" = ( @@ -2930,7 +2930,7 @@ mob_name = "Walter Strider"; name = "Walter Strider" }, -/obj/item/weapon/gun/ballistic/shotgun/automatic/combat, +/obj/item/gun/ballistic/shotgun/automatic/combat, /obj/item/ammo_casing/c10mm, /obj/item/ammo_casing/c10mm, /obj/effect/decal/cleanable/blood, @@ -2954,7 +2954,7 @@ /area/awaymission/spacebattle/cruiser) "jP" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jQ" = ( @@ -2977,7 +2977,7 @@ /area/awaymission/spacebattle/cruiser) "jU" = ( /mob/living/simple_animal/hostile/syndicate/ranged/space{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/weapon/gun/ballistic/automatic/c20r) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/gun/ballistic/automatic/c20r) }, /turf/open/floor/plasteel/airless, /area/awaymission/spacebattle/cruiser) @@ -2998,20 +2998,20 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/gun/energy/pulse/pistol/loyalpin, -/obj/item/weapon/gun/energy/pulse/pistol/loyalpin, +/obj/item/gun/energy/pulse/pistol/loyalpin, +/obj/item/gun/energy/pulse/pistol/loyalpin, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "jY" = ( /mob/living/simple_animal/hostile/syndicate/ranged/space{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/weapon/gun/ballistic/automatic/c20r) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatecommando,/obj/item/gun/ballistic/automatic/c20r) }, /turf/open/floor/plating/airless, /area/awaymission/spacebattle/cruiser) "jZ" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/laser, -/obj/item/weapon/gun/ballistic/automatic/laser, +/obj/item/gun/ballistic/automatic/laser, +/obj/item/gun/ballistic/automatic/laser, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "ka" = ( @@ -3024,7 +3024,7 @@ /area/awaymission/spacebattle/cruiser) "kc" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/scatter, +/obj/item/gun/energy/laser/scatter, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "kd" = ( @@ -3037,7 +3037,7 @@ "kf" = ( /obj/structure/rack, /obj/structure/window/reinforced, -/obj/item/weapon/gun/energy/laser/scatter, +/obj/item/gun/energy/laser/scatter, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "kg" = ( @@ -3066,12 +3066,12 @@ /turf/open/floor/mech_bay_recharge_floor, /area/awaymission/spacebattle/cruiser) "kk" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) "kl" = ( /obj/effect/mob_spawn/human/nanotrasensoldier, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /obj/effect/decal/cleanable/blood, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) @@ -3102,14 +3102,14 @@ /area/awaymission/spacebattle/cruiser) "kp" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/xray, +/obj/item/gun/energy/xray, /turf/open/floor/engine, /area/awaymission/spacebattle/cruiser) "kq" = ( /obj/machinery/porta_turret{ dir = 8; emagged = 1; - installation = /obj/item/weapon/gun/energy/lasercannon + installation = /obj/item/gun/energy/lasercannon }, /turf/open/floor/engine/vacuum, /area/awaymission/spacebattle/cruiser) @@ -3136,7 +3136,7 @@ /area/awaymission/spacebattle/cruiser) "ku" = ( /mob/living/simple_animal/hostile/syndicate/ranged{ - loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/weapon/gun/ballistic/automatic/c20r,/obj/item/weapon/shield/energy) + loot = list(/obj/effect/mob_spawn/human/corpse/syndicatesoldier,/obj/item/gun/ballistic/automatic/c20r,/obj/item/shield/energy) }, /turf/open/floor/plasteel/white, /area/awaymission/spacebattle/cruiser) @@ -3182,22 +3182,22 @@ /area/awaymission/spacebattle/cruiser) "kB" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "kC" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "kD" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/awaymission/spacebattle/cruiser) "kE" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/space, /area/space) "kF" = ( @@ -3224,7 +3224,7 @@ /turf/open/space, /area/space) "kJ" = ( -/obj/item/weapon/shard, +/obj/item/shard, /obj/structure/lattice, /turf/open/space, /area/space) @@ -3235,8 +3235,8 @@ /area/space) "kL" = ( /obj/structure/closet/crate, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/item/mecha_parts/mecha_equipment/weapon/energy/ion, /turf/open/floor/plating, /area/awaymission/spacebattle/cruiser) diff --git a/_maps/RandomZLevels/undergroundoutpost45.dmm b/_maps/RandomZLevels/undergroundoutpost45.dmm index 02ab07915f9..f28a765b73d 100644 --- a/_maps/RandomZLevels/undergroundoutpost45.dmm +++ b/_maps/RandomZLevels/undergroundoutpost45.dmm @@ -509,7 +509,7 @@ }) "aV" = ( /obj/structure/table/wood, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/open/floor/plasteel/grimy{ heat_capacity = 1e+006 }, @@ -519,7 +519,7 @@ }) "aW" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plasteel/grimy{ heat_capacity = 1e+006 }, @@ -578,7 +578,7 @@ }) "bb" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/ripley_build_and_repair, +/obj/item/book/manual/ripley_build_and_repair, /turf/open/floor/plasteel/grimy{ heat_capacity = 1e+006 }, @@ -612,10 +612,10 @@ name = "botanist's locker"; req_access_txt = "201" }, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/item/device/plant_analyzer, /obj/item/clothing/mask/bandana, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/plasteel/vault{ dir = 4; heat_capacity = 1e+006 @@ -625,7 +625,7 @@ name = "UO45 Central Hall" }) "bf" = ( -/obj/item/weapon/storage/belt/security, +/obj/item/storage/belt/security, /obj/item/device/assembly/flash/handheld, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet{ @@ -732,10 +732,10 @@ }) "bo" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes{ +/obj/item/storage/fancy/cigarettes{ pixel_y = 2 }, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = 4; pixel_y = 2 }, @@ -1393,7 +1393,7 @@ }) "cv" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1444,9 +1444,9 @@ req_access_txt = "201" }, /obj/item/clothing/suit/apron, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/item/clothing/mask/bandana, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/plasteel/vault{ dir = 4; heat_capacity = 1e+006 @@ -1602,7 +1602,7 @@ dir = 1 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -1615,7 +1615,7 @@ dir = 1 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -1839,7 +1839,7 @@ dir = 5 }, /obj/structure/closet, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -1973,7 +1973,7 @@ name = "UO45 Central Hall" }) "do" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /obj/effect/decal/cleanable/dirt, @@ -2228,7 +2228,7 @@ dir = 4 }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/green/side{ dir = 1; heat_capacity = 1e+006 @@ -2283,10 +2283,10 @@ name = "UO45 Central Hall" }) "dM" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, +/obj/item/reagent_containers/food/snacks/meat/slab/monkey, /obj/structure/closet/secure_closet{ icon_state = "freezer"; locked = 0; @@ -2313,10 +2313,10 @@ name = "UO45 Central Hall" }) "dO" = ( -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/storage/fancy/egg_box, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/storage/fancy/egg_box, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/secure_closet{ icon_state = "freezer"; @@ -2741,11 +2741,11 @@ "ex" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/southleft{ base_state = "right"; dir = 8; @@ -2823,8 +2823,8 @@ }) "eE" = ( /obj/structure/table, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 1; @@ -2927,7 +2927,7 @@ "eM" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/door/window/southleft{ base_state = "left"; dir = 8; @@ -3001,7 +3001,7 @@ }) "eS" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -3021,18 +3021,18 @@ }) "eU" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, -/obj/item/weapon/watertank, +/obj/item/watertank, /turf/open/floor/plasteel/vault{ dir = 1; heat_capacity = 1e+006 @@ -3061,7 +3061,7 @@ "eW" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 10; heat_capacity = 1e+006 @@ -3074,7 +3074,7 @@ /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/item/device/radio/off, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/structure/sign/poster/official/safety_report{ @@ -3353,10 +3353,10 @@ }) "ft" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/screwdriver, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 }, @@ -3683,7 +3683,7 @@ }) "fS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -3692,7 +3692,7 @@ name = "UO45 Central Hall" }) "fT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /obj/effect/decal/cleanable/dirt, @@ -3921,7 +3921,7 @@ desc = "It's a storage unit for kitchen clothes and equipment."; name = "Kitchen Crate" }, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/item/clothing/under/waiter, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/showroomfloor{ @@ -3932,7 +3932,7 @@ name = "UO45 Crew Quarters" }) "gn" = ( -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /obj/structure/closet/emcloset, @@ -4116,11 +4116,11 @@ }) "gF" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /obj/effect/decal/cleanable/dirt, @@ -4208,7 +4208,7 @@ }) "gN" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/white/side{ dir = 2; heat_capacity = 1e+006 @@ -4305,7 +4305,7 @@ }) "gV" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 }, @@ -4315,11 +4315,11 @@ }) "gW" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 }, @@ -4383,15 +4383,15 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/white/side{ dir = 8; heat_capacity = 1e+006 @@ -4528,7 +4528,7 @@ "hn" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -4563,7 +4563,7 @@ "hq" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/open/floor/plasteel/cafeteria{ @@ -4685,7 +4685,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating{ heat_capacity = 1e+006 }, @@ -4760,12 +4760,12 @@ }) "hG" = ( /obj/structure/table/glass, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white/side{ dir = 8; @@ -4828,7 +4828,7 @@ }) "hM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -4891,10 +4891,10 @@ }) "hR" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plasteel/cafeteria{ @@ -4907,7 +4907,7 @@ }) "hS" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -4934,7 +4934,7 @@ level = 2 }, /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -5120,11 +5120,11 @@ }) "ik" = ( /obj/structure/table/glass, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plasteel/white/side{ dir = 8; heat_capacity = 1e+006 @@ -5167,8 +5167,8 @@ }) "io" = ( /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -5192,7 +5192,7 @@ }) "iq" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -5299,11 +5299,11 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, @@ -5417,7 +5417,7 @@ }) "iG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -5503,7 +5503,7 @@ }) "iN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/sign/biohazard{ pixel_x = -32 }, @@ -5557,7 +5557,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel/floorgrime{ dir = 8; heat_capacity = 1e+006 @@ -5643,11 +5643,11 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -5748,9 +5748,9 @@ name = "kitchen Cabinet"; req_access_txt = "201" }, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/cafeteria{ dir = 5; @@ -5907,9 +5907,9 @@ "jr" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/folder/white, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, /turf/open/floor/plasteel/white{ heat_capacity = 1e+006 }, @@ -5975,7 +5975,7 @@ }) "jx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -6247,7 +6247,7 @@ }) "jT" = ( /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/bar{ heat_capacity = 1e+006 }, @@ -6436,7 +6436,7 @@ name = "UO45 Central Hall" }) "kd" = ( -/obj/item/weapon/storage/backpack/satchel/tox, +/obj/item/storage/backpack/satchel/tox, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/toggle/labcoat/science, /obj/effect/decal/cleanable/dirt, @@ -6483,7 +6483,7 @@ name = "UO45 Gateway" }) "kh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /obj/effect/decal/cleanable/dirt, @@ -6693,7 +6693,7 @@ "kx" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -6707,7 +6707,7 @@ }) "ky" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/head/welding, /obj/structure/sign/biohazard{ pixel_y = 32 @@ -7274,7 +7274,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -7388,9 +7388,9 @@ }) "lu" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/structure/closet/secure_closet{ icon_state = "sec"; locked = 1; @@ -7811,10 +7811,10 @@ }) "lT" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plasteel/bar{ @@ -7878,11 +7878,11 @@ /obj/item/stack/sheet/mineral/plasma{ amount = 26 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -7925,7 +7925,7 @@ "ma" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -8133,7 +8133,7 @@ }) "mq" = ( /obj/structure/table, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /obj/machinery/newscaster{ pixel_x = 30 }, @@ -8176,7 +8176,7 @@ }) "mt" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -8223,7 +8223,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/backpack/satchel/eng, +/obj/item/storage/backpack/satchel/eng, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/meson, @@ -8298,7 +8298,7 @@ }) "mB" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/flashlight, /obj/item/device/flashlight, /obj/item/device/flashlight, @@ -8331,7 +8331,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -8519,7 +8519,7 @@ }) "mQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /turf/open/floor/plasteel/cafeteria{ @@ -8532,11 +8532,11 @@ }) "mR" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/newscaster{ pixel_x = -30 }, @@ -8550,7 +8550,7 @@ }) "mS" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 1; heat_capacity = 1e+006 @@ -8654,7 +8654,7 @@ "na" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -8770,8 +8770,8 @@ }) "nk" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, @@ -9232,8 +9232,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/rd{ +/obj/item/folder/white, +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -9248,11 +9248,11 @@ "nQ" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/cafeteria{ dir = 5; heat_capacity = 1e+006 @@ -9314,7 +9314,7 @@ dir = 8 }, /obj/item/device/radio/off, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /turf/open/floor/plasteel/red/side{ @@ -10213,7 +10213,7 @@ desc = "A portable generator for emergency backup power."; name = "S.U.P.E.R.P.A.C.M.A.N.-type portable generator" }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -10368,7 +10368,7 @@ name = "UO45 Research" }) "pg" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = -27 }, @@ -10437,7 +10437,7 @@ name = "UO45 Research" }) "pl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /obj/effect/decal/cleanable/dirt, @@ -10887,7 +10887,7 @@ dir = 8 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -11170,7 +11170,7 @@ "qo" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/glasses/hud/health, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/white/corner{ @@ -11190,7 +11190,7 @@ req_access = null }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/white/side{ dir = 2; @@ -11498,7 +11498,7 @@ }, /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, /obj/machinery/firealarm{ @@ -11731,7 +11731,7 @@ /obj/machinery/newscaster{ pixel_y = -28 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -11880,7 +11880,7 @@ name = "UO45 Engineering" }) "rk" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /turf/open/floor/plasteel/yellow/side{ @@ -11912,10 +11912,10 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ @@ -11941,8 +11941,8 @@ dir = 6 }, /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 30 }, @@ -12154,8 +12154,8 @@ }) "rB" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/black{ heat_capacity = 1e+006 }, @@ -12174,8 +12174,8 @@ }) "rD" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/poster/random_contraband, +/obj/item/storage/box/lights/mixed, +/obj/item/poster/random_contraband, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating{ burnt = 1; @@ -12261,7 +12261,7 @@ }) "rJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/white/side{ dir = 8; heat_capacity = 1e+006 @@ -12632,11 +12632,11 @@ name = "Engineering Reception"; req_access_txt = "201" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -12752,7 +12752,7 @@ name = "miner's equipment"; req_access = list(201) }, -/obj/item/weapon/storage/backpack/satchel/eng, +/obj/item/storage/backpack/satchel/eng, /obj/item/clothing/gloves/fingerless, /turf/open/floor/plasteel/brown/corner{ dir = 2; @@ -12930,11 +12930,11 @@ }) "sy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -2; pixel_y = 4 }, @@ -12949,7 +12949,7 @@ }) "sz" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 6 }, @@ -12965,7 +12965,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/freezer{ heat_capacity = 1e+006 }, @@ -13176,7 +13176,7 @@ name = "Engineering Reception"; req_access_txt = "201" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel{ heat_capacity = 1e+006 }, @@ -13220,7 +13220,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 4; heat_capacity = 1e+006 @@ -13704,7 +13704,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -14060,7 +14060,7 @@ /obj/machinery/shower{ dir = 1 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer{ heat_capacity = 1e+006 }, @@ -14361,7 +14361,7 @@ dir = 10 }, /obj/structure/table/reinforced, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -14397,7 +14397,7 @@ }) "uy" = ( /obj/structure/closet, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plating{ burnt = 1; heat_capacity = 1e+006; @@ -15437,7 +15437,7 @@ }, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -15535,7 +15535,7 @@ dir = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -15573,7 +15573,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 5 }, /obj/effect/decal/cleanable/dirt, @@ -16085,11 +16085,11 @@ }) "wR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/weapon/stamp/ce, +/obj/item/stamp/ce, /turf/open/floor/plasteel/neutral{ dir = 2; heat_capacity = 1e+006 @@ -16100,7 +16100,7 @@ }) "wS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/open/floor/plasteel/neutral{ dir = 2; heat_capacity = 1e+006 @@ -16111,11 +16111,11 @@ }) "wT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/neutral{ dir = 2; @@ -16153,7 +16153,7 @@ "wV" = ( /obj/machinery/light/small, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet{ heat_capacity = 1e+006 }, @@ -16213,10 +16213,10 @@ }) "xb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/cigarettes{ +/obj/item/storage/fancy/cigarettes{ pixel_x = -2 }, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = 4 }, /turf/open/floor/plasteel/neutral{ @@ -16505,7 +16505,7 @@ }) "xv" = ( /obj/structure/table, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/item/device/radio/off, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel{ @@ -16612,7 +16612,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -17525,7 +17525,7 @@ poweralm = 0 }) "yJ" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/mineral/titanium/blue, /area/awaycontent/a7{ always_unpowered = 1; @@ -17537,7 +17537,7 @@ poweralm = 0 }) "yK" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/titanium/blue, @@ -17551,7 +17551,7 @@ poweralm = 0 }) "yL" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/mineral/titanium/blue, diff --git a/_maps/RandomZLevels/wildwest.dmm b/_maps/RandomZLevels/wildwest.dmm index 243f74b6d2d..a162375678e 100644 --- a/_maps/RandomZLevels/wildwest.dmm +++ b/_maps/RandomZLevels/wildwest.dmm @@ -171,7 +171,7 @@ /turf/open/floor/engine/cult, /area/awaymission/wwvault) "aL" = ( -/obj/item/weapon/paper/fluff/awaymissions/wildwest/grinder{ +/obj/item/paper/fluff/awaymissions/wildwest/grinder{ info = "meat grinder requires sacri" }, /turf/open/floor/plasteel/cult{ @@ -363,7 +363,7 @@ /area/awaymission/wwmines) "bC" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic, +/obj/item/gun/ballistic, /turf/open/floor/wood, /area/awaymission/wwmines) "bD" = ( @@ -379,7 +379,7 @@ /area/awaymission/wwmines) "bG" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/open/floor/wood, /area/awaymission/wwmines) "bH" = ( @@ -392,16 +392,16 @@ /area/awaymission/wwmines) "bJ" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, /area/awaymission/wwmines) "bK" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -421,11 +421,11 @@ /area/awaymission/wwmines) "bN" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/synthmeat, +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, +/obj/item/reagent_containers/food/snacks/meat/slab/synthmeat, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -607,14 +607,14 @@ /area/awaymission/wwgov) "cg" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page4, +/obj/item/paper/fluff/awaymissions/wildwest/journal/page4, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, /area/awaymission/wwmines) "ch" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic, +/obj/item/gun/ballistic, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -647,7 +647,7 @@ /turf/open/floor/wood, /area/awaymission/wwgov) "co" = ( -/obj/item/weapon/storage/bag/money, +/obj/item/storage/bag/money, /turf/open/floor/wood, /area/awaymission/wwgov) "cp" = ( @@ -688,7 +688,7 @@ /turf/open/floor/carpet, /area/awaymission/wwgov) "cx" = ( -/obj/item/weapon/storage/bag/money, +/obj/item/storage/bag/money, /turf/open/floor/carpet, /area/awaymission/wwgov) "cy" = ( @@ -711,7 +711,7 @@ /area/awaymission/wwmines) "cC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/wood, /area/awaymission/wwgov) "cD" = ( @@ -748,17 +748,17 @@ /area/awaymission/wwmines) "cJ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/wood, /area/awaymission/wwmines) "cK" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/wood, /area/awaymission/wwmines) "cL" = ( /obj/structure/table/wood, -/obj/item/weapon/twohanded/dualsaber, +/obj/item/twohanded/dualsaber, /turf/open/floor/wood, /area/awaymission/wwgov) "cM" = ( @@ -827,22 +827,22 @@ /turf/open/floor/plating, /area/awaymission/wwrefine) "cU" = ( -/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page1, +/obj/item/paper/fluff/awaymissions/wildwest/journal/page1, /turf/open/floor/carpet, /area/awaymission/wwgov) "cV" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/soup/monkeysdelight, +/obj/item/reagent_containers/food/snacks/soup/monkeysdelight, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "cW" = ( /obj/structure/table/wood, -/obj/item/weapon/kitchen/knife/butcher, +/obj/item/kitchen/knife/butcher, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "cX" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/soup/stew, +/obj/item/reagent_containers/food/snacks/soup/stew, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "cY" = ( @@ -888,17 +888,17 @@ /area/awaymission/wwgov) "dd" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/store/bread/creamcheese, +/obj/item/reagent_containers/food/snacks/store/bread/creamcheese, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "de" = ( /obj/structure/table/wood, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "df" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon, +/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "dg" = ( @@ -967,25 +967,25 @@ /area/space) "dp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/wood, /area/awaymission/wwgov) "dq" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "dr" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "ds" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/patron, +/obj/item/reagent_containers/food/drinks/bottle/patron, /turf/open/floor/plasteel/stage_bleft, /area/awaymission/wwgov) "dt" = ( @@ -1063,7 +1063,7 @@ /area/awaymission/wwmines) "dH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/awaymission/wwmines) "dI" = ( @@ -1191,22 +1191,22 @@ /area/awaymission/wwmines) "dY" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly, +/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly, /turf/open/floor/carpet, /area/awaymission/wwmines) "dZ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/carpet, /area/awaymission/wwmines) "ea" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, +/obj/item/reagent_containers/food/snacks/donut/jelly, /turf/open/floor/carpet, /area/awaymission/wwmines) "eb" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, /turf/open/floor/carpet, /area/awaymission/wwmines) "ec" = ( @@ -1298,7 +1298,7 @@ /turf/open/floor/carpet, /area/awaymission/wwmines) "eq" = ( -/obj/item/weapon/gun/ballistic/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/open/floor/wood, /area/awaymission/wwmines) "er" = ( @@ -1377,20 +1377,20 @@ /area/awaymission/wwgov) "eE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, -/obj/item/weapon/gun/ballistic, +/obj/item/bedsheet/blue, +/obj/item/gun/ballistic, /turf/open/floor/wood, /area/awaymission/wwmines) "eF" = ( /obj/effect/decal/cleanable/blood, /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/awaymission/wwmines) "eG" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/coffee, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/slimejelly, +/obj/item/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/snacks/donut/jelly/slimejelly, /turf/open/floor/carpet, /area/awaymission/wwmines) "eH" = ( @@ -1830,7 +1830,7 @@ /area/awaymission/wwmines) "fS" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/open/floor/wood, /area/awaymission/wwmines) "fT" = ( @@ -1878,7 +1878,7 @@ /turf/open/floor/wood, /area/awaymission/wwmines) "fZ" = ( -/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page7, +/obj/item/paper/fluff/awaymissions/wildwest/journal/page7, /turf/open/floor/wood, /area/awaymission/wwmines) "ga" = ( @@ -1916,7 +1916,7 @@ /area/awaymission/wwmines) "gg" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/wood, /area/awaymission/wwmines) "gh" = ( @@ -1944,7 +1944,7 @@ /turf/open/floor/wood, /area/awaymission/wwmines) "gm" = ( -/obj/item/weapon/gun/ballistic, +/obj/item/gun/ballistic, /turf/open/floor/wood, /area/awaymission/wwmines) "gn" = ( @@ -1991,15 +1991,15 @@ }, /area/awaymission/wwmines) "gv" = ( -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/wood, /area/awaymission/wwmines) "gw" = ( -/obj/item/weapon/gun/ballistic/automatic/pistol, +/obj/item/gun/ballistic/automatic/pistol, /turf/open/floor/wood, /area/awaymission/wwmines) "gx" = ( -/obj/item/weapon/gun/ballistic/shotgun, +/obj/item/gun/ballistic/shotgun, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, @@ -2163,7 +2163,7 @@ /obj/item/clothing/suit/space/syndicate/black/orange, /obj/item/clothing/head/helmet/space/syndicate/black/orange, /obj/item/clothing/mask/gas/syndicate, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gX" = ( @@ -2183,7 +2183,7 @@ /turf/open/floor/mineral/titanium/yellow, /area/awaymission/wwrefine) "gY" = ( -/obj/item/weapon/paper/fluff/awaymissions/wildwest/journal/page8, +/obj/item/paper/fluff/awaymissions/wildwest/journal/page8, /turf/open/floor/plating/ironsand{ icon_state = "ironsand1" }, diff --git a/_maps/map_files/BoxStation/BoxStation.dmm b/_maps/map_files/BoxStation/BoxStation.dmm index c89e4e04221..bb283a47503 100644 --- a/_maps/map_files/BoxStation/BoxStation.dmm +++ b/_maps/map_files/BoxStation/BoxStation.dmm @@ -166,7 +166,7 @@ /turf/open/floor/plating, /area/security/prison) "aaz" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/security/prison) "aaA" = ( @@ -196,7 +196,7 @@ "aaE" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/soil, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/plasteel/green/side{ dir = 6 }, @@ -204,7 +204,7 @@ "aaF" = ( /obj/structure/window/reinforced, /obj/machinery/hydroponics/soil, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/plasteel/green/side{ dir = 2 }, @@ -254,12 +254,12 @@ /area/security/prison) "aaN" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/security/prison) "aaO" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/security/prison) "aaP" = ( @@ -298,11 +298,11 @@ /area/security/prison) "aaV" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/security/prison) "aaW" = ( @@ -371,7 +371,7 @@ /obj/machinery/shower{ dir = 8 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/freezer, /area/security/prison) "abj" = ( @@ -399,8 +399,8 @@ /area/security/main) "abm" = ( /obj/structure/table, -/obj/item/weapon/storage/box/firingpins, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /obj/item/key/security, /turf/open/floor/plasteel/vault{ dir = 8 @@ -411,8 +411,8 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/weapon/gun/energy/e_gun/dragnet, -/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -545,13 +545,13 @@ /area/security/prison) "abH" = ( /obj/structure/table, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 6 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = -3 }, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -579,12 +579,12 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -681,8 +681,8 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/armor/laserproof, /turf/open/floor/plasteel/vault{ dir = 8 @@ -713,11 +713,11 @@ pixel_x = -31 }, /obj/structure/table/wood, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/deputy, +/obj/item/storage/box/deputy, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "abU" = ( @@ -736,9 +736,9 @@ pixel_x = 30 }, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "abX" = ( @@ -875,7 +875,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/security/armory) "acn" = ( -/obj/item/weapon/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/HoS{ pixel_x = 35 }, /obj/structure/closet/secure_closet/hos, @@ -1079,12 +1079,12 @@ /area/ai_monitored/security/armory) "acM" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -1118,8 +1118,8 @@ /area/security/main) "acQ" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acR" = ( @@ -1129,14 +1129,14 @@ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "acS" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) @@ -1189,8 +1189,8 @@ /area/security/transfer) "acY" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -1215,8 +1215,8 @@ /area/security/prison) "adb" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "adc" = ( @@ -1275,12 +1275,12 @@ /area/ai_monitored/security/armory) "adj" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -1300,12 +1300,12 @@ /area/ai_monitored/security/armory) "adk" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = 3; pixel_y = -3 }, @@ -1488,14 +1488,14 @@ "adC" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/hemostat, -/obj/item/weapon/retractor, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/circular_saw, +/obj/item/hemostat, +/obj/item/retractor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/black, /area/security/transfer) "adD" = ( @@ -1516,14 +1516,14 @@ /area/security/transfer) "adE" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, /obj/item/device/taperecorder{ pixel_x = -3 }, /obj/item/device/assembly/flash/handheld, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /turf/open/floor/plasteel/black, /area/security/transfer) "adF" = ( @@ -2003,7 +2003,7 @@ "aeB" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/security/main) "aeC" = ( @@ -2056,11 +2056,11 @@ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/tank/internals/anesthetic{ +/obj/item/tank/internals/anesthetic{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = 3 }, /turf/open/floor/plasteel/vault{ @@ -2443,7 +2443,7 @@ /obj/item/device/radio/intercom{ pixel_y = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -2518,7 +2518,7 @@ /area/security/transfer) "afz" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/red/side{ dir = 10 }, @@ -2576,8 +2576,8 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, -/obj/item/weapon/storage/box/hug, -/obj/item/weapon/razor{ +/obj/item/storage/box/hug, +/obj/item/razor{ pixel_x = -6 }, /turf/open/floor/plasteel/red/side, @@ -2669,7 +2669,7 @@ /area/security/main) "afV" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/timer, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -2698,7 +2698,7 @@ "afZ" = ( /obj/structure/table, /obj/item/device/radio/off, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /turf/open/floor/plasteel, @@ -2740,8 +2740,8 @@ /obj/item/stack/sheet/metal{ amount = 1 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -2761,8 +2761,8 @@ "agh" = ( /obj/structure/table, /obj/item/device/electropack, -/obj/item/weapon/screwdriver, -/obj/item/weapon/wrench, +/obj/item/screwdriver, +/obj/item/wrench, /obj/item/clothing/head/helmet, /obj/item/device/assembly/signaler, /obj/machinery/light/small, @@ -2895,7 +2895,7 @@ "agw" = ( /obj/structure/table, /obj/machinery/syndicatebomb/training, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /turf/open/floor/plasteel/red/side{ dir = 9 }, @@ -2961,8 +2961,8 @@ /area/security/brig) "agE" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel, /area/security/main) "agF" = ( @@ -3013,7 +3013,7 @@ /turf/open/floor/plasteel/black, /area/security/prison) "agJ" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -3031,18 +3031,18 @@ "agM" = ( /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /turf/open/floor/plasteel/whitered/side{ dir = 9 }, /area/security/brig) "agN" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table/glass, /turf/open/floor/plasteel/whitered/side{ dir = 1 @@ -3128,7 +3128,7 @@ /area/security/warden) "agY" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -3154,8 +3154,8 @@ /area/security/main) "ahd" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/security/main) @@ -3194,7 +3194,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -3263,7 +3263,7 @@ /obj/machinery/iv_drip{ density = 0 }, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/open/floor/plasteel/whitered/side{ dir = 5 }, @@ -3316,15 +3316,15 @@ }, /area/security/brig) "ahu" = ( -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/syringe{ name = "steel point" }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/machinery/light{ dir = 8 }, @@ -3676,7 +3676,7 @@ /area/security/brig) "ahV" = ( /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/taperecorder, /turf/open/floor/plasteel/black, /area/security/prison) @@ -3765,13 +3765,13 @@ /area/security/brig) "aie" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, -/obj/item/weapon/hand_labeler, +/obj/item/folder/red, +/obj/item/pen, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "aif" = ( @@ -4064,11 +4064,11 @@ name = "Reception Desk"; req_access_txt = "63" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -4259,7 +4259,7 @@ /obj/structure/sign/securearea{ pixel_x = -32 }, -/obj/item/weapon/gavelhammer, +/obj/item/gavelhammer, /turf/open/floor/plasteel, /area/security/courtroom) "aji" = ( @@ -4341,7 +4341,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /obj/machinery/camera{ c_tag = "Labor Shuttle Dock North" }, @@ -4428,7 +4428,7 @@ /turf/open/floor/plasteel, /area/security/brig) "ajC" = ( -/obj/item/weapon/storage/toolbox/drone, +/obj/item/storage/toolbox/drone, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -4550,14 +4550,14 @@ /area/security/courtroom) "ajQ" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, /area/security/courtroom) "ajR" = ( /obj/structure/table/wood, -/obj/item/weapon/gavelblock, +/obj/item/gavelblock, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -4785,7 +4785,7 @@ /area/security/brig) "akn" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 4 @@ -4921,8 +4921,8 @@ /area/shuttle/labor) "akE" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "akF" = ( @@ -5393,11 +5393,11 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/security/brig) "alB" = ( @@ -5559,7 +5559,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "alW" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -5618,7 +5618,7 @@ /area/security/processing) "amf" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -5639,7 +5639,7 @@ /area/security/brig) "amh" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/flasher{ id = "Cell 2"; pixel_x = -28 @@ -5655,7 +5655,7 @@ /area/security/brig) "amj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/flasher{ id = "Cell 3"; pixel_x = -28 @@ -5708,7 +5708,7 @@ name = "Brig Desk"; req_access_txt = "2" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/radio/off, /turf/open/floor/plasteel/black, /area/security/brig) @@ -5736,7 +5736,7 @@ /area/security/brig) "amq" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/item/device/radio/intercom{ desc = "Talk through this. It looks like it has been modified to not broadcast."; dir = 2; @@ -5841,7 +5841,7 @@ "amE" = ( /obj/structure/bed, /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plating, /area/maintenance/port/fore) "amF" = ( @@ -5849,10 +5849,10 @@ balance = 15; money = 500 }, -/obj/item/weapon/coin/iron, -/obj/item/weapon/coin/diamond, -/obj/item/weapon/coin/diamond, -/obj/item/weapon/coin/diamond, +/obj/item/coin/iron, +/obj/item/coin/diamond, +/obj/item/coin/diamond, +/obj/item/coin/diamond, /turf/open/floor/plating, /area/maintenance/port/fore) "amG" = ( @@ -6180,8 +6180,8 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "ann" = ( -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/circuitboard/machine/seed_extractor, +/obj/item/electronics/airalarm, +/obj/item/circuitboard/machine/seed_extractor, /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 4; @@ -6196,7 +6196,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "anp" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6612,7 +6612,7 @@ /area/maintenance/port/fore) "aoo" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/monkey_recycler, +/obj/item/circuitboard/machine/monkey_recycler, /turf/open/floor/plating, /area/maintenance/port/fore) "aop" = ( @@ -6772,7 +6772,7 @@ /area/security/courtroom) "aoH" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -6893,8 +6893,8 @@ /area/space/nearstation) "aoW" = ( /obj/structure/table, -/obj/item/weapon/stamp, -/obj/item/weapon/poster/random_official, +/obj/item/stamp, +/obj/item/poster/random_official, /turf/open/floor/plating, /area/maintenance/port/fore) "aoX" = ( @@ -7104,7 +7104,7 @@ /turf/open/floor/plating, /area/maintenance/fore/secondary) "apy" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -7234,7 +7234,7 @@ /turf/open/space, /area/space/nearstation) "apR" = ( -/obj/item/weapon/paper/fluff/jobs/security/beepsky_mom, +/obj/item/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, /area/security/processing) "apS" = ( @@ -7294,7 +7294,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood, /area/lawoffice) @@ -7428,7 +7428,7 @@ /area/maintenance/fore/secondary) "aqn" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -7456,9 +7456,9 @@ dir = 1 }, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/head/hardhat/red, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ @@ -7563,12 +7563,12 @@ balance = 15; money = 500 }, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aqD" = ( /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aqE" = ( @@ -7663,7 +7663,7 @@ }, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/potato{ +/obj/item/stock_parts/cell/potato{ name = "\improper Beepsky's emergency battery" }, /turf/open/floor/plating, @@ -7695,7 +7695,7 @@ /area/quartermaster/office) "aqV" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -7713,7 +7713,7 @@ /area/security/vacantoffice/b) "aqY" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/security/vacantoffice/b) "aqZ" = ( @@ -7733,9 +7733,9 @@ /area/lawoffice) "arb" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/pen/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/pen/red, /turf/open/floor/wood, /area/lawoffice) "arc" = ( @@ -7888,12 +7888,12 @@ /area/maintenance/starboard/fore) "arv" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arw" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -7907,13 +7907,13 @@ /area/maintenance/starboard/fore) "ary" = ( /obj/structure/closet, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arz" = ( -/obj/item/weapon/coin/gold, -/obj/item/weapon/coin/iron, +/obj/item/coin/gold, +/obj/item/coin/iron, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arA" = ( @@ -8028,8 +8028,8 @@ /area/maintenance/port/fore) "arO" = ( /obj/machinery/monkey_recycler, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube, +/obj/item/reagent_containers/food/snacks/monkeycube, +/obj/item/reagent_containers/food/snacks/monkeycube, /turf/open/floor/plating, /area/maintenance/port/fore) "arP" = ( @@ -8079,11 +8079,11 @@ /area/lawoffice) "arX" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/law, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/stamp/law, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8288,7 +8288,7 @@ /area/crew_quarters/fitness) "asu" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/machinery/button/door{ id = "Dorm5"; name = "Cabin Bolt Control"; @@ -8329,7 +8329,7 @@ /area/maintenance/starboard/fore) "asz" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, /turf/open/floor/plating, /area/maintenance/starboard/fore) "asA" = ( @@ -8392,7 +8392,7 @@ /area/maintenance/port/fore) "asL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/machinery/button/door{ id = "Dorm6"; name = "Cabin Bolt Control"; @@ -8470,7 +8470,7 @@ dir = 8 }, /obj/structure/rack, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "asX" = ( @@ -8656,11 +8656,11 @@ /area/security/vacantoffice/b) "atv" = ( /obj/structure/table, -/obj/item/weapon/shard, -/obj/item/weapon/shard{ +/obj/item/shard, +/obj/item/shard{ icon_state = "medium" }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/spawner/lootdrop/maintenance, @@ -8898,11 +8898,11 @@ dir = 1; network = list("SS13") }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; dir = 1; @@ -8915,7 +8915,7 @@ "auh" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, -/obj/item/weapon/cartridge/lawyer, +/obj/item/cartridge/lawyer, /turf/open/floor/wood, /area/lawoffice) "aui" = ( @@ -9046,7 +9046,7 @@ /area/crew_quarters/fitness) "auw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -9275,10 +9275,10 @@ pixel_y = 28; broken = 1 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, -/obj/item/weapon/circuitboard/computer/operating, +/obj/item/circuitboard/computer/operating, /turf/open/floor/plating, /area/maintenance/port/fore) "auZ" = ( @@ -9288,7 +9288,7 @@ "ava" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/chair, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plating, /area/maintenance/port/fore) "avb" = ( @@ -9610,7 +9610,7 @@ "avO" = ( /obj/structure/table, /obj/item/clothing/gloves/color/fyellow, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -9646,12 +9646,12 @@ /area/construction/mining/aux_base) "avR" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "avS" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port/fore) "avT" = ( @@ -9668,7 +9668,7 @@ /turf/open/space, /area/space) "avU" = ( -/obj/item/weapon/paper/crumpled, +/obj/item/paper/crumpled, /turf/open/floor/plasteel/airless{ icon_state = "damaged2" }, @@ -9898,7 +9898,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "awq" = ( @@ -9915,7 +9915,7 @@ /area/crew_quarters/dorms) "aws" = ( /obj/structure/table/wood, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -9984,7 +9984,7 @@ /area/crew_quarters/fitness) "awC" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/holodeck/disclaimer, +/obj/item/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "awD" = ( @@ -10041,12 +10041,12 @@ /area/maintenance/starboard/fore) "awK" = ( /obj/structure/table/glass, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/starboard/fore) "awL" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -10222,10 +10222,10 @@ /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/wallframe/camera, @@ -10260,7 +10260,7 @@ /area/maintenance/port/fore) "axg" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/open/floor/plating, /area/maintenance/port/fore) "axh" = ( @@ -10550,7 +10550,7 @@ /area/crew_quarters/dorms) "axN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "axO" = ( @@ -10736,8 +10736,8 @@ "ayj" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plating, /area/maintenance/department/electrical) "ayk" = ( @@ -10798,19 +10798,19 @@ "ays" = ( /obj/structure/closet/wardrobe/white, /obj/item/clothing/shoes/jackboots, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, /turf/open/floor/plating, /area/maintenance/port/fore) "ayt" = ( /obj/structure/table/glass, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/plating, /area/maintenance/port/fore) "ayu" = ( /obj/structure/table/glass, -/obj/item/weapon/restraints/handcuffs/cable/zipties, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/restraints/handcuffs/cable/zipties, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plating, /area/maintenance/port/fore) "ayv" = ( @@ -10962,7 +10962,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/flashlight, /obj/item/device/flashlight, /obj/item/device/flashlight, @@ -10971,11 +10971,11 @@ /area/ai_monitored/storage/eva) "ayO" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /turf/open/floor/plasteel/black, @@ -10999,12 +10999,12 @@ pixel_y = -7 }, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/black, /area/ai_monitored/storage/eva) "ayR" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -11030,7 +11030,7 @@ /obj/structure/table, /obj/item/device/assembly/signaler, /obj/item/device/assembly/signaler, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "ayU" = ( @@ -11041,7 +11041,7 @@ /area/ai_monitored/storage/eva) "ayV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -11063,9 +11063,9 @@ /area/ai_monitored/storage/eva) "ayX" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/head/welding, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -11190,7 +11190,7 @@ /area/crew_quarters/fitness) "azn" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "azo" = ( @@ -11701,7 +11701,7 @@ /obj/structure/closet, /obj/effect/landmark/blobstart, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aAw" = ( @@ -11938,7 +11938,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -12048,7 +12048,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -12340,7 +12340,7 @@ /area/ai_monitored/nuke_storage) "aBW" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -12383,7 +12383,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/pen{ +/obj/item/pen{ desc = "Writes upside down!"; name = "astronaut pen" }, @@ -12400,7 +12400,7 @@ /area/ai_monitored/storage/eva) "aCd" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -12419,7 +12419,7 @@ /area/crew_quarters/dorms) "aCe" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -12529,7 +12529,7 @@ name = "theatre RC"; pixel_x = -32 }, -/obj/item/weapon/reagent_containers/food/snacks/baguette, +/obj/item/reagent_containers/food/snacks/baguette, /obj/item/toy/dummy, /turf/open/floor/plasteel/white/side{ dir = 4 @@ -12800,7 +12800,7 @@ /area/hydroponics/garden) "aDb" = ( /obj/structure/table, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/flashlight{ pixel_x = 1; pixel_y = 5 @@ -12873,7 +12873,7 @@ pixel_y = -4 }, /obj/item/device/assembly/igniter, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /obj/machinery/camera{ @@ -12900,7 +12900,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel, /area/storage/primary) "aDn" = ( @@ -12923,7 +12923,7 @@ /area/storage/primary) "aDp" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -13070,16 +13070,16 @@ /area/crew_quarters/dorms) "aDH" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/rd{ +/obj/item/folder/white, +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -13167,11 +13167,11 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -2; pixel_y = -2 }, @@ -13407,7 +13407,7 @@ /area/chapel/main) "aEo" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "aEp" = ( @@ -13544,13 +13544,13 @@ /area/security/checkpoint/checkpoint2) "aEF" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, /turf/open/floor/plasteel/green/side{ dir = 4 }, @@ -13610,7 +13610,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -13624,23 +13624,23 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "aEP" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -13653,7 +13653,7 @@ /area/ai_monitored/nuke_storage) "aEQ" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel, /area/gateway) "aER" = ( @@ -13666,7 +13666,7 @@ /obj/structure/sign/biohazard{ pixel_x = -32 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/gateway) @@ -14014,11 +14014,11 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "aFK" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -14027,7 +14027,7 @@ /area/security/checkpoint/checkpoint2) "aFL" = ( /obj/item/device/radio/off, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/flash/handheld, /obj/structure/table, /turf/open/floor/plasteel/red/side{ @@ -14043,11 +14043,11 @@ /area/security/checkpoint/checkpoint2) "aFN" = ( /obj/structure/table/glass, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, -/obj/item/weapon/crowbar, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, /obj/item/device/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/green/side{ dir = 4 }, @@ -14080,7 +14080,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /obj/machinery/light{ @@ -14149,7 +14149,7 @@ /area/storage/primary) "aFZ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -14196,11 +14196,11 @@ "aGe" = ( /obj/structure/safe, /obj/item/clothing/head/bearpelt, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -14706,7 +14706,7 @@ "aHa" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/weapon/paper, +/obj/item/paper, /obj/machinery/door/window/westright{ dir = 1; name = "Security Checkpoint"; @@ -14718,7 +14718,7 @@ /area/hallway/secondary/entry) "aHb" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -14727,7 +14727,7 @@ /area/library) "aHc" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood, /area/library) "aHd" = ( @@ -14737,7 +14737,7 @@ /area/library) "aHe" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -14822,8 +14822,8 @@ /area/chapel/main) "aHo" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/harebell, /turf/open/floor/plasteel/chapel{ dir = 4 }, @@ -14902,13 +14902,13 @@ }, /area/hydroponics/garden) "aHA" = ( -/obj/item/weapon/reagent_containers/spray/plantbgone, -/obj/item/weapon/reagent_containers/spray/pestspray{ +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ pixel_x = 2; pixel_y = 1 }, @@ -14941,8 +14941,8 @@ /area/storage/primary) "aHE" = ( /obj/structure/table, -/obj/item/weapon/weldingtool, -/obj/item/weapon/crowbar, +/obj/item/weldingtool, +/obj/item/crowbar, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, @@ -15014,7 +15014,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -15372,11 +15372,11 @@ /area/chapel/office) "aIA" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/grimy, /area/chapel/office) "aIB" = ( @@ -15415,8 +15415,8 @@ /area/shuttle/arrival) "aIH" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/pipe_dispenser, +/obj/item/storage/box/lights/mixed, +/obj/item/pipe_dispenser, /obj/machinery/button/door{ id = "aux_base_shutters"; name = "Public Shutters Control"; @@ -15454,7 +15454,7 @@ /area/hallway/secondary/entry) "aIN" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/analyzer, /turf/open/floor/plasteel, /area/storage/primary) @@ -15489,10 +15489,10 @@ /area/hallway/secondary/entry) "aIS" = ( /obj/structure/table/glass, -/obj/item/weapon/hatchet, -/obj/item/weapon/cultivator, -/obj/item/weapon/crowbar, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/glass/bucket, /obj/item/device/plant_analyzer, /obj/machinery/firealarm{ dir = 8; @@ -15503,7 +15503,7 @@ }, /area/hydroponics/garden) "aIT" = ( -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/structure/table/glass, /obj/item/device/plant_analyzer, /obj/item/device/radio/intercom{ @@ -15542,7 +15542,7 @@ /area/gateway) "aIW" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 @@ -15560,8 +15560,8 @@ /area/storage/primary) "aIZ" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/belt/utility, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/storage/primary) "aJa" = ( @@ -15641,20 +15641,20 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/machinery/light{ dir = 8 }, @@ -15806,8 +15806,8 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "aJE" = ( -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/gun/ballistic/revolver/doublebarrel, /obj/structure/table/wood, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, @@ -15901,8 +15901,8 @@ /area/chapel/office) "aJN" = ( /obj/structure/table, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aJO" = ( @@ -15912,8 +15912,8 @@ /area/hydroponics) "aJP" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/wood, /area/library) "aJQ" = ( @@ -15935,7 +15935,7 @@ /area/library) "aJT" = ( /obj/structure/table/wood, -/obj/item/weapon/nullrod, +/obj/item/nullrod, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -15943,8 +15943,8 @@ /area/chapel/office) "aJU" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/pen, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -16425,18 +16425,18 @@ /area/chapel/office) "aLd" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/watertank, +/obj/item/watertank, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aLe" = ( @@ -17026,10 +17026,10 @@ /area/crew_quarters/kitchen) "aMG" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/wirecutters, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/wirecutters, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aMH" = ( @@ -17075,8 +17075,8 @@ /area/hydroponics) "aMO" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/hallway/secondary/entry) @@ -17598,10 +17598,10 @@ /area/hallway/primary/port) "aOj" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes{ +/obj/item/storage/fancy/cigarettes{ pixel_y = 2 }, -/obj/item/weapon/lighter/greyscale{ +/obj/item/lighter/greyscale{ pixel_x = 4; pixel_y = 2 }, @@ -18011,11 +18011,11 @@ /area/library) "aPh" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /turf/open/floor/engine/cult, /area/library) "aPi" = ( @@ -18372,7 +18372,7 @@ /area/crew_quarters/bar) "aQa" = ( /obj/structure/table, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aQb" = ( @@ -18484,7 +18484,7 @@ "aQs" = ( /obj/structure/destructible/cult/tome, /obj/item/clothing/under/suit_jacket/red, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /turf/open/floor/engine/cult, /area/library) "aQt" = ( @@ -18743,12 +18743,12 @@ /area/bridge) "aRj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/storage/secure/briefcase, +/obj/item/storage/box/PDAs{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/open/floor/plasteel, /area/bridge) "aRk" = ( @@ -18810,8 +18810,8 @@ /area/bridge) "aRs" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, /obj/item/device/assembly/timer, /obj/item/device/assembly/signaler, /obj/item/device/assembly/signaler, @@ -19000,8 +19000,8 @@ }, /obj/structure/rack, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /turf/open/floor/plasteel, /area/storage/tools) "aRU" = ( @@ -19073,7 +19073,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel, /area/storage/tools) "aSb" = ( @@ -19131,7 +19131,7 @@ /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil, -/obj/item/weapon/paper_bin/construction, +/obj/item/paper_bin/construction, /obj/item/stack/cable_coil, /turf/open/floor/plasteel, /area/storage/art) @@ -19139,14 +19139,14 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/storage/emergency/port) "aSm" = ( /turf/open/floor/plating, /area/storage/emergency/port) "aSn" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/storage/emergency/port) "aSo" = ( @@ -19266,7 +19266,7 @@ /area/bridge) "aSE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel, /area/bridge) "aSF" = ( @@ -19590,7 +19590,7 @@ /area/crew_quarters/locker) "aTA" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -19604,7 +19604,7 @@ /area/crew_quarters/locker) "aTC" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -19629,7 +19629,7 @@ /area/crew_quarters/locker) "aTE" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel, /area/storage/art) "aTF" = ( @@ -19641,8 +19641,8 @@ /area/storage/art) "aTG" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel, /area/storage/art) "aTH" = ( @@ -19663,30 +19663,30 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/open/floor/plating, /area/storage/emergency/port) "aTL" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel, /area/storage/tools) "aTM" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aTN" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aTO" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aTP" = ( @@ -19763,7 +19763,7 @@ /area/bridge) "aUc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/bridge) "aUd" = ( @@ -20033,7 +20033,7 @@ /area/security/vacantoffice) "aUR" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/wood, /area/security/vacantoffice) "aUS" = ( @@ -20380,12 +20380,12 @@ "aVA" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aVB" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /obj/item/stack/packageWrap, @@ -20405,21 +20405,21 @@ /area/maintenance/port) "aVD" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aVE" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, /turf/open/floor/plasteel/cafeteria, @@ -20502,7 +20502,7 @@ /area/hallway/primary/starboard) "aVP" = ( /obj/structure/table/wood, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/wood, /area/library) "aVQ" = ( @@ -20513,8 +20513,8 @@ /area/library) "aVR" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -20528,7 +20528,7 @@ /area/library) "aVT" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -21199,7 +21199,7 @@ /area/crew_quarters/bar) "aXj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aXk" = ( @@ -21207,8 +21207,8 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 32 }, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aXl" = ( @@ -21696,11 +21696,11 @@ pixel_y = -24 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/blue/side{ dir = 6 }, @@ -21803,7 +21803,7 @@ /area/hallway/primary/central) "aYH" = ( /obj/structure/table, -/obj/item/weapon/razor, +/obj/item/razor, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -21855,7 +21855,7 @@ /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aYO" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "aYP" = ( @@ -21925,8 +21925,8 @@ /area/library) "aYZ" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/hand_labeler{ +/obj/item/storage/box/evidence, +/obj/item/hand_labeler{ pixel_x = 5 }, /obj/structure/disposalpipe/segment{ @@ -22029,7 +22029,7 @@ /area/hallway/secondary/exit) "aZn" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/security/vacantoffice) @@ -22048,8 +22048,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/stock_parts/cell{ +/obj/item/electronics/apc, +/obj/item/stock_parts/cell{ maxcharge = 2000 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -22349,7 +22349,7 @@ /area/crew_quarters/bar) "baj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/shutters/preopen{ id = "kitchen"; @@ -22442,7 +22442,7 @@ /area/library) "bat" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/wood, /area/library) "bau" = ( @@ -22610,7 +22610,7 @@ /area/crew_quarters/toilet/locker) "baP" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "baQ" = ( @@ -22654,7 +22654,7 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "baW" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -23 }, /turf/open/floor/plasteel/grimy, @@ -22756,7 +22756,7 @@ /area/bridge/meeting_room) "bbj" = ( /obj/structure/table, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/light{ dir = 8 }, @@ -22973,7 +22973,7 @@ /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/locker) "bbM" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /turf/open/floor/carpet, /area/bridge/meeting_room) @@ -22994,10 +22994,10 @@ /area/quartermaster/storage) "bbQ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_x = 3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/carpet, /area/security/detectives_office) "bbR" = ( @@ -23083,7 +23083,7 @@ /area/bridge/meeting_room) "bce" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /obj/machinery/camera/motion{ dir = 4 }, @@ -23100,7 +23100,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bcg" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /obj/structure/sign/kiddieplaque{ pixel_x = 32 }, @@ -23300,7 +23300,7 @@ /area/security/detectives_office) "bcH" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/item/clothing/glasses/sunglasses, /turf/open/floor/carpet, /area/security/detectives_office) @@ -23343,7 +23343,7 @@ /turf/open/floor/plating, /area/maintenance/port) "bcN" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/table/wood, /turf/open/floor/carpet, /area/bridge/meeting_room) @@ -23418,7 +23418,7 @@ /turf/open/floor/plating, /area/bridge/meeting_room) "bcY" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/assembly/timer, /obj/structure/table, /turf/open/floor/wood, @@ -23828,16 +23828,16 @@ /turf/open/floor/plating, /area/maintenance/port) "bdX" = ( -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/table, /turf/open/floor/wood, /area/bridge/meeting_room) "bdY" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table/wood, /turf/open/floor/carpet, /area/bridge/meeting_room) @@ -23860,8 +23860,8 @@ /area/maintenance/port) "beb" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/freeformcore, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -23870,14 +23870,14 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/corp, +/obj/item/aiModule/core/full/corp, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/custom, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai_upload) "bec" = ( @@ -23916,8 +23916,8 @@ /area/ai_monitored/turret_protected/ai_upload) "beg" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/zeroth/oneHuman, +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/zeroth/oneHuman, /obj/machinery/door/window{ base_state = "left"; dir = 8; @@ -23925,16 +23925,16 @@ name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/reset/purge, +/obj/item/aiModule/reset/purge, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/antimov, +/obj/item/aiModule/core/full/antimov, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/aiModule/supplied/protectStation, +/obj/item/aiModule/supplied/protectStation, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai_upload) "beh" = ( @@ -23977,7 +23977,7 @@ c_tag = "Captain's Office"; dir = 8 }, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "beo" = ( @@ -24499,11 +24499,11 @@ /area/ai_monitored/turret_protected/ai_upload) "bfy" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bfz" = ( @@ -24514,14 +24514,14 @@ /area/ai_monitored/turret_protected/ai_upload) "bfA" = ( /obj/structure/table/wood, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bfB" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue, +/obj/item/stamp/captain, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/captain) @@ -24540,9 +24540,9 @@ /area/crew_quarters/heads/captain) "bfE" = ( /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, -/obj/item/weapon/storage/secure/safe{ +/obj/item/pinpointer, +/obj/item/disk/nuclear, +/obj/item/storage/secure/safe{ pixel_x = 35; pixel_y = 5 }, @@ -24616,15 +24616,15 @@ /area/quartermaster/sorting) "bfR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 8 }, -/obj/item/weapon/hand_labeler{ +/obj/item/hand_labeler{ pixel_y = 8 }, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /turf/open/floor/plasteel, /area/quartermaster/sorting) "bfS" = ( @@ -25026,8 +25026,8 @@ /area/crew_quarters/heads/captain) "bgV" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/coin/plasma, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/coin/plasma, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bgW" = ( @@ -25046,7 +25046,7 @@ pixel_x = 24 }, /obj/item/device/camera, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -10 }, /turf/open/floor/wood, @@ -25108,7 +25108,7 @@ /area/medical/medbay/central) "bhf" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bhg" = ( @@ -25141,11 +25141,11 @@ /area/security/checkpoint/medical) "bhk" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; @@ -25154,7 +25154,7 @@ pixel_y = 26; req_access_txt = "5" }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 9 }, @@ -25173,8 +25173,8 @@ /area/medical/morgue) "bhn" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/light/small{ dir = 8 }, @@ -25287,11 +25287,11 @@ name = "Robotics Desk"; req_access_txt = "29" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; name = "robotics lab shutters" @@ -25345,11 +25345,11 @@ /area/science/lab) "bhF" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -25615,14 +25615,14 @@ /area/crew_quarters/heads/captain) "bil" = ( /obj/machinery/computer/card, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bim" = ( /obj/structure/table/wood, /obj/machinery/recharger, -/obj/item/weapon/melee/chainofcommand, +/obj/item/melee/chainofcommand, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bin" = ( @@ -25635,7 +25635,7 @@ /area/medical/chemistry) "bio" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/machinery/requests_console{ @@ -25739,14 +25739,14 @@ /turf/open/floor/plating, /area/storage/emergency/starboard) "biD" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/storage/emergency/starboard) "biE" = ( /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/storage/emergency/starboard) "biF" = ( @@ -25859,11 +25859,11 @@ req_access_txt = "29" }, /obj/structure/table, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/whitered/corner{ dir = 4 }, @@ -26090,8 +26090,8 @@ /area/maintenance/port) "bjm" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -26339,18 +26339,18 @@ /area/medical/chemistry) "bjR" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whiteyellow/side{ dir = 4 }, @@ -26451,8 +26451,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /turf/open/floor/plating, @@ -26475,15 +26475,15 @@ /area/science/robotics/mechbay) "bki" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -26767,7 +26767,7 @@ /obj/machinery/light_switch{ pixel_x = 28 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -26961,7 +26961,7 @@ /area/hallway/primary/central) "blf" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/item/clothing/glasses/science{ pixel_x = 2; pixel_y = 4 @@ -27010,7 +27010,7 @@ /area/medical/medbay/central) "blj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -27024,14 +27024,14 @@ /area/medical/medbay/central) "bll" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/reagent_containers/glass/bottle/epinephrine, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "blm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/food/drinks/britcup{ desc = "Kingston's personal cup." }, /turf/open/floor/plasteel/white, @@ -27110,8 +27110,8 @@ /area/medical/morgue) "bls" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/crowbar/large, +/obj/item/storage/toolbox/mechanical, +/obj/item/crowbar/large, /obj/machinery/camera{ c_tag = "Mech Bay"; dir = 1 @@ -27214,15 +27214,15 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -27322,7 +27322,7 @@ name = "EXTERNAL AIRLOCK"; pixel_y = 32 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard) "blS" = ( @@ -27385,12 +27385,12 @@ /area/science/lab) "bma" = ( /obj/structure/table/glass, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -27755,11 +27755,11 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "bmQ" = ( -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -27769,7 +27769,7 @@ /area/quartermaster/office) "bmR" = ( /obj/structure/table, -/obj/item/weapon/paper/guides/jobs/medical/morgue{ +/obj/item/paper/guides/jobs/medical/morgue{ pixel_x = 5; pixel_y = 4 }, @@ -27900,7 +27900,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, @@ -27946,20 +27946,20 @@ /turf/open/floor/plasteel/white, /area/science/lab) "bnl" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/glass, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/power/apc{ dir = 4; name = "Research Lab APC"; @@ -27981,7 +27981,7 @@ /area/science/lab) "bno" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/open/floor/plasteel, /area/science/lab) "bnp" = ( @@ -28102,8 +28102,8 @@ /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/chemistry, -/obj/item/weapon/book/manual/wiki/chemistry{ +/obj/item/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry{ pixel_x = 3; pixel_y = 3 }, @@ -28137,12 +28137,12 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bnG" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/pen/red, /obj/structure/table, /obj/machinery/computer/stockexchange, /turf/open/floor/plasteel, @@ -28323,7 +28323,7 @@ /area/crew_quarters/heads/captain) "bnY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -28344,11 +28344,11 @@ /area/crew_quarters/heads/captain) "bob" = ( /obj/structure/table/glass, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/screwdriver{ +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver{ pixel_x = -2; pixel_y = 6 }, @@ -28372,7 +28372,7 @@ /area/medical/medbay/central) "bod" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/radio/headset/headset_med, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -28485,8 +28485,8 @@ "bor" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/black, /area/science/robotics/lab) "bos" = ( @@ -28529,9 +28529,9 @@ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/crowbar, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -28584,8 +28584,8 @@ /area/science/robotics/lab) "boD" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, /obj/machinery/light{ @@ -28595,8 +28595,8 @@ /area/science/robotics/lab) "boE" = ( /obj/structure/table, -/obj/item/weapon/hemostat, -/obj/item/weapon/cautery{ +/obj/item/hemostat, +/obj/item/cautery{ pixel_x = 4 }, /turf/open/floor/plasteel/black, @@ -28666,7 +28666,7 @@ /area/quartermaster/storage) "boL" = ( /obj/structure/table, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/black, /area/science/robotics/lab) "boM" = ( @@ -28692,8 +28692,8 @@ "boQ" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/white, /area/science/lab) "boR" = ( @@ -28897,21 +28897,21 @@ /area/crew_quarters/heads/captain) "bpl" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/razor{ +/obj/item/storage/box/matches, +/obj/item/razor{ pixel_x = -4; pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/weapon/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "bpm" = ( /obj/machinery/shower{ dir = 1 }, -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, /obj/effect/landmark/revenantspawn, /obj/structure/curtain, /turf/open/floor/plasteel/freezer, @@ -28970,7 +28970,7 @@ /area/quartermaster/storage) "bpt" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -29088,7 +29088,7 @@ /area/medical/genetics) "bpH" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/radio/headset/headset_medsci, /obj/machinery/requests_console{ department = "Genetics"; @@ -29096,8 +29096,8 @@ name = "Genetics Requests Console"; pixel_y = 30 }, -/obj/item/weapon/storage/pill_bottle/mutadone, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, /turf/open/floor/plasteel/white, /area/medical/genetics) "bpI" = ( @@ -29178,8 +29178,8 @@ /area/science/robotics/lab) "bpS" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -29187,7 +29187,7 @@ /area/science/robotics/lab) "bpT" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/sheet/metal{ amount = 50 }, @@ -29207,7 +29207,7 @@ "bpU" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel, /area/science/robotics/lab) "bpV" = ( @@ -29247,12 +29247,12 @@ /turf/open/floor/plasteel/black, /area/science/robotics/lab) "bpZ" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, /turf/open/floor/plasteel/white, /area/science/lab) "bqa" = ( @@ -29488,10 +29488,10 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ +/obj/item/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -35 @@ -29597,9 +29597,9 @@ /area/medical/medbay/central) "bqR" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/sign/nosmoking_2{ pixel_y = 30 }, @@ -29708,7 +29708,7 @@ /area/medical/genetics) "bra" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /turf/open/floor/plasteel/white, /area/medical/genetics) "brb" = ( @@ -29877,8 +29877,8 @@ id = "robotics2"; name = "robotics lab shutters" }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plating, /area/science/robotics/lab) "brt" = ( @@ -29960,13 +29960,13 @@ /area/science/explab) "brz" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Experimentor Lab"; dir = 2; network = list("SS13","RD") }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /turf/open/floor/plasteel/white/side{ dir = 2 @@ -29974,7 +29974,7 @@ /area/science/explab) "brA" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 6 }, /turf/open/floor/plasteel/white/corner{ @@ -29989,8 +29989,8 @@ /area/science/explab) "brC" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/white, +/obj/item/folder/white, +/obj/item/folder/white, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -30198,8 +30198,8 @@ /area/crew_quarters/heads/hop) "brX" = ( /obj/structure/table, -/obj/item/weapon/storage/box/masks, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/masks, +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, @@ -30280,7 +30280,7 @@ /area/teleporter) "bsi" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -30320,7 +30320,7 @@ pixel_y = 20 }, /obj/structure/closet/crate, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -30553,7 +30553,7 @@ /area/maintenance/starboard) "bsK" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/disks{ +/obj/item/storage/box/disks{ pixel_x = 2; pixel_y = 2 }, @@ -30618,7 +30618,7 @@ /obj/structure/table/optable{ name = "Robotics Operating Table" }, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plating, /area/maintenance/port/fore) "bsV" = ( @@ -30844,7 +30844,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/open/floor/plasteel, /area/quartermaster/office) "btu" = ( @@ -30918,11 +30918,11 @@ /area/crew_quarters/heads/hop) "btD" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "btE" = ( @@ -31511,8 +31511,8 @@ /area/crew_quarters/heads/hop) "buO" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/hop, +/obj/item/folder/blue, +/obj/item/stamp/hop, /turf/open/floor/plasteel, /area/crew_quarters/heads/hop) "buP" = ( @@ -31753,7 +31753,7 @@ pixel_y = 24 }, /obj/structure/table, -/obj/item/weapon/book/manual/medical_cloning{ +/obj/item/book/manual/medical_cloning{ pixel_y = 6 }, /turf/open/floor/plasteel/white, @@ -31894,12 +31894,12 @@ /area/science/research) "bvF" = ( /obj/structure/table, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster, +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, @@ -31908,7 +31908,7 @@ departmentType = 2; pixel_x = -30 }, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plasteel/brown{ dir = 9 }, @@ -32063,7 +32063,7 @@ /area/quartermaster/storage) "bvZ" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -32166,7 +32166,7 @@ /area/crew_quarters/heads/hop) "bwk" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap{ pixel_x = -1; pixel_y = -1 @@ -32229,7 +32229,7 @@ /area/teleporter) "bws" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/teleporter) @@ -32319,11 +32319,11 @@ /area/medical/sleeper) "bwF" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 7; pixel_y = 1 }, @@ -32349,8 +32349,8 @@ dir = 2; network = list("SS13") }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/open/floor/plasteel, /area/medical/sleeper) "bwK" = ( @@ -32373,12 +32373,12 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/medical/genetics) "bwM" = ( @@ -32423,7 +32423,7 @@ /area/science/research) "bwP" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -32700,7 +32700,7 @@ /area/storage/primary) "bxl" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, @@ -32737,8 +32737,8 @@ /area/science/explab) "bxq" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/book/manual/experimentor, +/obj/item/clipboard, +/obj/item/book/manual/experimentor, /turf/open/floor/plasteel/white/corner{ dir = 4 }, @@ -32818,11 +32818,11 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bxB" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table, /turf/open/floor/plasteel/red/side{ dir = 9 @@ -32838,7 +32838,7 @@ }, /area/security/checkpoint/supply) "bxD" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/structure/table, /turf/open/floor/plasteel/red/side{ dir = 1 @@ -33041,7 +33041,7 @@ /area/crew_quarters/heads/hor) "byc" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -33070,8 +33070,8 @@ /area/science/server) "byg" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -33116,12 +33116,12 @@ /area/security/checkpoint/science) "byl" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -33494,7 +33494,7 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/requests_console{ announcementConsole = 0; department = "Medbay"; @@ -33748,7 +33748,7 @@ /area/hallway/primary/central) "bzH" = ( /obj/structure/table, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white/side{ dir = 2 @@ -33757,7 +33757,7 @@ "bzI" = ( /obj/structure/disposalpipe/segment, /obj/structure/table, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /turf/open/floor/plasteel, /area/medical/sleeper) "bzJ" = ( @@ -33769,10 +33769,10 @@ /area/crew_quarters/heads/hor) "bzK" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/medical/sleeper) @@ -33832,7 +33832,7 @@ /area/quartermaster/qm) "bzS" = ( /obj/structure/table, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, /turf/open/floor/plasteel, @@ -33911,7 +33911,7 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bAd" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/machinery/light{ @@ -34074,7 +34074,7 @@ /area/medical/sleeper) "bAt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /turf/open/floor/plasteel, /area/medical/sleeper) "bAu" = ( @@ -34192,7 +34192,7 @@ /area/security/checkpoint/science) "bAH" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -34250,7 +34250,7 @@ "bAL" = ( /obj/structure/table, /obj/item/device/plant_analyzer, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plating, /area/storage/tech) "bAM" = ( @@ -34370,8 +34370,8 @@ /area/medical/sleeper) "bBc" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -34672,7 +34672,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -34807,8 +34807,8 @@ /area/science/server) "bBW" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/science/server) "bBX" = ( @@ -34825,7 +34825,7 @@ }, /area/security/checkpoint/science) "bBZ" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -34842,11 +34842,11 @@ /area/security/checkpoint/science) "bCb" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 6 }, @@ -34891,17 +34891,17 @@ /obj/machinery/light_switch{ pixel_y = -23 }, -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/heads/hor) "bCg" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = 4; pixel_y = 6 }, @@ -34980,7 +34980,7 @@ /area/maintenance/port/aft) "bCo" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -35103,7 +35103,7 @@ /area/maintenance/aft) "bCD" = ( /obj/structure/table, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/white/side{ dir = 2 }, @@ -35126,10 +35126,10 @@ /area/medical/sleeper) "bCG" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/gun/syringe, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/soap/nanotrasen, +/obj/item/folder/white, +/obj/item/gun/syringe, +/obj/item/reagent_containers/dropper, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bCH" = ( @@ -35183,11 +35183,11 @@ /area/medical/sleeper) "bCO" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bCP" = ( @@ -35222,13 +35222,13 @@ /area/medical/sleeper) "bCT" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, /obj/item/clothing/neck/stethoscope, @@ -35264,7 +35264,7 @@ /area/crew_quarters/heads/cmo) "bCX" = ( /obj/effect/decal/cleanable/oil, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -35346,8 +35346,8 @@ /area/science/storage) "bDk" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/requests_console{ department = "Mining"; departmentType = 0; @@ -35406,19 +35406,19 @@ /area/hallway/primary/aft) "bDq" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/key/janitor, /turf/open/floor/plasteel, /area/janitor) "bDr" = ( -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/janitor) @@ -35463,16 +35463,16 @@ /area/storage/tech) "bDw" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /turf/open/floor/plating, /area/storage/tech) "bDx" = ( /obj/structure/table, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /obj/machinery/light/small{ dir = 1 }, @@ -35534,7 +35534,7 @@ pixel_x = -28 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, @@ -35582,8 +35582,8 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bDJ" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel, /area/janitor) "bDK" = ( @@ -35787,7 +35787,7 @@ /area/science/storage) "bEh" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, @@ -35800,15 +35800,15 @@ /area/crew_quarters/heads/cmo) "bEj" = ( /obj/structure/table/glass, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/clothing/neck/stethoscope, /mob/living/simple_animal/pet/cat/Runtime, /turf/open/floor/plasteel/barber, /area/crew_quarters/heads/cmo) "bEk" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/cmo, +/obj/item/folder/white, +/obj/item/stamp/cmo, /obj/item/clothing/glasses/hud/health, /turf/open/floor/plasteel/barber, /area/crew_quarters/heads/cmo) @@ -36176,7 +36176,7 @@ "bEX" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /turf/open/floor/plating, /area/storage/tech) "bEY" = ( @@ -36195,7 +36195,7 @@ pixel_y = 3 }, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plating, /area/storage/tech) "bFa" = ( @@ -36283,8 +36283,8 @@ }, /area/hallway/primary/aft) "bFk" = ( -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/janitor) "bFl" = ( @@ -36430,11 +36430,11 @@ /area/medical/sleeper) "bFC" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -2; pixel_y = 2 }, @@ -36483,7 +36483,7 @@ /area/science/storage) "bFJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bFK" = ( @@ -36511,16 +36511,16 @@ /area/medical/medbay/central) "bFN" = ( /obj/structure/table, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/chemistry{ +/obj/item/cartridge/medical, +/obj/item/cartridge/chemistry{ pixel_y = 2 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -36748,11 +36748,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/aiupload{ +/obj/item/circuitboard/computer/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -36779,36 +36779,36 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/pandemic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/destructive_analyzer, -/obj/item/weapon/circuitboard/machine/protolathe, +/obj/item/circuitboard/machine/destructive_analyzer, +/obj/item/circuitboard/machine/protolathe, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/circuitboard/computer/aifixer, -/obj/item/weapon/circuitboard/computer/teleporter, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, -/obj/item/weapon/circuitboard/machine/mechfab, +/obj/item/circuitboard/computer/aifixer, +/obj/item/circuitboard/computer/teleporter, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/mechfab, /turf/open/floor/plating, /area/storage/tech) "bGx" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/server, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/computer/message_monitor{ +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/server, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/computer/message_monitor{ pixel_y = -5 }, /turf/open/floor/plating, @@ -36818,18 +36818,18 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/mining, -/obj/item/weapon/circuitboard/machine/autolathe{ +/obj/item/circuitboard/computer/mining, +/obj/item/circuitboard/machine/autolathe{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/computer/arcade/battle, +/obj/item/circuitboard/computer/arcade/battle, /turf/open/floor/plating, /area/storage/tech) "bGz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /turf/open/floor/plasteel/white, @@ -36843,15 +36843,15 @@ /area/science/mixing) "bGB" = ( /obj/structure/table, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_y = -29 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel, /area/janitor) "bGC" = ( @@ -37027,18 +37027,18 @@ /area/maintenance/aft) "bGR" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/gun/syringe, +/obj/item/hand_labeler, +/obj/item/gun/syringe, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bGS" = ( /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/weapon/reagent_containers/glass/beaker/synthflesh, +/obj/item/reagent_containers/glass/beaker/synthflesh, /turf/open/floor/plasteel/white, /area/medical/sleeper) "bGT" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/clothing/neck/stethoscope, /obj/machinery/vending/wallmed{ pixel_y = 28 @@ -37312,7 +37312,7 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bHz" = ( -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -37357,15 +37357,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/card{ +/obj/item/circuitboard/computer/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = 5; pixel_y = -5 }, @@ -37442,7 +37442,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -37667,12 +37667,12 @@ /area/science/xenobiology) "bIi" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -37681,7 +37681,7 @@ "bIj" = ( /obj/structure/table, /obj/machinery/light, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, @@ -37696,12 +37696,12 @@ name = "Medbay RC"; pixel_y = -30 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -37717,12 +37717,12 @@ name = "Station Intercom (Medbay)"; pixel_y = -30 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -37731,20 +37731,20 @@ "bIm" = ( /obj/machinery/light, /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 8; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/syringe{ pixel_x = 6; pixel_y = -3 }, @@ -37752,12 +37752,12 @@ /area/medical/sleeper) "bIn" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -37765,7 +37765,7 @@ /area/medical/sleeper) "bIo" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/medbay/central) "bIp" = ( @@ -37935,7 +37935,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bII" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = 29 }, @@ -38160,11 +38160,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/mecha_control{ +/obj/item/circuitboard/computer/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -38176,9 +38176,9 @@ /area/storage/tech) "bJj" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plating, /area/storage/tech) "bJk" = ( @@ -38186,14 +38186,14 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning, -/obj/item/weapon/circuitboard/computer/med_data{ +/obj/item/circuitboard/computer/cloning, +/obj/item/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod, -/obj/item/weapon/circuitboard/computer/scan_consolenew, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/computer/scan_consolenew, /turf/open/floor/plating, /area/storage/tech) "bJl" = ( @@ -38201,15 +38201,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/powermonitor{ +/obj/item/circuitboard/computer/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/stationalert{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -38220,11 +38220,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = 1; pixel_y = -1 }, @@ -38700,8 +38700,8 @@ /turf/open/floor/plasteel, /area/quartermaster/miningdock) "bKk" = ( -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -38726,14 +38726,14 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ pixel_x = 5 }, -/obj/item/weapon/shovel{ +/obj/item/shovel{ pixel_x = -5 }, /turf/open/floor/plasteel, @@ -38776,23 +38776,23 @@ /area/storage/tech) "bKt" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /turf/open/floor/plating, /area/storage/tech) "bKu" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /turf/open/floor/plating, /area/storage/tech) "bKv" = ( @@ -39075,7 +39075,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bKW" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -39324,30 +39324,30 @@ /area/maintenance/port/aft) "bLx" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /turf/open/floor/plating, /area/storage/tech) "bLy" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /turf/open/floor/plating, /area/storage/tech) "bLz" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, /obj/machinery/light/small, /turf/open/floor/plating, /area/storage/tech) @@ -39356,7 +39356,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -39485,7 +39485,7 @@ /area/maintenance/aft) "bLU" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/clothing/neck/stethoscope, /obj/machinery/light/small{ dir = 8 @@ -39608,7 +39608,7 @@ }, /obj/item/stack/cable_coil, /obj/item/device/multitool, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/structure/window/reinforced{ dir = 4 }, @@ -39981,7 +39981,7 @@ /turf/open/space, /area/space) "bNb" = ( -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/structure/lattice, /obj/structure/closet, /turf/open/space, @@ -39998,7 +39998,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /turf/open/floor/plasteel, @@ -40258,13 +40258,13 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = -3 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_x = 4 }, /turf/open/floor/plasteel, @@ -40488,7 +40488,7 @@ /turf/open/floor/plasteel, /area/tcommsat/computer) "bOm" = ( -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/bed, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -40711,7 +40711,7 @@ /area/quartermaster/office) "bOM" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -40751,12 +40751,12 @@ density = 0; pixel_x = -30 }, -/obj/item/weapon/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/infections{ pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, @@ -41062,8 +41062,8 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPA" = ( @@ -41078,8 +41078,8 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPC" = ( @@ -41102,11 +41102,11 @@ /area/science/xenobiology) "bPE" = ( /obj/structure/table, -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPF" = ( @@ -41139,11 +41139,11 @@ pixel_y = -30; receive_ore_updates = 1 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPI" = ( @@ -41152,11 +41152,11 @@ /area/science/xenobiology) "bPJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plasteel/white, /area/science/xenobiology) "bPK" = ( @@ -41213,7 +41213,7 @@ }, /area/maintenance/port/aft) "bPU" = ( -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/port/aft) "bPV" = ( @@ -41262,13 +41262,13 @@ /area/construction) "bQd" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/blue, +/obj/item/folder/blue, +/obj/item/pen/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/tcommsat/computer) "bQe" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/machinery/button/door{ @@ -41474,7 +41474,7 @@ /area/medical/virology) "bQE" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -41588,7 +41588,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/ears/earmuffs, /obj/machinery/camera{ c_tag = "Testing Lab North"; @@ -41663,7 +41663,7 @@ /area/maintenance/starboard/aft) "bRc" = ( /obj/structure/table/wood, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -42216,8 +42216,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/effect/decal/cleanable/cobweb, @@ -42292,10 +42292,10 @@ pixel_y = -24 }, /obj/structure/table, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ @@ -42322,8 +42322,8 @@ pixel_y = -32 }, /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/engine/atmos) @@ -42376,7 +42376,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/t_scanner, /obj/item/device/t_scanner, /obj/item/device/t_scanner, @@ -42622,8 +42622,8 @@ /area/science/xenobiology) "bTf" = ( /obj/structure/rack, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/machinery/computer/security/telescreen{ name = "Test Chamber Monitor"; network = list("Test"); @@ -42843,11 +42843,11 @@ /area/maintenance/port/aft) "bTG" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, @@ -42860,7 +42860,7 @@ /area/security/checkpoint/engineering) "bTH" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/red/side, /area/security/checkpoint/engineering) @@ -42886,8 +42886,8 @@ }, /area/hallway/primary/aft) "bTK" = ( -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/structure/window/reinforced, /turf/open/floor/plasteel/caution{ dir = 6 @@ -43143,12 +43143,12 @@ /area/science/misc_lab) "bUo" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /turf/open/floor/engine, /area/science/misc_lab) "bUp" = ( @@ -43944,7 +43944,7 @@ /area/medical/virology) "bWg" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/radio/headset/headset_med, /turf/open/floor/plasteel/whitegreen/side{ dir = 4 @@ -43969,7 +43969,7 @@ /area/medical/virology) "bWk" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -44292,11 +44292,11 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -44306,11 +44306,11 @@ /area/medical/virology) "bWY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -44400,9 +44400,9 @@ /area/science/misc_lab) "bXi" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, /obj/item/device/taperecorder, /turf/open/floor/plasteel/floorgrime, /area/science/misc_lab) @@ -44445,7 +44445,7 @@ /area/hallway/primary/aft) "bXl" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 6 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -44535,7 +44535,7 @@ /obj/machinery/recharger{ pixel_y = 4 }, -/obj/item/weapon/paper/guides/jobs/security/range, +/obj/item/paper/guides/jobs/security/range, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -45232,7 +45232,7 @@ /area/engine/break_room) "bZh" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, /turf/open/floor/plasteel, /area/science/misc_lab) @@ -45472,7 +45472,7 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/engine/atmos) "bZI" = ( @@ -45545,7 +45545,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -46218,14 +46218,14 @@ /area/maintenance/starboard/aft) "cbh" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cbi" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, @@ -46449,7 +46449,7 @@ /area/engine/atmos) "cbF" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel, /area/engine/atmos) "cbG" = ( @@ -47095,9 +47095,9 @@ /area/solar/port/aft) "ccY" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/kitchen/rollingpin, +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/sugar, /turf/open/floor/plating, /area/maintenance/port/aft) "ccZ" = ( @@ -47192,8 +47192,8 @@ /area/chapel/main) "cdm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper/monitorkey, +/obj/item/clipboard, +/obj/item/paper/monitorkey, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -47593,7 +47593,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -47912,9 +47912,9 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/wrench, -/obj/item/weapon/weldingtool, +/obj/item/storage/belt/utility, +/obj/item/wrench, +/obj/item/weldingtool, /obj/item/clothing/head/welding{ pixel_x = -3; pixel_y = 5 @@ -48024,7 +48024,7 @@ name = "2maintenance loot spawner" }, /obj/item/toy/minimeteor, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/aft) "cfn" = ( @@ -48033,7 +48033,7 @@ dir = 1 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/reagent_containers/food/snacks/donkpocket, +/obj/item/reagent_containers/food/snacks/donkpocket, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/aft) @@ -48045,12 +48045,12 @@ /area/maintenance/aft) "cfp" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/c_tube, +/obj/item/c_tube, /turf/open/floor/plating, /area/maintenance/aft) "cfq" = ( /obj/structure/mopbucket, -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plating, /area/maintenance/aft) "cfr" = ( @@ -48709,12 +48709,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/reagent_containers/pill/patch/silver_sulf, +/obj/item/stock_parts/cell/high/plus, +/obj/item/reagent_containers/pill/patch/silver_sulf, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -48728,7 +48728,7 @@ pixel_x = -5; pixel_y = 6 }, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /turf/open/floor/plasteel, /area/engine/engineering) "cgQ" = ( @@ -49296,7 +49296,7 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 5 }, /obj/item/clothing/gloves/color/black, @@ -49497,7 +49497,7 @@ layer = 2.9 }, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/engineering) "cim" = ( @@ -49515,8 +49515,8 @@ /area/crew_quarters/heads/chief) "cio" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/ce, +/obj/item/folder/yellow, +/obj/item/stamp/ce, /obj/structure/disposalpipe/segment, /obj/effect/landmark/event_spawn, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -49606,7 +49606,7 @@ "ciB" = ( /obj/effect/decal/cleanable/cobweb, /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) "ciC" = ( @@ -49637,7 +49637,7 @@ /area/maintenance/disposal/incinerator) "ciF" = ( /obj/structure/table, -/obj/item/weapon/cartridge/medical, +/obj/item/cartridge/medical, /turf/open/floor/plating, /area/maintenance/aft) "ciG" = ( @@ -49786,9 +49786,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high/plus, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -49946,7 +49946,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cjn" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/floor/plating/airless, /area/space/nearstation) "cjo" = ( @@ -49958,7 +49958,7 @@ dir = 4 }, /obj/structure/reagent_dispensers/fueltank, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) "cjq" = ( @@ -50017,7 +50017,7 @@ /area/maintenance/disposal/incinerator) "cjy" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/aft) "cjz" = ( @@ -50029,7 +50029,7 @@ /area/maintenance/aft) "cjA" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/cigbutt/roach, +/obj/item/cigbutt/roach, /turf/open/floor/plating, /area/maintenance/aft) "cjB" = ( @@ -50037,8 +50037,8 @@ dir = 9 }, /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/science/xenobiology) "cjC" = ( @@ -50212,18 +50212,18 @@ /area/crew_quarters/heads/chief) "cjY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 3 }, -/obj/item/weapon/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -50303,7 +50303,7 @@ /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) "ckj" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 10 }, @@ -50458,7 +50458,7 @@ /obj/structure/table, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -50497,9 +50497,9 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, -/obj/item/weapon/circuitboard/computer/solar_control, -/obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/circuitboard/computer/solar_control, +/obj/item/electronics/tracker, +/obj/item/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -50537,9 +50537,9 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, -/obj/item/weapon/circuitboard/computer/solar_control, -/obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/circuitboard/computer/solar_control, +/obj/item/electronics/tracker, +/obj/item/paper/guides/jobs/engi/solars, /turf/open/floor/plasteel, /area/engine/engineering) "ckK" = ( @@ -50757,11 +50757,11 @@ pixel_y = -29 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/disposal/incinerator) "clh" = ( @@ -51032,8 +51032,8 @@ /area/shuttle/syndicate) "clM" = ( /obj/structure/table, -/obj/item/weapon/crowbar/large, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/crowbar/large, +/obj/item/storage/box/lights/mixed, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel/yellow/side{ @@ -51067,11 +51067,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/engineering_construction, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel/yellow/corner{ dir = 1 @@ -51381,7 +51381,7 @@ "cmH" = ( /obj/structure/table, /obj/item/stack/cable_coil, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "cmI" = ( @@ -51392,7 +51392,7 @@ /area/engine/engineering) "cmJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/zipties{ +/obj/item/storage/box/zipties{ pixel_x = 1; pixel_y = 2 }, @@ -51599,7 +51599,7 @@ icon_state = "pipe-c" }, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/open/floor/plating, /area/maintenance/aft) "cnh" = ( @@ -51789,20 +51789,20 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/apc, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel, /area/engine/engineering) "cnB" = ( @@ -51876,23 +51876,23 @@ /area/maintenance/starboard/aft) "cnI" = ( /obj/structure/table, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -5 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 3; pixel_y = 3 }, @@ -52139,12 +52139,12 @@ /area/engine/engineering) "cod" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -52230,11 +52230,11 @@ /area/shuttle/syndicate) "coo" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "cop" = ( @@ -52405,13 +52405,13 @@ /area/engine/engine_smes) "coD" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "coE" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -52421,7 +52421,7 @@ /area/shuttle/syndicate) "coF" = ( /obj/structure/table, -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -52522,8 +52522,8 @@ /area/shuttle/syndicate) "coO" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "coP" = ( @@ -52539,12 +52539,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -52560,12 +52560,12 @@ /area/shuttle/syndicate) "coS" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -52591,8 +52591,8 @@ /area/science/misc_lab) "coU" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "coV" = ( @@ -52615,11 +52615,11 @@ /area/shuttle/syndicate) "coX" = ( /obj/structure/table, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /turf/open/floor/mineral/plastitanium, @@ -52681,11 +52681,11 @@ /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "cpg" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 4 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = -4 }, /obj/structure/table, @@ -52782,8 +52782,8 @@ /area/engine/engineering) "cpr" = ( /obj/structure/table, -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "cps" = ( @@ -52802,7 +52802,7 @@ "cpt" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_y = 5 }, /turf/open/floor/plasteel, @@ -52838,8 +52838,8 @@ /area/engine/engineering) "cpw" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "cpx" = ( @@ -52911,7 +52911,7 @@ /area/engine/engineering) "cpF" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "cpG" = ( @@ -52965,7 +52965,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_2) "cpL" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -53033,7 +53033,7 @@ name = "Station Intercom (General)"; pixel_y = -35 }, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -53082,7 +53082,7 @@ /area/maintenance/port/aft) "cpZ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = 5 }, /obj/item/device/flashlight{ @@ -53372,22 +53372,22 @@ /area/engine/supermatter) "cqG" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, @@ -53396,7 +53396,7 @@ }, /area/ai_monitored/security/armory) "cqH" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plating, /area/engine/engineering) "cqI" = ( @@ -53447,13 +53447,13 @@ pixel_y = -7 }, /obj/item/stack/cable_coil, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plasteel, /area/engine/engineering) "cqP" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/clothing/ears/earmuffs{ pixel_x = -3; pixel_y = -2 @@ -53502,7 +53502,7 @@ /area/engine/engineering) "cqW" = ( /obj/machinery/power/rad_collector/anchored, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -53624,8 +53624,8 @@ /area/maintenance/port/aft) "crm" = ( /obj/structure/table, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/box/matches, +/obj/item/storage/fancy/cigarettes, /turf/open/floor/plating, /area/maintenance/port/aft) "crn" = ( @@ -54106,7 +54106,7 @@ /area/space) "csy" = ( /obj/structure/table, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -54133,7 +54133,7 @@ /turf/open/floor/plating, /area/engine/supermatter) "csB" = ( -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/structure/lattice, /turf/open/space, /area/space/nearstation) @@ -54262,7 +54262,7 @@ /turf/open/floor/engine, /area/engine/engineering) "csS" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/space, /area/space/nearstation) "csT" = ( @@ -54440,14 +54440,14 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_x = 3 }, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -54466,7 +54466,7 @@ /obj/item/device/radio/off{ pixel_y = 4 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /turf/open/floor/plasteel/vault{ @@ -54761,7 +54761,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -54808,8 +54808,8 @@ "cuh" = ( /obj/machinery/atmospherics/pipe/simple/yellow/visible, /obj/structure/rack, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar/red, +/obj/item/wrench, +/obj/item/crowbar/red, /obj/item/clothing/head/welding, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/atmos) @@ -55150,11 +55150,11 @@ pixel_x = 24 }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/multitool, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -55588,8 +55588,8 @@ /area/ai_monitored/turret_protected/ai) "cvB" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /turf/open/floor/plating, /area/ai_monitored/turret_protected/aisat/hallway) "cvC" = ( @@ -55621,7 +55621,7 @@ "cvG" = ( /obj/machinery/porta_turret/ai{ dir = 4; - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /obj/machinery/light{ dir = 8 @@ -55651,7 +55651,7 @@ "cvJ" = ( /obj/machinery/porta_turret/ai{ dir = 4; - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /obj/machinery/light{ dir = 4 @@ -55867,11 +55867,11 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -55913,7 +55913,7 @@ /area/ai_monitored/turret_protected/ai) "cwm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) "cwn" = ( @@ -56013,7 +56013,7 @@ "cwy" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table_frame, -/obj/item/weapon/wirerod, +/obj/item/wirerod, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -56106,12 +56106,12 @@ /area/shuttle/escape) "cwG" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/crowbar, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cwH" = ( @@ -56143,12 +56143,12 @@ /area/shuttle/escape) "cwM" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = 3; pixel_y = -3 }, @@ -56246,12 +56246,12 @@ /area/shuttle/escape) "cxb" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cxc" = ( @@ -56404,7 +56404,7 @@ /turf/open/floor/plating, /area/shuttle/transport) "cxx" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -56574,12 +56574,12 @@ /area/shuttle/escape) "cxT" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -56700,7 +56700,7 @@ /area/shuttle/abandoned) "cyj" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/structure/light_construct{ dir = 1 }, @@ -56856,7 +56856,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "cyI" = ( -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, @@ -56864,11 +56864,11 @@ /area/shuttle/abandoned) "cyJ" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cyK" = ( @@ -56923,7 +56923,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cyP" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/titanium, @@ -56998,7 +56998,7 @@ /area/shuttle/abandoned) "cyW" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -57011,7 +57011,7 @@ /area/shuttle/abandoned) "cyY" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cyZ" = ( @@ -57046,7 +57046,7 @@ /area/shuttle/abandoned) "cze" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "czf" = ( @@ -57097,7 +57097,7 @@ /area/shuttle/abandoned) "czm" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced{ dir = 1 }, @@ -57179,12 +57179,12 @@ }, /area/shuttle/syndicate) "czA" = ( -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "czB" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -57239,7 +57239,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "czI" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/lattice/catwalk, /turf/open/space, /area/space/nearstation) @@ -57272,7 +57272,7 @@ /obj/item/device/radio/intercom{ pixel_y = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -57413,7 +57413,7 @@ /area/maintenance/starboard/aft) "cAa" = ( /obj/structure/chair, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -57673,19 +57673,19 @@ /area/maintenance/port/aft) "cAD" = ( /obj/structure/table, -/obj/item/weapon/kitchen/knife, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/kitchen/knife, +/obj/item/storage/box/donkpockets, /turf/open/floor/plating, /area/maintenance/port/aft) "cAE" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/mint{ +/obj/item/reagent_containers/food/snacks/mint{ pixel_y = 9 }, /turf/open/floor/plating, @@ -57986,7 +57986,7 @@ /area/quartermaster/storage) "cBj" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -58214,8 +58214,8 @@ "cBM" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/stock_parts/cell/high/plus, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel, /area/crew_quarters/heads/chief) "cBN" = ( @@ -58385,7 +58385,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cCh" = ( -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /mob/living/simple_animal/bot/secbot/beepsky{ name = "Officer Beepsky" }, @@ -58446,26 +58446,26 @@ /area/quartermaster/storage) "cCp" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel, /area/medical/sleeper) "cCq" = ( @@ -58748,12 +58748,12 @@ icon_state = "4-8" }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/stripes/line{ dir = 1 }, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /turf/open/floor/engine, /area/engine/engineering) "cDi" = ( @@ -58944,7 +58944,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cDC" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 }, @@ -59490,7 +59490,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /turf/open/floor/plating, /area/engine/supermatter) "cEN" = ( @@ -60046,7 +60046,7 @@ /area/engine/engineering) "cGj" = ( /obj/structure/table, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel/black, /area/engine/engineering) "cGk" = ( @@ -60481,7 +60481,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cHs" = ( -/obj/item/weapon/crowbar/large, +/obj/item/crowbar/large, /turf/open/floor/plating, /area/engine/engineering) "cHt" = ( @@ -60709,7 +60709,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/sheet/metal{ amount = 50 }, @@ -60773,7 +60773,7 @@ /area/science/robotics/lab) "cHX" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -60896,7 +60896,7 @@ /area/shuttle/syndicate) "cIn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -60930,7 +60930,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -60978,7 +60978,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -61024,7 +61024,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -61036,11 +61036,11 @@ /area/shuttle/syndicate) "cIK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -61253,8 +61253,8 @@ }, /area/shuttle/syndicate) "cJl" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -61438,33 +61438,33 @@ }, /area/shuttle/syndicate) "cJR" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -61496,18 +61496,18 @@ }, /area/shuttle/syndicate) "cJW" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "cJX" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -61519,7 +61519,7 @@ }, /area/shuttle/syndicate) "cJY" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -61546,7 +61546,7 @@ }, /area/shuttle/syndicate) "cKa" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -61695,9 +61695,9 @@ /area/shuttle/syndicate) "cKD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -61776,12 +61776,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -61789,12 +61789,12 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "cKU" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -61821,22 +61821,22 @@ }, /area/shuttle/syndicate) "cKZ" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -61864,8 +61864,8 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "cLd" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -61919,8 +61919,8 @@ }, /area/shuttle/syndicate) "cLk" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -61928,14 +61928,14 @@ /area/shuttle/syndicate) "cLl" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "cLm" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 diff --git a/_maps/map_files/Cerestation/cerestation.dmm b/_maps/map_files/Cerestation/cerestation.dmm index e7aa0f7adb9..c8cf1fa6a7b 100644 --- a/_maps/map_files/Cerestation/cerestation.dmm +++ b/_maps/map_files/Cerestation/cerestation.dmm @@ -97,7 +97,7 @@ /area/shuttle/syndicate) "aas" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -184,7 +184,7 @@ /turf/open/floor/plasteel/black, /area/shuttle/syndicate) "aaE" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09" }, /turf/open/floor/plasteel/black{ @@ -355,7 +355,7 @@ "aaY" = ( /obj/structure/table, /obj/item/stack/cable_coil, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/machinery/light{ dir = 8 }, @@ -363,7 +363,7 @@ /area/shuttle/syndicate) "aaZ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/zipties{ +/obj/item/storage/box/zipties{ pixel_x = 1; pixel_y = 2 }, @@ -684,13 +684,13 @@ "abG" = ( /obj/machinery/light/small, /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/floorgrime, /area/maintenance/asteroid/disposal/north) "abH" = ( /obj/structure/rack, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plasteel/floorgrime, /area/maintenance/asteroid/disposal/north) "abI" = ( @@ -803,9 +803,9 @@ /area/shuttle/syndicate) "abU" = ( /obj/structure/closet/syndicate/nuclear, -/obj/item/weapon/pickaxe/mini, -/obj/item/weapon/pickaxe/mini, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plasteel/black, /area/shuttle/syndicate) "abV" = ( @@ -839,7 +839,7 @@ }, /area/ai_monitored/turret_protected/ai) "aca" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09" }, /turf/open/floor/circuit{ @@ -994,23 +994,23 @@ /area/ai_monitored/turret_protected/ai) "acq" = ( /obj/structure/table, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -5 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 3; pixel_y = 3 }, @@ -1315,16 +1315,16 @@ /area/shuttle/syndicate) "acY" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/black, /area/shuttle/syndicate) "acZ" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -1334,7 +1334,7 @@ /area/shuttle/syndicate) "ada" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /turf/open/floor/plasteel/black, /area/shuttle/syndicate) @@ -1354,7 +1354,7 @@ /area/shuttle/syndicate) "adc" = ( /obj/structure/table, -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -1422,8 +1422,8 @@ /area/shuttle/syndicate) "adl" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/machinery/light{ dir = 4 }, @@ -1468,7 +1468,7 @@ "ads" = ( /obj/machinery/porta_turret/ai{ dir = 4; - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /obj/machinery/light{ dir = 8 @@ -1505,7 +1505,7 @@ "adv" = ( /obj/machinery/porta_turret/ai{ dir = 4; - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /obj/machinery/light{ dir = 4 @@ -1561,11 +1561,11 @@ }, /area/ai_monitored/security/armory) "adA" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 4 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = -4 }, /obj/structure/table, @@ -1578,11 +1578,11 @@ /area/ai_monitored/security/armory) "adB" = ( /obj/structure/table, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 1; pixel_y = 5 }, @@ -1720,12 +1720,12 @@ /area/ai_monitored/security/armory) "adR" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -1738,13 +1738,13 @@ }, /area/ai_monitored/security/armory) "adS" = ( -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/open/floor/plating/asteroid, /area/security/transfer) "adT" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/armor/laserproof, /obj/structure/window/reinforced{ dir = 1 @@ -1859,7 +1859,7 @@ }, /area/ai_monitored/turret_protected/ai) "aeg" = ( -/obj/item/weapon/coin/antagtoken, +/obj/item/coin/antagtoken, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -1904,12 +1904,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -1919,12 +1919,12 @@ /area/shuttle/syndicate) "aem" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -1942,11 +1942,11 @@ /area/shuttle/syndicate) "aeo" = ( /obj/structure/table, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /turf/open/floor/plasteel/black, @@ -1966,12 +1966,12 @@ /area/security/prison) "aer" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -2093,8 +2093,8 @@ /area/ai_monitored/turret_protected/ai) "aeE" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/machinery/light{ dir = 8 }, @@ -2236,23 +2236,23 @@ /area/tcommsat/computer) "aeS" = ( /obj/structure/table, -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/shuttle/syndicate) "aeT" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/shuttle/syndicate) "aeU" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2312,12 +2312,12 @@ /area/security/prison) "afe" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = 3; pixel_y = -3 }, @@ -2328,8 +2328,8 @@ /area/ai_monitored/security/armory) "aff" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/dragnet, -/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/orange{ d1 = 1; @@ -2516,21 +2516,21 @@ /area/security/prison) "afy" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, @@ -2640,7 +2640,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel{ @@ -2669,7 +2669,7 @@ /area/tcommsat/computer) "afN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -2679,7 +2679,7 @@ /area/tcommsat/computer) "afO" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -2744,7 +2744,7 @@ }, /area/ai_monitored/turret_protected/aisat/hallway) "afV" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09" }, /turf/open/floor/plasteel/black{ @@ -2980,7 +2980,7 @@ icon_state = "pipe-c" }, /obj/structure/reagent_dispensers/fueltank, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3407,7 +3407,7 @@ /area/security/prison) "ahc" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 2"; dir = 10; @@ -3685,7 +3685,7 @@ /area/security/prison) "ahI" = ( /obj/machinery/holopad, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3790,7 +3790,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -3901,7 +3901,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -4114,7 +4114,7 @@ /area/security/prison) "aiy" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 5"; dir = 10; @@ -4129,7 +4129,7 @@ /area/security/prison) "aiz" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plating/asteroid, /area/security/transfer) "aiA" = ( @@ -4382,7 +4382,7 @@ /area/security/prison) "ajf" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -4527,7 +4527,7 @@ /area/security/prison) "ajr" = ( /obj/structure/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating/asteroid, /area/security/transfer) "ajs" = ( @@ -4550,7 +4550,7 @@ /area/maintenance/asteroid/fore/com_north) "aju" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating, /area/maintenance/asteroid/fore/com_east) "ajv" = ( @@ -4780,7 +4780,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/sign/poster/contraband/communist_state{ pixel_y = 32 }, @@ -5216,7 +5216,7 @@ /area/security/prison) "akN" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -5309,7 +5309,7 @@ /obj/machinery/shower{ pixel_y = 24 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -5474,7 +5474,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless; icon_plating = "asteroid_dug"; @@ -5495,9 +5495,9 @@ /area/security/prison) "alu" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/emergency, -/obj/item/weapon/shovel, -/obj/item/weapon/storage/bag/ore, +/obj/item/pickaxe/emergency, +/obj/item/shovel, +/obj/item/storage/bag/ore, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -5529,8 +5529,8 @@ /area/maintenance/asteroid/fore/com_north) "alz" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/stamp/captain, +/obj/item/paper_bin, +/obj/item/stamp/captain, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -5555,7 +5555,7 @@ }, /area/crew_quarters/heads/captain) "alC" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_y = 32 }, /turf/open/floor/wood{ @@ -5581,7 +5581,7 @@ }, /area/crew_quarters/heads/captain) "alF" = ( -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6188,11 +6188,11 @@ /area/quartermaster/sorting) "amK" = ( /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6365,7 +6365,7 @@ /area/security/prison) "anb" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 3"; dir = 10; @@ -6477,8 +6477,8 @@ /area/crew_quarters/heads/captain) "anj" = ( /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6491,7 +6491,7 @@ /area/crew_quarters/heads/captain) "anl" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6619,7 +6619,7 @@ /area/quartermaster/miningdock) "anA" = ( /obj/structure/rack, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -6895,7 +6895,7 @@ /area/crew_quarters/heads/captain) "aoc" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -6986,7 +6986,7 @@ /area/crew_quarters/heads/captain) "aok" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /obj/machinery/camera{ c_tag = "Captain's Office" }, @@ -6996,7 +6996,7 @@ /area/crew_quarters/heads/captain) "aol" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7204,7 +7204,7 @@ /area/quartermaster/miningdock) "aoK" = ( /obj/structure/closet/crate, -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7411,7 +7411,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/melee/chainofcommand, +/obj/item/melee/chainofcommand, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7574,7 +7574,7 @@ dir = 4; network = list("SS13") }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7698,7 +7698,7 @@ dir = 9; network = list("SS13") }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7757,14 +7757,14 @@ /area/crew_quarters/dorms/female) "apN" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/dorms/female) "apO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7784,7 +7784,7 @@ /area/crew_quarters/dorms/female) "apQ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -7827,7 +7827,7 @@ "apV" = ( /obj/structure/table/wood, /obj/structure/window/reinforced, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7835,7 +7835,7 @@ "apW" = ( /obj/structure/window/reinforced, /obj/machinery/computer/card, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -7880,7 +7880,7 @@ /area/crew_quarters/heads/captain) "aqb" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, @@ -7907,7 +7907,7 @@ /obj/structure/chair{ dir = 1 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -24 }, /obj/item/device/radio/intercom{ @@ -8134,7 +8134,7 @@ /area/crew_quarters/dorms/female) "aqF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8152,7 +8152,7 @@ /area/crew_quarters/dorms/female) "aqH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8160,7 +8160,7 @@ /area/crew_quarters/dorms/female) "aqI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8220,7 +8220,7 @@ /area/crew_quarters/heads/captain) "aqP" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 8; pixel_y = 6 }, @@ -8258,7 +8258,7 @@ /area/shuttle/pod_1) "aqT" = ( /obj/structure/closet/crate, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8593,7 +8593,7 @@ c_tag = "Dorm Commons North"; dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel{ @@ -8747,7 +8747,7 @@ /area/crew_quarters/heads/captain) "arN" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -8913,12 +8913,12 @@ /area/shuttle/mining) "ash" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = 3; pixel_y = -3 }, @@ -8934,15 +8934,15 @@ /area/security/main) "asj" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/dragnet, -/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/armory) "ask" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9125,11 +9125,11 @@ /area/maintenance/asteroid/fore/com_north) "asE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cmo, +/obj/item/bedsheet/cmo, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -28 }, /turf/open/floor/carpet{ @@ -9153,7 +9153,7 @@ /area/crew_quarters/heads/cmo/private) "asH" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9207,7 +9207,7 @@ /area/bridge) "asP" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9229,7 +9229,7 @@ /area/crew_quarters/heads/chief/private) "asS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/ce, +/obj/item/bedsheet/ce, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -9371,9 +9371,9 @@ /area/quartermaster/miningdock) "atf" = ( /obj/structure/rack, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/item/storage/toolbox/mechanical, /obj/machinery/button/door{ id = "MiningWarehouse"; name = "Mining Warehouse Shutters"; @@ -9425,21 +9425,21 @@ /area/security/processing) "atm" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, @@ -9450,12 +9450,12 @@ /area/security/armory) "atn" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = 3; pixel_y = -3 }, @@ -9466,7 +9466,7 @@ /area/security/armory) "ato" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9478,7 +9478,7 @@ dir = 4; network = list("SS13") }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9558,7 +9558,7 @@ dir = 9; network = list("SS13") }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9602,7 +9602,7 @@ /area/crew_quarters/locker) "atC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -9772,7 +9772,7 @@ /area/crew_quarters/heads/chief/private) "atW" = ( /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet{ @@ -9914,9 +9914,9 @@ /area/quartermaster/miningdock) "auk" = ( /obj/structure/closet/crate, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -10112,7 +10112,7 @@ /area/crew_quarters/locker) "auF" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -10137,7 +10137,7 @@ /area/crew_quarters/locker) "auI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -10149,7 +10149,7 @@ /area/crew_quarters/dorms/female) "auJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -10160,7 +10160,7 @@ /area/crew_quarters/dorms/female) "auK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -10218,7 +10218,7 @@ name = "Station Intercom (General)"; pixel_y = 20 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/darkblue/side{ icon_state = "darkblue"; dir = 1; @@ -10603,7 +10603,7 @@ /area/security/processing) "avA" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -10780,21 +10780,21 @@ /area/crew_quarters/dorms/female) "avT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/dorms/female) "avU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/dorms/female) "avV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -10874,8 +10874,8 @@ /obj/item/clothing/under/rank/chief_medical_officer, /obj/item/clothing/suit/toggle/labcoat/cmo, /obj/item/clothing/gloves/color/latex/nitrile, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/backpack/medic, +/obj/item/storage/belt/medical, +/obj/item/storage/backpack/medic, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -10959,7 +10959,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11006,7 +11006,7 @@ }, /obj/item/clothing/shoes/sneakers/brown/ce, /obj/item/clothing/under/rank/chief_engineer, -/obj/item/weapon/storage/backpack/industrial, +/obj/item/storage/backpack/industrial, /obj/item/clothing/gloves/color/black/ce, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -11455,9 +11455,9 @@ /area/shuttle/labor) "axu" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -11578,7 +11578,7 @@ dir = 4; network = list("SS13") }, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11825,7 +11825,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel{ @@ -11851,14 +11851,14 @@ /area/crew_quarters/dorms/male) "ayf" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/dorms/male) "ayg" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/effect/landmark/start/assistant, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -11866,7 +11866,7 @@ /area/crew_quarters/dorms/male) "ayh" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11878,11 +11878,11 @@ /area/crew_quarters/heads/hos/private) "ayj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -28 }, /turf/open/floor/carpet{ @@ -11906,7 +11906,7 @@ /area/crew_quarters/heads/hos/private) "aym" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11942,7 +11942,7 @@ }, /area/bridge) "ayr" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/darkblue{ @@ -12010,7 +12010,7 @@ /area/crew_quarters/heads/hor/private) "ayz" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12032,7 +12032,7 @@ /area/crew_quarters/heads/hor/private) "ayC" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -12067,7 +12067,7 @@ /area/maintenance/asteroid/fore/com_east) "ayG" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12247,7 +12247,7 @@ /area/quartermaster/miningdock) "ayX" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -12414,8 +12414,8 @@ /area/security/brig) "azo" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/folder/red, +/obj/item/folder, +/obj/item/folder/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12516,7 +12516,7 @@ /area/crew_quarters/locker) "azw" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12526,7 +12526,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12564,7 +12564,7 @@ /area/crew_quarters/dorms/male) "azC" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12572,7 +12572,7 @@ /area/crew_quarters/dorms/male) "azD" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12580,7 +12580,7 @@ /area/crew_quarters/dorms/male) "azE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /obj/structure/window, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -12740,7 +12740,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet{ @@ -12907,7 +12907,7 @@ /area/quartermaster/miningdock) "aAm" = ( /obj/structure/table, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -12952,7 +12952,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -13138,7 +13138,7 @@ /area/security/brig) "aAJ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -13412,8 +13412,8 @@ /area/maintenance/asteroid/fore/com_east) "aBm" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -13566,7 +13566,7 @@ /area/security/courtroom) "aBA" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5; pixel_y = 5 }, @@ -13576,15 +13576,15 @@ /area/security/courtroom) "aBB" = ( /obj/structure/table/wood, -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/courtroom) "aBC" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -13781,7 +13781,7 @@ /area/bridge) "aBY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light, /turf/open/floor/plasteel/darkblue/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -13867,7 +13867,7 @@ /obj/item/clothing/under/rank/research_director/turtleneck, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/toggle/labcoat, -/obj/item/weapon/storage/backpack/science, +/obj/item/storage/backpack/science, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -14303,7 +14303,7 @@ /area/security/brig) "aCU" = ( /obj/structure/closet/secure_closet/courtroom, -/obj/item/weapon/gavelhammer, +/obj/item/gavelhammer, /obj/effect/decal/cleanable/cobweb, /obj/machinery/light{ dir = 8 @@ -15073,7 +15073,7 @@ /area/security/courtroom) "aEk" = ( /obj/structure/table/wood, -/obj/item/weapon/gavelblock, +/obj/item/gavelblock, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15190,7 +15190,7 @@ /area/crew_quarters/locker) "aEv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -15202,7 +15202,7 @@ /area/crew_quarters/dorms/male) "aEw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -15213,7 +15213,7 @@ /area/crew_quarters/dorms/male) "aEx" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/structure/window{ icon_state = "window"; dir = 1 @@ -15393,7 +15393,7 @@ /area/bridge) "aEN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -15413,7 +15413,7 @@ /area/bridge) "aEO" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -15461,7 +15461,7 @@ /area/quartermaster/qm/private) "aES" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15481,11 +15481,11 @@ /area/quartermaster/qm/private) "aEV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/qm, +/obj/item/bedsheet/qm, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet{ @@ -15520,11 +15520,11 @@ /area/quartermaster/office) "aEZ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/fourcolor, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -15552,7 +15552,7 @@ /area/quartermaster/office) "aFd" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/hand_labeler_refill, /obj/item/hand_labeler_refill, /obj/item/stack/packageWrap, @@ -16060,7 +16060,7 @@ /area/security/courtroom) "aFK" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 6; @@ -16136,7 +16136,7 @@ /area/crew_quarters/dorms/male) "aFV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -16154,14 +16154,14 @@ /area/crew_quarters/dorms/male) "aFX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/dorms/male) "aFY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -16522,8 +16522,8 @@ /area/quartermaster/office) "aGz" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/stamp/denied{ +/obj/item/folder, +/obj/item/stamp/denied{ pixel_x = 5; pixel_y = 3 }, @@ -16534,14 +16534,14 @@ }, /obj/item/stack/packageWrap, /obj/item/device/destTagger, -/obj/item/weapon/stamp, +/obj/item/stamp, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/quartermaster/office) "aGA" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/noticeboard{ pixel_y = 32 }, @@ -16754,7 +16754,7 @@ /area/security/courtroom) "aGW" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 9; @@ -16905,7 +16905,7 @@ }, /obj/item/clothing/shoes/sneakers/brown/qm, /obj/item/clothing/under/rank/cargo, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /obj/item/clothing/gloves/color/black, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -17046,7 +17046,7 @@ /area/maintenance/asteroid/fore/com_west) "aHA" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -17347,7 +17347,7 @@ /area/crew_quarters/locker) "aIh" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -17369,7 +17369,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_y = 32 }, /turf/open/floor/carpet{ @@ -17466,7 +17466,7 @@ /area/bridge) "aIr" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -17519,7 +17519,7 @@ /area/bridge) "aIw" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/darkblue/side{ @@ -17680,7 +17680,7 @@ /area/lawoffice) "aIN" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/orange{ d1 = 1; @@ -17805,7 +17805,7 @@ /area/security/courtroom) "aIY" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/vault{ dir = 5; initial_gas_mix = "n2=500;TEMP=80"; @@ -18140,11 +18140,11 @@ pixel_y = -32 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -18183,7 +18183,7 @@ dir = 4 }, /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/asteroid, @@ -18201,8 +18201,8 @@ /area/security/detectives_office) "aJN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/evidence, +/obj/item/hand_labeler, /obj/item/hand_labeler_refill{ pixel_x = 3; pixel_y = 2 @@ -18593,11 +18593,11 @@ /area/security/detectives_office) "aKB" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 8; pixel_y = 6 }, @@ -18665,7 +18665,7 @@ /area/security/brig) "aKH" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -18764,7 +18764,7 @@ /area/crew_quarters/locker) "aKR" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -18785,7 +18785,7 @@ /area/crew_quarters/heads/hop) "aKU" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 8; pixel_y = 6 }, @@ -18816,8 +18816,8 @@ /area/crew_quarters/heads/hop) "aKX" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/stamp/hop, +/obj/item/paper_bin, +/obj/item/stamp/hop, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -18853,7 +18853,7 @@ }, /area/crew_quarters/heads/hop) "aLa" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/darkblue/side{ @@ -18928,7 +18928,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/darkblue/side{ @@ -19182,7 +19182,7 @@ "aLE" = ( /obj/structure/table/wood, /obj/item/device/camera/detective, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -19204,19 +19204,19 @@ /area/maintenance/asteroid/fore/com_west) "aLG" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/detectives_office) "aLH" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -19247,11 +19247,11 @@ /area/lawoffice) "aLK" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/disposalpipe/segment, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -19335,7 +19335,7 @@ }, /area/crew_quarters/locker) "aLT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/neutral/side{ @@ -19449,7 +19449,7 @@ /area/bridge) "aMe" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -19560,7 +19560,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper/guides/quantumpad, +/obj/item/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -19592,7 +19592,7 @@ /obj/structure/rack, /obj/item/clothing/suit/space/fragile, /obj/item/clothing/head/helmet/space/fragile, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -19724,11 +19724,11 @@ /area/security/detectives_office) "aMD" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -19817,7 +19817,7 @@ /area/security/brig) "aMM" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/plasteel/vault{ dir = 5; initial_gas_mix = "n2=500;TEMP=80"; @@ -20209,7 +20209,7 @@ /obj/structure/table, /obj/item/device/multitool, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -21887,7 +21887,7 @@ /area/maintenance/asteroid/fore/com_west) "aPT" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -22356,7 +22356,7 @@ "aQN" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -23259,7 +23259,7 @@ "aSp" = ( /obj/structure/disposalpipe/segment, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -23359,7 +23359,7 @@ pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -23381,7 +23381,7 @@ dir = 8; pixel_x = 27 }, -/obj/item/weapon/paper/guides/quantumpad, +/obj/item/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; @@ -23499,7 +23499,7 @@ /area/janitor) "aSJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -23508,7 +23508,7 @@ name = "Station Intercom (General)"; pixel_y = 20 }, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -23521,7 +23521,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/paper/fluff/stations/cere/janitor, +/obj/item/paper/fluff/stations/cere/janitor, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -23576,7 +23576,7 @@ /area/ai_monitored/nuke_storage) "aSQ" = ( /obj/structure/table, -/obj/item/weapon/phone, +/obj/item/phone, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -23584,7 +23584,7 @@ /area/ai_monitored/nuke_storage) "aSR" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -24208,8 +24208,8 @@ }, /area/janitor) "aTZ" = ( -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -24282,7 +24282,7 @@ /area/hallway/primary/fore) "aUg" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -24408,11 +24408,11 @@ /area/maintenance/asteroid/fore/com_south) "aUt" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/key/janitor, /obj/machinery/camera{ c_tag = "Custodials"; @@ -24425,28 +24425,28 @@ /area/janitor) "aUu" = ( /obj/structure/table, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_y = -29 }, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/janitor) "aUv" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/light, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -24878,7 +24878,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/machinery/camera{ c_tag = "Vault" }, @@ -24889,11 +24889,11 @@ /area/ai_monitored/nuke_storage) "aVo" = ( /obj/structure/safe, -/obj/item/weapon/twohanded/fireaxe, +/obj/item/twohanded/fireaxe, /obj/item/clothing/head/bearpelt, /obj/item/bear_armor, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/dice/d20{ +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/dice/d20{ desc = "A die with twenty sides. You feel absolutely normal while looking at this."; name = "Die of Mediocre Rolling Capability" }, @@ -25162,7 +25162,7 @@ /area/maintenance/solars/asteroid/command) "aVM" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -25172,23 +25172,23 @@ /turf/open/space, /area/space) "aVO" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -25206,7 +25206,7 @@ /area/ai_monitored/nuke_storage) "aVQ" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /obj/machinery/light{ dir = 4 }, @@ -25559,7 +25559,7 @@ }, /area/maintenance/solars/asteroid/command) "aWu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09" }, /turf/open/floor/circuit, @@ -26356,10 +26356,10 @@ /area/crew_quarters/rehab_dome) "aYc" = ( /obj/structure/table/wood, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/reagent_containers/glass/bucket, +/obj/item/storage/bag/plants/portaseeder, /turf/open/floor/grass{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -28113,8 +28113,8 @@ "bbD" = ( /obj/machinery/light/small, /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, -/obj/item/weapon/storage/belt/bandolier, +/obj/item/gun/ballistic/revolver/doublebarrel, +/obj/item/storage/belt/bandolier, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -28212,7 +28212,7 @@ dir = 8; network = list("SS13") }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -28833,8 +28833,8 @@ /area/hallway/primary/port) "bcZ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /obj/machinery/light{ dir = 1 }, @@ -28844,14 +28844,14 @@ /area/crew_quarters/bar) "bda" = ( /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; pixel_y = 20 }, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -29094,7 +29094,7 @@ /area/hallway/primary/central) "bdy" = ( /obj/structure/rack, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -29104,7 +29104,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -30356,7 +30356,7 @@ c_tag = "Rehabilitation Dome Lobby South"; dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -31419,14 +31419,14 @@ /area/crew_quarters/kitchen) "bhH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/kitchen) "bhI" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -31474,7 +31474,7 @@ /area/maintenance/asteroid/port/neast) "bhN" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -31565,7 +31565,7 @@ /area/ai_monitored/storage/eva) "bhY" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -31575,7 +31575,7 @@ /area/ai_monitored/storage/eva) "bhZ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 6; @@ -31752,7 +31752,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/bar{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -31785,8 +31785,8 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 5 }, /turf/open/floor/plasteel/bar{ @@ -31847,14 +31847,14 @@ /area/crew_quarters/kitchen) "biB" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker, +/obj/item/reagent_containers/food/condiment/saltshaker, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/kitchen) "biC" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -31968,24 +31968,24 @@ /area/medical/patients_rooms) "biQ" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/medical/surgery) "biR" = ( /obj/structure/table, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/medical/surgery) "biS" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/machinery/light{ dir = 1 }, @@ -31995,14 +31995,14 @@ /area/medical/surgery) "biT" = ( /obj/structure/table, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/medical/surgery) "biU" = ( /obj/structure/table, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, /turf/open/floor/plasteel/white{ @@ -32273,15 +32273,15 @@ /area/crew_quarters/kitchen) "bju" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/crew_quarters/kitchen) "bjv" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -32442,16 +32442,16 @@ /area/crew_quarters/heads/cmo) "bjM" = ( /obj/structure/table, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/chemistry{ +/obj/item/cartridge/medical, +/obj/item/cartridge/chemistry{ pixel_y = 2 }, /obj/machinery/light{ @@ -32463,7 +32463,7 @@ /area/crew_quarters/heads/cmo) "bjN" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -32488,7 +32488,7 @@ /area/medical/patients_rooms) "bjQ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -32518,8 +32518,8 @@ /area/medical/surgery) "bjU" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -32827,7 +32827,7 @@ /area/crew_quarters/kitchen) "bku" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -32976,7 +32976,7 @@ /area/crew_quarters/heads/cmo) "bkJ" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 8; pixel_y = 6 }, @@ -33003,7 +33003,7 @@ /area/medical/patients_rooms) "bkM" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -33745,7 +33745,7 @@ /area/medical/virology) "blW" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -34371,7 +34371,7 @@ dir = 9 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -34525,26 +34525,26 @@ /area/medical/surgery) "bnk" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -35841,11 +35841,11 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/window/reinforced{ dir = 8 }, @@ -36108,7 +36108,7 @@ /area/medical/medbay/central) "bpP" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/infections, +/obj/item/book/manual/wiki/infections, /obj/machinery/camera{ c_tag = "Virology 2"; dir = 5; @@ -36208,7 +36208,7 @@ /area/maintenance/asteroid/port/west) "bqb" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/structure/sign/poster/random{ name = "random official poster"; pixel_x = -32; @@ -36894,11 +36894,11 @@ /area/medical/virology) "bri" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/light/small{ dir = 8 }, @@ -36963,7 +36963,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_y = 32 }, /turf/open/floor/mineral/titanium/blue, @@ -37030,8 +37030,8 @@ /area/storage/primary) "brx" = ( /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver, +/obj/item/wrench, +/obj/item/screwdriver, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -37838,12 +37838,12 @@ /area/medical/virology) "bsN" = ( /obj/structure/table/glass, -/obj/item/weapon/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/infections{ pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -37870,7 +37870,7 @@ /area/medical/virology) "bsQ" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/radio/headset/headset_med, /obj/structure/reagent_dispensers/virusfood{ density = 0; @@ -37918,7 +37918,7 @@ }, /area/awaymission/research/interior/gateway) "bsW" = ( -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -37941,7 +37941,7 @@ /area/maintenance/asteroid/port/west) "bsZ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -37963,7 +37963,7 @@ /area/storage/primary) "btb" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -38645,11 +38645,11 @@ /area/medical/virology) "buj" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, @@ -38663,7 +38663,7 @@ /turf/closed/wall, /area/maintenance/asteroid/starboard) "bul" = ( -/obj/item/weapon/computer_hardware/recharger/APC, +/obj/item/computer_hardware/recharger/APC, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -38706,7 +38706,7 @@ }, /area/awaymission/research/interior/gateway) "bur" = ( -/obj/item/weapon/paper/fluff/stations/cere/gateway, +/obj/item/paper/fluff/stations/cere/gateway, /obj/effect/turf_decal/stripes/asteroid/line{ icon_state = "ast_warn"; dir = 8 @@ -39096,7 +39096,7 @@ icon_state = "0-4"; d2 = 4 }, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; name = "reinforced floor" @@ -39439,7 +39439,7 @@ /area/medical/medbay/central) "bvA" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -39797,7 +39797,7 @@ /area/engine/break_room) "bwm" = ( /obj/structure/table, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /obj/machinery/camera{ c_tag = "SM West"; dir = 4; @@ -39828,7 +39828,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /turf/open/floor/engine{ baseturf = /turf/open/floor/plating/asteroid/airless; name = "reinforced floor" @@ -40085,8 +40085,8 @@ /area/medical/medbay/central) "bwM" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/machinery/light{ dir = 8 }, @@ -40277,7 +40277,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40304,7 +40304,7 @@ /area/storage/primary) "bxh" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40371,8 +40371,8 @@ /obj/item/seeds/chili, /obj/item/seeds/grape, /obj/item/seeds/grape, -/obj/item/weapon/reagent_containers/food/snacks/grown/chili, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/potato, /obj/structure/cable/orange{ d1 = 4; d2 = 8; @@ -40492,7 +40492,7 @@ }, /area/engine/break_room) "bxw" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/yellow/corner{ @@ -40595,7 +40595,7 @@ /area/engine/engineering) "bxF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/structure/disposalpipe/segment, @@ -40670,7 +40670,7 @@ /area/maintenance/asteroid/central) "bxM" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -40727,7 +40727,7 @@ /area/hallway/primary/starboard) "bxS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40752,7 +40752,7 @@ "bxU" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40833,7 +40833,7 @@ }, /area/medical/virology) "bye" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40846,8 +40846,8 @@ /area/awaymission/research/interior/gateway) "byg" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, -/obj/item/weapon/coin/silver, +/obj/item/paper/pamphlet/gateway, +/obj/item/coin/silver, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -40992,7 +40992,7 @@ /area/maintenance/asteroid/port/east) "byt" = ( /obj/structure/rack, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41228,12 +41228,12 @@ /area/medical/medbay/central) "byT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/weapon/folder, +/obj/item/pen, +/obj/item/folder, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41259,8 +41259,8 @@ /area/medical/medbay/central) "byW" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/item/device/radio/intercom{ broadcasting = 0; name = "Station Intercom (General)"; @@ -41510,7 +41510,7 @@ /area/engine/break_room) "bzw" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/orange/hidden{ dir = 4 }, @@ -41574,7 +41574,7 @@ /area/engine/engineering) "bzD" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ @@ -41669,8 +41669,8 @@ /area/security/checkpoint/engineering) "bzK" = ( /obj/structure/janitorialcart, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -41969,7 +41969,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel{ @@ -42745,7 +42745,7 @@ /area/medical/genetics/cloning) "bBx" = ( /obj/structure/table, -/obj/item/weapon/book/manual/medical_cloning{ +/obj/item/book/manual/medical_cloning{ pixel_y = 6 }, /obj/machinery/firealarm{ @@ -42874,7 +42874,7 @@ /area/engine/break_room) "bBK" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 4; @@ -43019,7 +43019,7 @@ /area/engine/engineering) "bBW" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, /obj/machinery/camera{ @@ -43275,12 +43275,12 @@ /area/medical/genetics/cloning) "bCu" = ( /obj/structure/table, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/structure/cable/orange{ d2 = 8; icon_state = "0-8" @@ -43659,12 +43659,12 @@ /area/medical/chemistry) "bDk" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whiteyellow/side{ icon_state = "whiteyellow"; dir = 1; @@ -43841,7 +43841,7 @@ }, /area/maintenance/asteroid/starboard) "bDC" = ( -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /turf/open/floor/plating, /area/space) "bDD" = ( @@ -43907,11 +43907,11 @@ /area/hydroponics) "bDK" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/wirecutters, -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/wirecutters, +/obj/item/shovel/spade, /obj/item/honey_frame, /obj/item/honey_frame, /obj/item/honey_frame, @@ -43936,10 +43936,10 @@ /area/hydroponics) "bDN" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/storage/bag/plants, -/obj/item/weapon/storage/bag/plants, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants, +/obj/item/storage/bag/plants, /obj/machinery/light, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -43965,8 +43965,8 @@ /area/hydroponics) "bDQ" = ( /obj/structure/table, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, /obj/item/stack/packageWrap, /obj/item/device/destTagger, /turf/open/floor/plasteel/hydrofloor{ @@ -44243,7 +44243,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/side{ @@ -44425,7 +44425,7 @@ }, /area/maintenance/asteroid/starboard) "bEJ" = ( -/obj/item/weapon/coin/gold, +/obj/item/coin/gold, /turf/open/floor/plating, /area/space) "bEK" = ( @@ -44437,7 +44437,7 @@ "bEL" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -44551,7 +44551,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel{ @@ -44603,8 +44603,8 @@ /area/engine/atmos) "bFc" = ( /obj/structure/table, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -44723,7 +44723,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; light_color = "#E1E17D"; light_range = 5; @@ -45263,7 +45263,7 @@ /obj/machinery/camera{ c_tag = "Fitness North" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" }, /turf/open/floor/plasteel/vault{ @@ -45288,11 +45288,11 @@ random_basetype = /obj/structure/sign/poster/official }, /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 8; pixel_y = 6 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_x = -2; pixel_y = 2 }, @@ -45339,11 +45339,11 @@ /area/library) "bGt" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /obj/item/stack/packageWrap, /obj/item/device/destTagger, /turf/open/floor/plasteel/chapel{ @@ -45375,7 +45375,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood{ @@ -45454,14 +45454,14 @@ /area/library/lounge) "bGF" = ( /obj/structure/rack, -/obj/item/weapon/grown/log, -/obj/item/weapon/grown/log, -/obj/item/weapon/grown/log, -/obj/item/weapon/grown/log, +/obj/item/grown/log, +/obj/item/grown/log, +/obj/item/grown/log, +/obj/item/grown/log, /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -46011,10 +46011,10 @@ /area/medical/medbay/central) "bHu" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/gun/syringe, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/soap/nanotrasen, +/obj/item/folder/white, +/obj/item/gun/syringe, +/obj/item/reagent_containers/dropper, +/obj/item/soap/nanotrasen, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -46024,12 +46024,12 @@ /area/medical/medbay/zone2) "bHv" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -46043,12 +46043,12 @@ "bHw" = ( /obj/structure/table, /obj/item/device/radio/intercom, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -46058,12 +46058,12 @@ /area/medical/medbay/zone2) "bHx" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -46078,12 +46078,12 @@ /area/medical/medbay/zone2) "bHy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -46324,7 +46324,7 @@ "bHY" = ( /obj/structure/destructible/cult/tome, /obj/item/clothing/under/suit_jacket/red, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -46463,7 +46463,7 @@ name = "Atmospherics Desk Shutters"; pixel_x = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-13" }, /turf/open/floor/plasteel/yellow/side{ @@ -46585,12 +46585,12 @@ /area/engine/engineering) "bIB" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -46693,7 +46693,7 @@ /obj/structure/table/glass, /obj/item/hand_labeler_refill, /obj/item/hand_labeler_refill, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /obj/machinery/light, /turf/open/floor/plasteel/white{ @@ -46704,14 +46704,14 @@ /obj/structure/table/glass, /obj/item/stack/cable_coil/random, /obj/item/stack/cable_coil/random, -/obj/item/weapon/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/medical/chemistry) "bIO" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/epinephrine, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/machinery/camera{ @@ -46741,7 +46741,7 @@ /area/medical/chemistry) "bIR" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/item/clothing/glasses/science{ pixel_x = 2; pixel_y = 4 @@ -46753,11 +46753,11 @@ /area/medical/chemistry) "bIS" = ( /obj/structure/table/glass, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/screwdriver{ +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver{ pixel_x = -2; pixel_y = 6 }, @@ -46915,7 +46915,7 @@ /area/maintenance/asteroid/starboard) "bJk" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/asteroid/starboard) @@ -46957,11 +46957,11 @@ /area/crew_quarters/fitness) "bJq" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -47163,14 +47163,14 @@ /area/engine/engineering) "bJM" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/engine/engineering) "bJN" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -47189,7 +47189,7 @@ /area/engine/engineering) "bJO" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/engineering_construction, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -47222,16 +47222,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_guide, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/engine/engineering) "bJS" = ( /obj/structure/table, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -47247,7 +47247,7 @@ /area/engine/engineering) "bJU" = ( /obj/structure/closet/secure_closet/engineering_personal, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /obj/machinery/camera{ c_tag = "Engineering East"; dir = 9; @@ -47404,8 +47404,8 @@ dir = 8 }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/weldingtool/hugetank, +/obj/item/storage/toolbox/mechanical, +/obj/item/weldingtool/hugetank, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -47619,7 +47619,7 @@ network = list("SS13","CE") }, /obj/structure/closet/secure_closet/atmospherics, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -47912,7 +47912,7 @@ /area/medical/medbay/zone2) "bLi" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/disks{ +/obj/item/storage/box/disks{ pixel_x = 2; pixel_y = 2 }, @@ -47922,7 +47922,7 @@ /area/medical/genetics) "bLj" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -47933,10 +47933,10 @@ /area/medical/genetics) "bLk" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/radio/headset/headset_medsci, -/obj/item/weapon/storage/pill_bottle/mutadone, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, @@ -48210,7 +48210,7 @@ }, /area/library/lounge) "bLM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood{ @@ -48262,7 +48262,7 @@ pixel_x = 30 }, /obj/structure/closet/secure_closet/atmospherics, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -48446,9 +48446,9 @@ "bMf" = ( /obj/machinery/light, /obj/structure/rack, -/obj/item/weapon/pickaxe/mini, -/obj/item/weapon/pickaxe/mini, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, +/obj/item/pickaxe/mini, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, /obj/item/clothing/glasses/meson, @@ -48463,7 +48463,7 @@ /obj/structure/rack, /obj/item/clothing/gloves/color/black, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -48497,8 +48497,8 @@ /area/engine/engineering) "bMi" = ( /obj/structure/rack, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -48828,20 +48828,20 @@ /area/maintenance/asteroid/starboard) "bMG" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/storage/box/syringes, +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 8; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/syringe{ pixel_x = 6; pixel_y = -3 }, @@ -48851,13 +48851,13 @@ /area/medical/medbay/zone2) "bMH" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, /obj/item/clothing/neck/stethoscope, @@ -48868,15 +48868,15 @@ /area/medical/medbay/zone2) "bMI" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/gun/syringe, +/obj/item/hand_labeler, +/obj/item/gun/syringe, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/medical/medbay/zone2) "bMJ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, @@ -48886,11 +48886,11 @@ /area/medical/medbay/zone2) "bMK" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/item/stack/packageWrap, /obj/item/device/destTagger, /turf/open/floor/plasteel/white{ @@ -48998,7 +48998,7 @@ name = "disposal pipe - Medbay"; sortType = 9 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -49087,18 +49087,18 @@ /area/library/lounge) "bNh" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/library/lounge) "bNi" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/fourcolor, +/obj/item/pen/fourcolor, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -49573,18 +49573,18 @@ /area/library) "bNZ" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/fourcolor, +/obj/item/pen/fourcolor, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/library) "bOa" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -49610,7 +49610,7 @@ /area/library/lounge) "bOd" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -49716,8 +49716,8 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/lighter/greyscale, +/obj/item/storage/fancy/cigarettes, +/obj/item/lighter/greyscale, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -50459,7 +50459,7 @@ }, /area/crew_quarters/heads/chief) "bPD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/machinery/power/apc{ @@ -50478,7 +50478,7 @@ /area/crew_quarters/heads/chief) "bPE" = ( /obj/structure/table, -/obj/item/weapon/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_particle_accelerator, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 8; @@ -51039,8 +51039,8 @@ /area/crew_quarters/heads/chief) "bQE" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/engineering_construction, -/obj/item/weapon/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/engineering_guide, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -51203,7 +51203,7 @@ /obj/structure/closet/crate, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -51241,7 +51241,7 @@ /area/maintenance/asteroid/port/west) "bQX" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -51285,7 +51285,7 @@ /area/crew_quarters/fitness) "bRd" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -51327,7 +51327,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/structure/disposalpipe/segment{ @@ -51346,7 +51346,7 @@ }, /area/library) "bRj" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/structure/disposalpipe/segment{ @@ -51360,7 +51360,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/structure/disposalpipe/segment{ @@ -51570,8 +51570,8 @@ /area/engine/engine_smes) "bRG" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -51694,8 +51694,8 @@ "bRU" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "bRV" = ( @@ -51989,7 +51989,7 @@ /area/space) "bSD" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -52324,9 +52324,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high/plus, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -52343,7 +52343,7 @@ /area/engine/engine_smes) "bTo" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -52551,7 +52551,7 @@ /area/hallway/primary/starboard) "bTN" = ( /obj/structure/closet/crate, -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/starboard) @@ -53009,8 +53009,8 @@ /area/crew_quarters/fitness) "bUK" = ( /obj/structure/janitorialcart, -/obj/item/weapon/mop, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/mop, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -53028,11 +53028,11 @@ /area/library) "bUM" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -53289,7 +53289,7 @@ "bVl" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/structure/disposalpipe/segment, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -53377,7 +53377,7 @@ }, /obj/structure/window/reinforced, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -53576,7 +53576,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -53901,7 +53901,7 @@ /area/maintenance/asteroid/central) "bWx" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -54462,7 +54462,7 @@ /area/maintenance/asteroid/disposal/east) "bXJ" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -54710,7 +54710,7 @@ /area/maintenance/asteroid/disposal/east) "bYm" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ @@ -54718,7 +54718,7 @@ }, /area/maintenance/asteroid/port/west) "bYn" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -54737,7 +54737,7 @@ }) "bYp" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/holodeck/disclaimer, +/obj/item/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -54889,7 +54889,7 @@ name = "Fitness Toilets" }) "bYG" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/freezer{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55114,7 +55114,7 @@ /area/chapel/office) "bZf" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush" }, /turf/open/floor/plasteel/grimy{ @@ -55389,7 +55389,7 @@ /area/crew_quarters/abandoned_gambling_den) "bZL" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless; icon_state = "wood-broken" @@ -55399,7 +55399,7 @@ /obj/structure/light_construct{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /obj/structure/table/wood, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55538,7 +55538,7 @@ /area/chapel/office) "bZZ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -55561,13 +55561,13 @@ /area/chapel/office) "cac" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/pen, +/obj/item/storage/crayons, +/obj/item/storage/fancy/candle_box{ pixel_x = 1 }, /turf/open/floor/plasteel/grimy{ @@ -55679,7 +55679,7 @@ /area/chapel/office) "caq" = ( /obj/structure/table/wood, -/obj/item/weapon/nullrod, +/obj/item/nullrod, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -56192,7 +56192,7 @@ /area/crew_quarters/abandoned_gambling_den) "cbo" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -56357,7 +56357,7 @@ /area/maintenance/asteroid/port/west) "cbG" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -56439,7 +56439,7 @@ /area/chapel/office) "cbO" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -56448,13 +56448,13 @@ /obj/structure/closet/crate{ name = "top secret clown supplies" }, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/crayons, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/storage/box/mousetraps, +/obj/item/storage/crayons, /obj/item/clothing/mask/joy, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -56655,14 +56655,14 @@ name = "Top Secret Clown HQ" }) "cci" = ( -/obj/item/weapon/grown/bananapeel{ +/obj/item/grown/bananapeel{ name = "state-of-the-art clown home defense peel" }, /obj/structure/table, -/obj/item/weapon/grown/bananapeel{ +/obj/item/grown/bananapeel{ name = "state-of-the-art clown home defense peel" }, -/obj/item/weapon/coin/clown, +/obj/item/coin/clown, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -56805,7 +56805,7 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccx" = ( -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccy" = ( @@ -56814,8 +56814,8 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccz" = ( @@ -56880,8 +56880,8 @@ name = "Civilian Asteroid" }) "ccG" = ( -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccH" = ( @@ -56942,15 +56942,15 @@ }, /area/maintenance/asteroid/aft/arrivals) "ccM" = ( -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/maintenance/asteroid/aft/arrivals) "ccN" = ( -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccO" = ( @@ -57005,8 +57005,8 @@ }, /area/hallway/primary/starboard/aft) "ccT" = ( -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe/mini, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/mini, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -57033,7 +57033,7 @@ /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "ccZ" = ( -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "cda" = ( @@ -57295,7 +57295,7 @@ }, /area/hallway/primary/starboard/aft) "cdB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/item/device/radio/intercom{ @@ -57308,7 +57308,7 @@ /area/shuttle/escape) "cdC" = ( /obj/structure/lattice, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /turf/open/space, /area/solar/asteroid/aft) "cdD" = ( @@ -57328,8 +57328,8 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, -/obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/electronics/tracker, +/obj/item/paper/guides/jobs/engi/solars, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -57381,7 +57381,7 @@ /area/hallway/primary/starboard/aft) "cdH" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/mineral/plastitanium/brig{ icon_state = "darkred"; dir = 1; @@ -57633,15 +57633,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/card{ +/obj/item/circuitboard/computer/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = 5; pixel_y = -5 }, @@ -57678,13 +57678,13 @@ /turf/open/space, /area/space) "ceg" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/lattice/catwalk, /turf/open/space, /area/solar/asteroid/aft) "ceh" = ( /obj/structure/lattice, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/space, /area/space) "cei" = ( @@ -57754,7 +57754,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/aft/arrivals) "cen" = ( @@ -57932,11 +57932,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/mecha_control{ +/obj/item/circuitboard/computer/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -57971,11 +57971,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/aiupload{ +/obj/item/circuitboard/computer/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -58182,10 +58182,10 @@ /area/quartermaster/miningdock/abandoned) "cff" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe/mini, -/obj/item/weapon/gun/energy/kinetic_accelerator, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe/mini, +/obj/item/gun/energy/kinetic_accelerator, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -58413,7 +58413,7 @@ /area/solar/asteroid/aft) "cfH" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -58441,7 +58441,7 @@ /area/maintenance/asteroid/aft/arrivals) "cfL" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/aft/arrivals) "cfM" = ( @@ -58542,8 +58542,8 @@ /area/shuttle/escape) "cfZ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/teargas, +/obj/item/storage/box/zipties, /turf/open/floor/mineral/plastitanium/brig{ icon_state = "darkred"; dir = 2; @@ -58631,8 +58631,8 @@ /area/storage/tech) "cgh" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -58640,13 +58640,13 @@ "cgi" = ( /obj/structure/table, /obj/item/clothing/glasses/meson, -/obj/item/weapon/paper/fluff/stations/cere/abandoned_dock, +/obj/item/paper/fluff/stations/cere/abandoned_dock, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/quartermaster/miningdock/abandoned) "cgj" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -58818,12 +58818,12 @@ /area/hallway/primary/aft) "cgE" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -58831,18 +58831,18 @@ /area/storage/tech) "cgF" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/storage/tech) "cgG" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /obj/structure/sign/securearea{ pixel_y = 32 }, @@ -58880,7 +58880,7 @@ pixel_y = 3 }, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/machinery/camera{ c_tag = "Tech Storage North" }, @@ -58890,17 +58890,17 @@ /area/storage/tech) "cgK" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/storage/tech) "cgL" = ( /obj/structure/table, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/light{ dir = 8 }, @@ -58950,12 +58950,12 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/iron, -/obj/item/weapon/ore/gold, +/obj/item/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/iron, +/obj/item/ore/gold, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -59176,8 +59176,8 @@ /area/shuttle/escape) "chm" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -59255,11 +59255,11 @@ /area/hallway/primary/aft) "chu" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, /obj/machinery/light/small{ dir = 8 }, @@ -59288,8 +59288,8 @@ /area/storage/tech) "chx" = ( /obj/structure/table, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /obj/machinery/light/small{ dir = 4 }, @@ -59299,7 +59299,7 @@ /area/storage/tech) "chy" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /obj/machinery/camera/motion{ dir = 4 }, @@ -59319,7 +59319,7 @@ /area/ai_monitored/turret_protected/ai_upload) "chB" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /obj/structure/sign/kiddieplaque{ pixel_x = 32 }, @@ -59474,7 +59474,7 @@ /area/hallway/primary/aft) "chR" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -59485,27 +59485,27 @@ /area/hallway/primary/aft) "chS" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/storage/tech) "chT" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /obj/machinery/requests_console{ department = "Tech storage"; pixel_y = -32 @@ -59523,7 +59523,7 @@ "chV" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -59823,7 +59823,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -59840,7 +59840,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -60151,21 +60151,21 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/pandemic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/destructive_analyzer, -/obj/item/weapon/circuitboard/machine/protolathe, -/obj/item/weapon/circuitboard/computer/aifixer, -/obj/item/weapon/circuitboard/computer/teleporter, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, -/obj/item/weapon/circuitboard/machine/mechfab, +/obj/item/circuitboard/machine/destructive_analyzer, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/computer/aifixer, +/obj/item/circuitboard/computer/teleporter, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/mechfab, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -60181,22 +60181,22 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning, -/obj/item/weapon/circuitboard/computer/med_data{ +/obj/item/circuitboard/computer/cloning, +/obj/item/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod, -/obj/item/weapon/circuitboard/computer/scan_consolenew, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/computer/scan_consolenew, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/storage/tech) "cjl" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/freeformcore, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -60205,22 +60205,22 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/corp, +/obj/item/aiModule/core/full/corp, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/custom, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/ai_monitored/turret_protected/ai_upload) "cjm" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/zeroth/oneHuman, +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/zeroth/oneHuman, /obj/machinery/door/window{ base_state = "left"; dir = 8; @@ -60228,16 +60228,16 @@ name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/reset/purge, +/obj/item/aiModule/reset/purge, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/antimov, +/obj/item/aiModule/core/full/antimov, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/aiModule/supplied/protectStation, +/obj/item/aiModule/supplied/protectStation, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -60441,11 +60441,11 @@ /area/hallway/primary/starboard/aft) "cjD" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/fourcolor, +/obj/item/pen/fourcolor, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -60674,10 +60674,10 @@ /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/wallframe/camera, @@ -60706,12 +60706,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/mining, -/obj/item/weapon/circuitboard/machine/autolathe{ +/obj/item/circuitboard/computer/mining, +/obj/item/circuitboard/machine/autolathe{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/computer/arcade/battle, +/obj/item/circuitboard/computer/arcade/battle, /obj/machinery/light/small{ dir = 8 }, @@ -60730,11 +60730,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = 1; pixel_y = -1 }, @@ -61078,12 +61078,12 @@ /area/construction/mining/aux_base) "ckH" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/server, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/computer/message_monitor{ +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/server, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/computer/message_monitor{ pixel_y = -5 }, /turf/open/floor/plating{ @@ -61101,15 +61101,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/powermonitor{ +/obj/item/circuitboard/computer/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/stationalert{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -61148,7 +61148,7 @@ dir = 4; pixel_x = -32 }, -/obj/item/weapon/paper/guides/quantumpad, +/obj/item/paper/guides/quantumpad, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -61214,7 +61214,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/paper/guides/quantumpad, +/obj/item/paper/guides/quantumpad, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -61389,7 +61389,7 @@ "clk" = ( /obj/structure/table, /obj/item/device/assault_pod/mining, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 6; @@ -61409,7 +61409,7 @@ "clm" = ( /obj/structure/table, /obj/item/device/plant_analyzer, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/item/device/healthanalyzer, /obj/item/device/analyzer, /turf/open/floor/plating{ @@ -61457,7 +61457,7 @@ }, /obj/structure/table, /obj/item/device/multitool, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -61558,7 +61558,7 @@ /obj/structure/table, /obj/item/device/multitool, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -62045,7 +62045,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_2) "cmE" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -63004,7 +63004,7 @@ /area/hallway/secondary/entry) "coe" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/item/device/radio/beacon, /obj/item/device/radio/intercom{ broadcasting = 0; @@ -63022,7 +63022,7 @@ }, /area/teleporter) "cog" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/side{ @@ -63042,11 +63042,11 @@ /area/security/checkpoint/checkpoint2) "coi" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -63070,7 +63070,7 @@ /area/security/checkpoint/checkpoint2) "col" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/radio, /turf/open/floor/plasteel/red/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -63144,7 +63144,7 @@ }, /area/hallway/secondary/exit) "cot" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -64340,8 +64340,8 @@ req_access_txt = "29" }, /obj/structure/rack, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, +/obj/item/storage/belt/utility/full, /obj/item/clothing/glasses/welding, /obj/item/clothing/head/welding, /turf/open/floor/plasteel/white{ @@ -64591,8 +64591,8 @@ /area/maintenance/asteroid/aft/science) "cqP" = ( /obj/structure/rack, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe/emergency, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/aft/science) "cqQ" = ( @@ -64952,11 +64952,11 @@ }, /area/science/lab) "crC" = ( -/obj/item/weapon/folder/white, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/folder/white, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, /obj/structure/table/glass, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white{ @@ -64969,15 +64969,15 @@ }, /area/science/lab) "crE" = ( -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/table, /obj/machinery/newscaster{ pixel_x = 28; @@ -65546,12 +65546,12 @@ }, /area/science/lab) "csB" = ( -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -65722,10 +65722,10 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel, +/obj/item/retractor, +/obj/item/hemostat, +/obj/item/circular_saw, +/obj/item/scalpel, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -65746,9 +65746,9 @@ "csS" = ( /obj/structure/table, /obj/structure/window/reinforced, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -65779,7 +65779,7 @@ /area/science/lab) "csW" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -65790,7 +65790,7 @@ "csX" = ( /obj/structure/table/glass, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -65813,16 +65813,16 @@ }, /area/science/lab) "cta" = ( -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -66046,20 +66046,20 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ name = "first-aid kit (empty)" }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ name = "first-aid kit (empty)" }, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid{ name = "first-aid kit (empty)" }, /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, /obj/item/device/healthanalyzer, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/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/device/assembly/prox_sensor, @@ -66079,17 +66079,17 @@ "ctw" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/science/robotics/lab) "ctx" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -66249,8 +66249,8 @@ /area/science/lab) "ctP" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/whitepurple/side{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -67078,8 +67078,8 @@ /area/science/mixing) "cvq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/structure/cable/orange{ @@ -68170,7 +68170,7 @@ /area/shuttle/arrival) "cwY" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/neutral, /area/shuttle/arrival) "cwZ" = ( @@ -68519,8 +68519,8 @@ /area/science/xenobiology) "cxC" = ( /obj/structure/table, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/machinery/light{ dir = 4 }, @@ -68715,12 +68715,12 @@ /area/science/research) "cxX" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = 4; pixel_y = 6 }, @@ -68758,7 +68758,7 @@ /area/science/storage) "cyc" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 9; @@ -69104,7 +69104,7 @@ /area/science/server) "cyL" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/camera{ c_tag = "Research Treatment Center"; dir = 1; @@ -69119,9 +69119,9 @@ /area/science/research) "cyM" = ( /obj/machinery/light, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/structure/closet/crate/freezer, /turf/open/floor/plasteel/whitepurple/side{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -69370,10 +69370,10 @@ /area/science/xenobiology) "czi" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/beakers, +/obj/item/storage/box/syringes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel/whitepurple{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -69499,7 +69499,7 @@ /area/crew_quarters/heads/hor) "czu" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, @@ -69898,8 +69898,8 @@ /area/maintenance/asteroid/aft/science) "cAa" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe/emergency, +/obj/item/storage/bag/ore, +/obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/aft/science) "cAb" = ( @@ -69938,7 +69938,7 @@ pixel_x = -32 }, /obj/structure/closet/crate/bin, -/obj/item/weapon/book/manual/wiki/telescience, +/obj/item/book/manual/wiki/telescience, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -70149,8 +70149,8 @@ pixel_x = 24 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -70248,7 +70248,7 @@ /area/science/misc_lab) "cAF" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -71302,7 +71302,7 @@ /obj/structure/rack, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /turf/open/floor/plasteel/floorgrime, /area/maintenance/asteroid/disposal/southeast) "cCJ" = ( @@ -71322,7 +71322,7 @@ "cCL" = ( /obj/structure/rack, /obj/item/clothing/mask/breath, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -71490,7 +71490,7 @@ /area/maintenance/asteroid/aft/arrivals) "cDf" = ( /obj/structure/table, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/item/seeds/banana, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -71515,7 +71515,7 @@ /area/maintenance/asteroid/disposal/southeast) "cDj" = ( /obj/effect/turf_decal/stripes/line, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/floorgrime, /area/maintenance/asteroid/disposal/southeast) "cDk" = ( @@ -71667,7 +71667,7 @@ "cDy" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -71682,7 +71682,7 @@ /area/maintenance/asteroid/aft/science) "cDA" = ( /obj/structure/table, -/obj/item/weapon/weldingtool/mini, +/obj/item/weldingtool/mini, /turf/open/floor/plasteel/floorgrime, /area/maintenance/asteroid/disposal/southeast) "cDB" = ( @@ -71737,7 +71737,7 @@ dir = 4; icon_state = "pipe-c" }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -71930,7 +71930,7 @@ /area/maintenance/asteroid/aft/science) "cEg" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -71945,7 +71945,7 @@ /area/maintenance/asteroid/aft/science) "cEi" = ( /obj/structure/closet/firecloset/full, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -72074,12 +72074,12 @@ /area/security/armory) "cEw" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -72104,12 +72104,12 @@ /area/security/armory) "cEz" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -73416,7 +73416,7 @@ /area/security/brig) "cHh" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 10; @@ -73479,7 +73479,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/light{ dir = 8 }, @@ -73505,7 +73505,7 @@ }, /area/security/brig) "cHo" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -73546,8 +73546,8 @@ /area/security/checkpoint/supply) "cHr" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -73670,7 +73670,7 @@ }, /area/security/brig) "cHE" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -73691,7 +73691,7 @@ }, /area/security/brig) "cHG" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ @@ -75682,20 +75682,20 @@ "cLE" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/folder, -/obj/item/weapon/clipboard, +/obj/item/folder, +/obj/item/clipboard, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/quartermaster/qm) "cLF" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/fourcolor, -/obj/item/weapon/stamp/qm, +/obj/item/pen/fourcolor, +/obj/item/stamp/qm, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -75855,7 +75855,7 @@ }, /area/quartermaster/qm) "cLW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/brown{ @@ -76090,7 +76090,7 @@ /area/maintenance/asteroid/fore/cargo_south) "cMp" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -76137,8 +76137,8 @@ network = list("SS13","QM") }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 5 }, @@ -76489,7 +76489,7 @@ /area/maintenance/asteroid/port/west) "cNa" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/baguette, +/obj/item/reagent_containers/food/snacks/baguette, /obj/structure/sign/poster/official/the_owl{ pixel_y = 32 }, @@ -76601,9 +76601,9 @@ /area/maintenance/asteroid/starboard) "cNo" = ( /obj/structure/table, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, +/obj/item/lipstick/random, +/obj/item/lipstick/random, /obj/machinery/light/small{ brightness = 3; dir = 8 @@ -76857,11 +76857,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, /turf/open/floor/plasteel/redyellow{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -77241,7 +77241,7 @@ "cOG" = ( /obj/structure/table/glass, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/plasteel/barber{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -77404,12 +77404,12 @@ /area/crew_quarters/heads/cmo) "cOZ" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, -/obj/item/weapon/stamp/cmo, +/obj/item/pen, +/obj/item/stamp/cmo, /turf/open/floor/plasteel/barber{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -77570,7 +77570,7 @@ /area/medical/morgue) "cPr" = ( /obj/structure/table, -/obj/item/weapon/folder, +/obj/item/folder, /obj/machinery/camera{ c_tag = "Morgue North"; dir = 6 @@ -77591,7 +77591,7 @@ pixel_y = 24 }, /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -77634,11 +77634,11 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/vault{ baseturf = /turf/open/floor/plating/asteroid/airless; dir = 5 @@ -78080,7 +78080,7 @@ /area/crew_quarters/heads/chief) "cQv" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/neutral{ @@ -78088,22 +78088,22 @@ }, /area/crew_quarters/heads/chief) "cQw" = ( -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 3 }, /obj/structure/table/reinforced, /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/item/weapon/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -78160,11 +78160,11 @@ /area/crew_quarters/heads/chief) "cQD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -78222,12 +78222,12 @@ /area/maintenance/asteroid/starboard) "cQK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/stamp/ce, -/obj/item/weapon/pen, +/obj/item/stamp/ce, +/obj/item/pen, /turf/open/floor/plasteel/neutral{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -78425,7 +78425,7 @@ /area/maintenance/asteroid/central) "cRm" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/syringe/charcoal, +/obj/item/reagent_containers/syringe/charcoal, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79048,13 +79048,13 @@ /area/crew_quarters/heads/hor) "cSE" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/rd{ +/obj/item/pen, +/obj/item/folder/white, +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, @@ -79305,7 +79305,7 @@ /area/maintenance/asteroid/aft/science) "cTc" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79321,7 +79321,7 @@ /area/maintenance/asteroid/aft/science) "cTe" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79477,7 +79477,7 @@ /area/maintenance/asteroid/starboard) "cTu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel/cafeteria{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79546,7 +79546,7 @@ valid_territory = 0 }) "cTD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; light_color = "#E1E17D"; light_range = 5; @@ -79571,9 +79571,9 @@ pixel_x = 32 }, /obj/structure/closet/crate/bin, -/obj/item/weapon/paper/crumpled/stations/cere/rocks1, -/obj/item/weapon/paper/crumpled/stations/cere/rocks2, -/obj/item/weapon/paper/crumpled/stations/cere/rocks3, +/obj/item/paper/crumpled/stations/cere/rocks1, +/obj/item/paper/crumpled/stations/cere/rocks2, +/obj/item/paper/crumpled/stations/cere/rocks3, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79587,9 +79587,9 @@ }) "cTH" = ( /obj/structure/filingcabinet/chestdrawer, -/obj/item/weapon/paper/crumpled/stations/cere/empty_station, -/obj/item/weapon/paper/fluff/stations/cere/journal/journal, -/obj/item/weapon/paper/fluff/stations/cere/journal/journal_2, +/obj/item/paper/crumpled/stations/cere/empty_station, +/obj/item/paper/fluff/stations/cere/journal/journal, +/obj/item/paper/fluff/stations/cere/journal/journal_2, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79597,7 +79597,7 @@ valid_territory = 0 }) "cTI" = ( -/obj/item/weapon/paper/crumpled/bloody/hop, +/obj/item/paper/crumpled/bloody/hop, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79616,7 +79616,7 @@ }) "cTK" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -79646,7 +79646,7 @@ }) "cTN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -80098,7 +80098,7 @@ /area/maintenance/disposal/incinerator) "cUH" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -80267,11 +80267,11 @@ /area/maintenance/disposal/incinerator) "cUV" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -80567,7 +80567,7 @@ }, /area/maintenance/disposal/incinerator) "cVw" = ( -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /obj/machinery/light/small{ brightness = 3; dir = 8 @@ -80581,8 +80581,8 @@ icon_state = "4-8" }, /obj/structure/rack, -/obj/item/weapon/storage/lockbox/loyalty, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/item/storage/box/trackimp, /obj/machinery/light{ dir = 1 }, @@ -80677,7 +80677,7 @@ /area/security/prison) "cVE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 1"; dir = 10; @@ -80934,8 +80934,8 @@ /area/security/prison) "cVY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -82343,9 +82343,9 @@ name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/toolbox/emergency/old, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/toolbox/emergency/old, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -82393,8 +82393,8 @@ name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -82481,8 +82481,8 @@ /area/shuttle/abandoned) "cZd" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/crowbar, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar, /obj/machinery/light{ dir = 1 }, @@ -82494,8 +82494,8 @@ /area/shuttle/escape) "cZf" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkpurple, /area/shuttle/escape) "cZg" = ( @@ -82530,11 +82530,11 @@ /area/shuttle/escape) "cZm" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/light{ dir = 1 }, @@ -82609,7 +82609,7 @@ /area/shuttle/escape) "cZy" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/darkred, /area/shuttle/escape) "cZz" = ( @@ -82619,7 +82619,7 @@ /obj/structure/closet/crate{ name = "spare equipment crate" }, -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -82834,7 +82834,7 @@ "cZX" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -82855,7 +82855,7 @@ /turf/open/floor/plasteel/black, /area/shuttle/escape) "daa" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/item/device/radio/intercom{ @@ -82951,7 +82951,7 @@ /area/shuttle/escape) "dam" = ( /obj/structure/table, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, @@ -82971,7 +82971,7 @@ /area/shuttle/abandoned) "dao" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -83126,7 +83126,7 @@ /area/shuttle/escape) "daH" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/item/device/radio/intercom{ dir = 4; name = "Station Intercom (General)"; @@ -83145,8 +83145,8 @@ /area/shuttle/escape) "daK" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/neutral, /area/shuttle/escape) "daL" = ( @@ -83201,7 +83201,7 @@ /area/shuttle/escape) "daU" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -83252,7 +83252,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -83317,8 +83317,8 @@ /area/shuttle/escape) "dbj" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/wrench, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 5 @@ -83388,7 +83388,7 @@ /area/shuttle/escape) "dbv" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -83432,26 +83432,26 @@ /area/shuttle/escape) "dbB" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "dbC" = ( @@ -83459,22 +83459,22 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/hemostat, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/cautery{ +/obj/item/hemostat, +/obj/item/surgicaldrill, +/obj/item/cautery{ pixel_x = 4 }, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "dbD" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/crowbar, +/obj/item/storage/firstaid/fire, +/obj/item/crowbar, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 4 @@ -83496,15 +83496,15 @@ /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "dbH" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/defibrillator/loaded, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, +/obj/item/defibrillator/loaded, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 10 @@ -83633,7 +83633,7 @@ /area/shuttle/escape) "dbZ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 1 @@ -83686,7 +83686,7 @@ /area/shuttle/escape) "dcg" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 10 @@ -83694,8 +83694,8 @@ /area/shuttle/escape) "dch" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/yellow/side, /area/shuttle/escape) "dci" = ( @@ -83791,7 +83791,7 @@ /area/hydroponics) "dcz" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/darkgreen{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -84190,8 +84190,8 @@ /obj/item/clothing/head/beekeeper_head, /obj/item/clothing/suit/beekeeper_suit, /obj/item/clothing/suit/beekeeper_suit, -/obj/item/weapon/melee/flyswatter, -/obj/item/weapon/melee/flyswatter, +/obj/item/melee/flyswatter, +/obj/item/melee/flyswatter, /obj/machinery/camera{ c_tag = "Hydroponics South 2"; dir = 1; @@ -84264,7 +84264,7 @@ icon_state = "1-2" }, /obj/structure/closet/secure_closet/atmospherics, -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -86580,7 +86580,7 @@ /area/solar/asteroid/aft) "djm" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson, /obj/effect/turf_decal/stripes/line{ dir = 10 @@ -87010,14 +87010,14 @@ /obj/structure/rack, /obj/item/clothing/suit/space/fragile, /obj/item/clothing/head/helmet/space/fragile, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/hallway/primary/fore) "dkr" = ( /obj/structure/closet/crate, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/port/west) "dks" = ( @@ -87147,16 +87147,16 @@ /area/space) "dkH" = ( /obj/structure/rack, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, +/obj/item/shovel, +/obj/item/shovel, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/transfer) "dkI" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -87198,7 +87198,7 @@ }, /area/security/transfer) "dkP" = ( -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /obj/structure/cable/orange{ d1 = 2; d2 = 4; @@ -87249,7 +87249,7 @@ }, /area/security/transfer) "dkV" = ( -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -87363,7 +87363,7 @@ /area/security/processing) "dli" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -87383,7 +87383,7 @@ /area/security/prison) "dlk" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -87449,7 +87449,7 @@ /obj/machinery/atmospherics/pipe/simple/general/hidden{ dir = 9 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 5; @@ -87588,8 +87588,8 @@ /area/maintenance/asteroid/fore/com_north) "dlG" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "dlH" = ( @@ -87712,7 +87712,7 @@ /obj/structure/sink{ pixel_y = 24 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/showroomfloor{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -88281,8 +88281,8 @@ /area/security/prison) "dne" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -88440,7 +88440,7 @@ /area/security/processing) "dny" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -88504,7 +88504,7 @@ /area/security/prison) "dnD" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -88758,8 +88758,8 @@ /area/security/prison) "doh" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -88920,7 +88920,7 @@ /area/security/prison) "dox" = ( /obj/structure/table, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/machinery/light{ dir = 4 }, @@ -89188,8 +89188,8 @@ /area/security/prison) "doW" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -89505,14 +89505,14 @@ /area/security/prison) "dpC" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/prison) "dpD" = ( /obj/machinery/hydroponics/soil, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating/asteroid, /area/security/prison) "dpE" = ( @@ -89589,8 +89589,8 @@ /area/security/prison) "dpN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plating/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -89814,7 +89814,7 @@ /area/security/prison) "dqh" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 4"; dir = 10; @@ -89829,8 +89829,8 @@ /area/security/prison) "dqi" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -89885,7 +89885,7 @@ }, /area/maintenance/asteroid/fore/com_north) "dqn" = ( -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /turf/open/floor/plating{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -89932,8 +89932,8 @@ /area/security/armory) "dqu" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/armor/laserproof, /obj/structure/window/reinforced{ dir = 1 @@ -89944,8 +89944,8 @@ /area/security/armory) "dqv" = ( /obj/structure/rack, -/obj/item/weapon/storage/lockbox/loyalty, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/item/storage/box/trackimp, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/darkred/side{ icon_state = "darkred"; @@ -90003,7 +90003,7 @@ }, /area/security/prison) "dqB" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/light/small{ dir = 8 }, @@ -90071,7 +90071,7 @@ req_access_txt = "3" }, /obj/effect/spawner/lootdrop/armory_contraband{ - loot = list(/obj/item/weapon/gun/ballistic/automatic/pistol = 5, /obj/item/weapon/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/weapon/gun/ballistic/revolver/mateba, /obj/item/weapon/gun/ballistic/automatic/pistol/deagle, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 3) + loot = list(/obj/item/gun/ballistic/automatic/pistol = 5, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/automatic/pistol/deagle, /obj/item/storage/box/syndie_kit/throwing_weapons = 3) }, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -90102,12 +90102,12 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -90117,11 +90117,11 @@ /area/security/armory) "dqL" = ( /obj/structure/table, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 1; pixel_y = 5 }, @@ -90259,12 +90259,12 @@ /area/security/armory) "dra" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -90456,11 +90456,11 @@ }, /area/security/armory) "dru" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 4 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = -4 }, /obj/structure/table, @@ -90705,11 +90705,11 @@ /area/security/main) "drS" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/morphine, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/darkred/side{ icon_state = "darkred"; @@ -91061,7 +91061,7 @@ /area/security/prison) "dsB" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/camera{ c_tag = "Brig Perma Cell 6"; dir = 10; @@ -91076,8 +91076,8 @@ /area/security/prison) "dsC" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light/small, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 @@ -91443,7 +91443,7 @@ /area/security/brig) "dto" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/machinery/camera{ c_tag = "Brig Medbay"; dir = 6; @@ -91489,8 +91489,8 @@ /area/security/brig) "dts" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -91504,7 +91504,7 @@ /area/security/brig) "dtt" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -91586,8 +91586,8 @@ /area/crew_quarters/heads/hos) "dtD" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/deputy, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/deputy, +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, @@ -91675,7 +91675,7 @@ /area/security/brig) "dtN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -91690,7 +91690,7 @@ /area/security/brig) "dtP" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -91716,7 +91716,7 @@ /area/security/brig) "dtT" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -91864,8 +91864,8 @@ /area/security/main) "duh" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/restraints/handcuffs, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ @@ -91880,8 +91880,8 @@ /area/security/brig) "duj" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/firstaid/regular, +/obj/item/storage/toolbox/mechanical, /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, @@ -91969,8 +91969,8 @@ /area/security/brig) "duu" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/folder/red, /turf/open/floor/plasteel/black{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -92112,7 +92112,7 @@ /obj/structure/table, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/ears/earmuffs, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/structure/reagent_dispensers/peppertank{ pixel_x = -32 }, @@ -92264,13 +92264,13 @@ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba, -/obj/item/weapon/lighter, +/obj/item/storage/fancy/cigarettes/cigars/cohiba, +/obj/item/lighter, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "dva" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "dvb" = ( @@ -92319,14 +92319,14 @@ /area/security/main) "dvf" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, /area/security/main) "dvg" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless @@ -92538,8 +92538,8 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "dvB" = ( @@ -92583,7 +92583,7 @@ /area/security/main) "dvF" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -92717,7 +92717,7 @@ /area/crew_quarters/heads/hos) "dvS" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -92784,7 +92784,7 @@ /area/security/courtroom) "dvY" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -92802,7 +92802,7 @@ /area/security/courtroom) "dwa" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid, /area/maintenance/asteroid/fore/com_west) "dwb" = ( @@ -93226,7 +93226,7 @@ /area/security/main) "dwO" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/machinery/light{ dir = 8 }, @@ -93317,7 +93317,7 @@ /area/security/brig) "dwX" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/red/side{ icon_state = "red"; dir = 6; @@ -93326,7 +93326,7 @@ /area/security/courtroom) "dwY" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 10; @@ -93462,8 +93462,8 @@ /area/security/detectives_office) "dxn" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -93676,7 +93676,7 @@ /area/security/detectives_office) "dxF" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/item/clothing/glasses/sunglasses, /obj/item/device/flashlight/lamp, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -93914,8 +93914,8 @@ /area/maintenance/asteroid/fore/com_west) "dxZ" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, +/obj/item/storage/briefcase, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -94052,7 +94052,7 @@ /area/security/brig) "dyo" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/floorgrime{ baseturf = /turf/open/floor/plating/asteroid/airless diff --git a/_maps/map_files/CitadelStation/CitadelStation-1.2.2.dmm b/_maps/map_files/CitadelStation/CitadelStation-1.2.2.dmm index 0d57d5691ce..57a019516a2 100644 --- a/_maps/map_files/CitadelStation/CitadelStation-1.2.2.dmm +++ b/_maps/map_files/CitadelStation/CitadelStation-1.2.2.dmm @@ -397,7 +397,7 @@ }) "aaP" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -409,7 +409,7 @@ }) "aaQ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -444,7 +444,7 @@ name = "Permabrig" }) "aaV" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/security/processing{ name = "Permabrig" @@ -532,8 +532,8 @@ }) "abd" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/structure/cable{ d1 = 2; d2 = 8; @@ -742,12 +742,12 @@ "abz" = ( /obj/structure/table, /obj/item/stack/cable_coil, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "abA" = ( /obj/structure/table, -/obj/item/weapon/storage/box/zipties{ +/obj/item/storage/box/zipties{ pixel_x = 1; pixel_y = 2 }, @@ -980,7 +980,7 @@ /area/shuttle/syndicate) "abX" = ( /obj/machinery/hydroponics/soil, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/grass, /area/security/processing{ name = "Permabrig" @@ -1274,23 +1274,23 @@ /area/shuttle/syndicate) "acx" = ( /obj/structure/table, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -5 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 3; pixel_y = 3 }, @@ -1743,7 +1743,7 @@ }) "adh" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /turf/open/floor/plasteel{ icon_state = "redfull" }, @@ -1856,7 +1856,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel{ icon_state = "redfull" }, @@ -1912,16 +1912,16 @@ /area/shuttle/syndicate) "ady" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "adz" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -1931,7 +1931,7 @@ /area/shuttle/syndicate) "adA" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) @@ -1951,7 +1951,7 @@ /area/shuttle/syndicate) "adC" = ( /obj/structure/table, -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -2016,8 +2016,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel{ icon_state = "redfull" }, @@ -2046,8 +2046,8 @@ /area/shuttle/syndicate) "adL" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "adM" = ( @@ -2172,7 +2172,7 @@ }) "adZ" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -2340,8 +2340,8 @@ }) "aeq" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly, +/obj/item/paper, +/obj/item/reagent_containers/food/snacks/donut/jelly, /turf/open/floor/plasteel/red/side{ dir = 4 }, @@ -2351,7 +2351,7 @@ "aer" = ( /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /obj/structure/window/reinforced{ dir = 8 @@ -2368,7 +2368,7 @@ }) "aes" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -2382,11 +2382,11 @@ name = "Prisoner Processing" }) "aet" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table/glass, /obj/structure/window/reinforced{ dir = 1; @@ -2437,12 +2437,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -2450,12 +2450,12 @@ /area/shuttle/syndicate) "aeA" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -2471,11 +2471,11 @@ /area/shuttle/syndicate) "aeC" = ( /obj/structure/table, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /turf/open/floor/mineral/plastitanium, @@ -2514,11 +2514,11 @@ /turf/open/floor/plating, /area/medical/virology) "aeJ" = ( -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/power/apc{ cell_type = 5000; dir = 1; @@ -2540,12 +2540,12 @@ }, /area/medical/virology) "aeK" = ( -/obj/item/weapon/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/infections{ pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -2842,7 +2842,7 @@ }) "afe" = ( /obj/machinery/iv_drip, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/open/floor/plasteel/whitered/side{ dir = 4 }, @@ -2851,8 +2851,8 @@ }) "aff" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/machinery/light{ icon_state = "tube1"; dir = 8 @@ -2918,7 +2918,7 @@ /turf/open/floor/plating, /area/medical/virology) "afn" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -2968,15 +2968,15 @@ }, /area/medical/virology) "afr" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/requests_console{ department = "Virology"; name = "Virology Requests Console"; @@ -3133,19 +3133,19 @@ }) "afD" = ( /obj/structure/table, -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "afE" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "afF" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/mineral/titanium, /area/shuttle/syndicate) "afG" = ( @@ -3238,13 +3238,13 @@ /area/medical/virology) "afO" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/machinery/light_switch{ pixel_x = 0; pixel_y = 26 }, -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -3426,7 +3426,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/open/floor/plasteel/whitegreen/side{ dir = 8 }, @@ -3629,7 +3629,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -3639,8 +3639,8 @@ }) "agy" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; @@ -3660,8 +3660,8 @@ }) "agA" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, -/obj/item/weapon/card/id/prisoner, +/obj/item/storage/box/prisoner, +/obj/item/card/id/prisoner, /turf/open/floor/plasteel/showroomfloor, /area/security/processing{ name = "Prisoner Processing" @@ -3762,7 +3762,7 @@ /area/shuttle/syndicate) "agL" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -4087,7 +4087,7 @@ /area/medical/virology) "ahq" = ( /obj/structure/closet/wardrobe/virology_white, -/obj/item/weapon/storage/backpack/satchel/vir, +/obj/item/storage/backpack/satchel/vir, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -4101,28 +4101,28 @@ /area/medical/virology) "ahr" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/vault, /area/medical/virology) "ahs" = ( @@ -4190,8 +4190,8 @@ }) "ahB" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/zipties, -/obj/item/weapon/melee/baton, +/obj/item/storage/box/zipties, +/obj/item/melee/baton, /turf/open/floor/plasteel/showroomfloor, /area/security/processing{ name = "Prisoner Processing" @@ -4307,7 +4307,7 @@ pixel_y = 1 }, /obj/structure/closet/crate, -/obj/item/weapon/storage/backpack/satchel/leather/withwallet, +/obj/item/storage/backpack/satchel/leather/withwallet, /turf/open/floor/plating, /area/maintenance/fore) "ahM" = ( @@ -4319,7 +4319,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/plating, /area/maintenance/fore) "ahN" = ( @@ -4355,7 +4355,7 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/storage/belt, +/obj/item/storage/belt, /turf/open/floor/plating, /area/maintenance/fore) "ahR" = ( @@ -4386,7 +4386,7 @@ /area/maintenance/fore) "ahU" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -4402,7 +4402,7 @@ "ahW" = ( /obj/structure/bed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/freezer, /area/medical/virology) "ahX" = ( @@ -4517,7 +4517,7 @@ }) "aii" = ( /obj/item/stack/sheet/cardboard, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating, /area/maintenance/fore) "aij" = ( @@ -4532,7 +4532,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "aim" = ( -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plating, /area/maintenance/fore) "ain" = ( @@ -4570,16 +4570,16 @@ /obj/machinery/newscaster{ pixel_x = -30 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/paper, -/obj/item/weapon/pen/red, +/obj/item/paper, +/obj/item/pen/red, /obj/structure/extinguisher_cabinet{ pixel_x = 0; pixel_y = 30 @@ -4611,7 +4611,7 @@ /area/medical/virology) "aiu" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -4821,17 +4821,17 @@ /area/shuttle/pod_4) "aiR" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aiS" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/freezer, /area/medical/virology) "aiT" = ( @@ -4843,7 +4843,7 @@ /area/medical/virology) "aiU" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -5033,7 +5033,7 @@ /area/maintenance/fore) "ajt" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plating, /area/maintenance/fore) "aju" = ( @@ -5065,7 +5065,7 @@ /obj/item/device/radio/intercom{ pixel_y = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -5303,7 +5303,7 @@ name = "Secure Workstations Common Area" }) "ajS" = ( -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /turf/open/floor/plating, /area/construction/hallway{ name = "Secure Workstations Common Area" @@ -5378,7 +5378,7 @@ /turf/open/floor/plasteel/vault, /area/medical/virology) "akc" = ( -/obj/item/weapon/reagent_containers/food/snacks/sosjerky, +/obj/item/reagent_containers/food/snacks/sosjerky, /obj/structure/table/glass, /turf/open/floor/plasteel/vault, /area/medical/virology) @@ -5464,7 +5464,7 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -5530,7 +5530,7 @@ name = "Secure Workstations Common Area" }) "ako" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/construction/hallway{ name = "Secure Workstations Common Area" @@ -5622,7 +5622,7 @@ name = "Brig Desk"; req_access_txt = "2" }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/radio/off, /turf/open/floor/plasteel/black, /area/security/processing{ @@ -6153,7 +6153,7 @@ /turf/open/floor/plasteel, /area/toxins/xenobiology) "alw" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -6283,7 +6283,7 @@ /area/maintenance/fore) "alI" = ( /obj/structure/table, -/obj/item/weapon/coin/iron, +/obj/item/coin/iron, /turf/open/floor/plating, /area/maintenance/fore) "alJ" = ( @@ -6298,7 +6298,7 @@ /area/maintenance/fore) "alL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk1"; name = "Bunk Bolt Control 1"; @@ -6329,7 +6329,7 @@ /area/crew_quarters/sleep) "alP" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk2"; name = "Bunk Bolt Control 2"; @@ -6618,7 +6618,7 @@ }) "amu" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/carpet, /area/crew_quarters/sleep{ name = "\improper Dormitory Suite 3" @@ -6670,7 +6670,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_3) "amB" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -6860,7 +6860,7 @@ /area/maintenance/fore) "amY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk3"; name = "Bunk Bolt Control 3"; @@ -6888,7 +6888,7 @@ /area/crew_quarters/sleep) "anb" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk4"; name = "Bunk Bolt Control 4"; @@ -7157,7 +7157,7 @@ density = 0; icon_state = "brokengrille" }, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/fore) "anD" = ( @@ -7401,7 +7401,7 @@ /area/maintenance/fore) "aoc" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk5"; name = "Bunk Bolt Control 5"; @@ -7429,7 +7429,7 @@ /area/crew_quarters/sleep) "aof" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk6"; name = "Bunk Bolt Control 6"; @@ -7574,7 +7574,7 @@ /area/toxins/xenobiology) "aoy" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/patriot, +/obj/item/bedsheet/patriot, /turf/open/floor/carpet, /area/crew_quarters/sleep{ name = "\improper Dormitory Suite 4" @@ -7647,7 +7647,7 @@ name = "Biodome Hallway" }) "aoG" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet, @@ -7727,23 +7727,23 @@ "aoR" = ( /obj/machinery/light, /obj/structure/table/glass, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel/white, /area/toxins/xenobiology) "aoS" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/toxins/xenobiology) "aoT" = ( /obj/structure/table, -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plasteel/white, /area/toxins/xenobiology) "aoU" = ( @@ -7755,7 +7755,7 @@ pixel_x = 0; pixel_y = -30 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -7781,11 +7781,11 @@ /area/toxins/xenobiology) "aoW" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plasteel/white, /area/toxins/xenobiology) "aoX" = ( @@ -7865,7 +7865,7 @@ /area/maintenance/fore) "api" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk7"; name = "Bunk Bolt Control 7"; @@ -7893,7 +7893,7 @@ /area/crew_quarters/sleep) "apl" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk8"; name = "Bunk Bolt Control 8"; @@ -8134,7 +8134,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/sleep) "apJ" = ( -/obj/item/weapon/storage/box/emptysandbags, +/obj/item/storage/box/emptysandbags, /turf/open/floor/plating, /area/maintenance/fore) "apK" = ( @@ -8154,7 +8154,7 @@ /area/shuttle/abandoned) "apN" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "apO" = ( @@ -8277,7 +8277,7 @@ name = "\improper Dormitory Suite 4" }) "apY" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet, @@ -8553,8 +8553,8 @@ /area/maintenance/fore) "aqA" = ( /obj/structure/rack, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/lighter, +/obj/item/storage/fancy/candle_box, +/obj/item/lighter, /turf/open/floor/plating, /area/maintenance/fore) "aqB" = ( @@ -8758,7 +8758,7 @@ /area/crew_quarters/sleep) "aqY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; name = "regular air vent"; @@ -8801,7 +8801,7 @@ /area/crew_quarters/sleep) "are" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk9"; name = "Bunk Bolt Control 9"; @@ -8829,7 +8829,7 @@ /area/crew_quarters/sleep) "arh" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk10"; name = "Bunk Bolt Control 10"; @@ -8842,14 +8842,14 @@ /turf/open/floor/carpet, /area/crew_quarters/sleep) "ari" = ( -/obj/item/weapon/paint/green, +/obj/item/paint/green, /turf/open/floor/plating, /area/maintenance/fore) "arj" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paint/yellow, +/obj/item/paint/yellow, /turf/open/floor/plating, /area/maintenance/fore) "ark" = ( @@ -8888,7 +8888,7 @@ /area/toxins/xenobiology) "aro" = ( /obj/structure/table_frame, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating, @@ -8986,7 +8986,7 @@ /area/crew_quarters/sleep) "arA" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/button/door{ id = "Dorm4"; name = "Dorm Bolt Control"; @@ -9002,7 +9002,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paint/violet, +/obj/item/paint/violet, /turf/open/floor/plating, /area/maintenance/fore) "arC" = ( @@ -9017,7 +9017,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "arE" = ( -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, @@ -9025,11 +9025,11 @@ /area/shuttle/abandoned) "arF" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "arG" = ( @@ -9132,7 +9132,7 @@ /area/crew_quarters/sleep) "arP" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk11"; name = "Bunk Bolt Control 11"; @@ -9160,7 +9160,7 @@ /area/crew_quarters/sleep) "arS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk12"; name = "Bunk Bolt Control 12"; @@ -9185,7 +9185,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "arV" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/titanium, @@ -9280,13 +9280,13 @@ /turf/open/floor/engine, /area/toxins/xenobiology) "ase" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating, /area/maintenance/fore) "asf" = ( -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plating, /area/maintenance/fore) "asg" = ( @@ -9397,21 +9397,21 @@ /area/crew_quarters/sleep) "asp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/crew_quarters/sleep) "asq" = ( /obj/structure/table, -/obj/item/weapon/paper_bin/construction, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/paint/red, +/obj/item/paper_bin/construction, +/obj/item/storage/crayons, +/obj/item/paint/red, /turf/open/floor/plating, /area/maintenance/fore) "asr" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paint/green, +/obj/item/paint/green, /turf/open/floor/plating, /area/maintenance/fore) "ass" = ( @@ -9508,7 +9508,7 @@ /area/crew_quarters/sleep) "asC" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /obj/machinery/atmospherics/components/unary/vent_pump{ dir = 4; name = "regular air vent"; @@ -9544,7 +9544,7 @@ /area/crew_quarters/sleep) "asG" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk13"; name = "Bunk Bolt Control 13"; @@ -9572,7 +9572,7 @@ /area/crew_quarters/sleep) "asJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk14"; name = "Bunk Bolt Control 14"; @@ -9595,7 +9595,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paint/white, +/obj/item/paint/white, /turf/open/floor/plating, /area/maintenance/fore) "asM" = ( @@ -9695,7 +9695,7 @@ }) "asX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/open/floor/carpet, /area/crew_quarters/sleep{ name = "\improper Dormitory Suite 2" @@ -9754,7 +9754,7 @@ /area/crew_quarters/sleep) "atf" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel, /area/crew_quarters/sleep) "atg" = ( @@ -9791,7 +9791,7 @@ /area/shuttle/abandoned) "atl" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -9804,7 +9804,7 @@ /area/shuttle/abandoned) "atn" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "ato" = ( @@ -9896,7 +9896,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "atv" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/fore) "atw" = ( @@ -10013,7 +10013,7 @@ /area/crew_quarters/sleep) "atI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk15"; name = "Bunk Bolt Control 15"; @@ -10041,7 +10041,7 @@ /area/crew_quarters/sleep) "atL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk16"; name = "Bunk Bolt Control 16"; @@ -10249,7 +10249,7 @@ /area/crew_quarters/sleep) "auf" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/wallet, +/obj/item/storage/wallet, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -10268,7 +10268,7 @@ /area/crew_quarters/sleep) "auh" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/hug/medical, +/obj/item/storage/box/hug/medical, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -10313,7 +10313,7 @@ /area/crew_quarters/sleep) "aun" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "Dorm2"; name = "Dorm Bolt Control"; @@ -10335,7 +10335,7 @@ /area/shuttle/abandoned) "auq" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aur" = ( @@ -10415,18 +10415,18 @@ /area/maintenance/fore) "aux" = ( /obj/structure/table, -/obj/item/weapon/lighter/greyscale, +/obj/item/lighter/greyscale, /turf/open/floor/plating, /area/maintenance/fore) "auy" = ( /obj/structure/table, -/obj/item/weapon/hatchet/cutterblade, -/obj/item/weapon/retractor, +/obj/item/hatchet/cutterblade, +/obj/item/retractor, /turf/open/floor/plating, /area/maintenance/fore) "auz" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/open/floor/plating, /area/maintenance/fore) "auA" = ( @@ -10438,7 +10438,7 @@ name = "\improper Dormitory Suite 2" }) "auB" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/carpet, @@ -10466,12 +10466,12 @@ /area/crew_quarters/sleep) "auG" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel, /area/crew_quarters/sleep) "auH" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel, /area/crew_quarters/sleep) "auI" = ( @@ -10514,7 +10514,7 @@ /area/crew_quarters/sleep) "auN" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk17"; name = "Bunk Bolt Control 17"; @@ -10542,7 +10542,7 @@ /area/crew_quarters/sleep) "auQ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "bunk18"; name = "Bunk Bolt Control 18"; @@ -10560,7 +10560,7 @@ /area/maintenance/fore) "auS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced{ dir = 1 }, @@ -10799,7 +10799,7 @@ /area/crew_quarters/sleep) "avp" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -10828,7 +10828,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "avs" = ( -/obj/item/weapon/paint/black, +/obj/item/paint/black, /turf/open/floor/plating, /area/maintenance/fore) "avt" = ( @@ -10889,7 +10889,7 @@ /area/toxins/xenobiology) "avz" = ( /obj/structure/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/airless/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11030,7 +11030,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "avT" = ( -/obj/item/weapon/paint/paint_remover, +/obj/item/paint/paint_remover, /turf/open/floor/plating, /area/maintenance/fore) "avU" = ( @@ -11103,13 +11103,13 @@ dir = 9 }, /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/toxins/xenobiology) "awc" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/plating/airless/astplate{ baseturf = /turf/open/floor/plating/asteroid/airless }, @@ -11140,7 +11140,7 @@ }) "awg" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating, /area/maintenance/fore) "awh" = ( @@ -11214,7 +11214,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "awp" = ( -/obj/item/weapon/paint/blue, +/obj/item/paint/blue, /turf/open/floor/plating, /area/maintenance/fore) "awq" = ( @@ -11303,7 +11303,7 @@ }) "awC" = ( /obj/structure/grille, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/fore) "awD" = ( @@ -11311,7 +11311,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "awE" = ( -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/open/floor/plating, /area/maintenance/fore) "awF" = ( @@ -11580,7 +11580,7 @@ }) "axk" = ( /obj/structure/grille, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/plating, @@ -11653,7 +11653,7 @@ name = "regular air scrubber"; on = 1 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel{ icon_state = "freezerfloor" }, @@ -11714,7 +11714,7 @@ /turf/closed/wall, /area/crew_quarters/fitness) "axA" = ( -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "axB" = ( @@ -11975,7 +11975,7 @@ /area/crew_quarters/fitness) "ayd" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -12091,7 +12091,7 @@ "ayn" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/plating, /area/maintenance/fpmaint{ name = "Secure Workstations Maintenance" @@ -12667,7 +12667,7 @@ /area/maintenance/fore) "azw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/purple, +/obj/item/bedsheet/purple, /turf/open/floor/carpet, /area/crew_quarters/sleep{ name = "\improper Dormitory Suites" @@ -12691,7 +12691,7 @@ name = "\improper Dormitory Suites" }) "azz" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_y = 32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -12963,7 +12963,7 @@ /area/crew_quarters/fitness) "azY" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel, /area/crew_quarters/fitness) "azZ" = ( @@ -13475,7 +13475,7 @@ /area/maintenance/fore) "aBj" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plating, /area/maintenance/fore) "aBk" = ( @@ -13520,7 +13520,7 @@ /area/library) "aBp" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/carpet, /area/library) "aBq" = ( @@ -13535,7 +13535,7 @@ /area/library) "aBs" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid }, @@ -13735,7 +13735,7 @@ /area/maintenance/fore) "aBS" = ( /obj/structure/rack, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plating, /area/maintenance/fore) "aBT" = ( @@ -13782,7 +13782,7 @@ /area/library) "aBZ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light{ icon_state = "tube1"; dir = 4 @@ -13797,7 +13797,7 @@ icon_state = "camera"; dir = 4 }, -/obj/item/weapon/storage/bag/books, +/obj/item/storage/bag/books, /turf/open/floor/wood, /area/library) "aCb" = ( @@ -13811,7 +13811,7 @@ /area/library) "aCc" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/components/unary/vent_pump{ name = "regular air vent"; on = 1 @@ -13869,7 +13869,7 @@ dir = 4; pixel_x = 0 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ tag = "icon-plant-17"; icon_state = "plant-17" }, @@ -13910,7 +13910,7 @@ /area/maintenance/fore) "aCn" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid }, @@ -13923,14 +13923,14 @@ /area/maintenance/fore) "aCp" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid }, /area/maintenance/fore) "aCq" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/drinkingglasses, +/obj/item/storage/box/drinkingglasses, /turf/open/floor/wood{ baseturf = /turf/open/floor/plating/asteroid }, @@ -13950,7 +13950,7 @@ layer = 2.9 }, /obj/structure/rack, -/obj/item/weapon/restraints/handcuffs/fake/kinky, +/obj/item/restraints/handcuffs/fake/kinky, /turf/open/floor/plating, /area/maintenance/fore) "aCt" = ( @@ -13991,7 +13991,7 @@ /area/maintenance/fore) "aCx" = ( /obj/structure/rack, -/obj/item/weapon/storage/backpack/clown, +/obj/item/storage/backpack/clown, /turf/open/floor/plating, /area/maintenance/fore) "aCy" = ( @@ -14103,7 +14103,7 @@ dir = 9 }, /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/item/clothing/glasses/monocle, /turf/open/floor/wood, /area/library) @@ -14124,7 +14124,7 @@ scrub_Toxins = 0 }, /obj/structure/table/wood/fancy, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-15"; pixel_x = 0; pixel_y = 12; @@ -14308,7 +14308,7 @@ /area/maintenance/fore) "aDe" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plating, /area/maintenance/fore) "aDf" = ( @@ -14348,7 +14348,7 @@ /area/library) "aDj" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-15"; pixel_x = 0; pixel_y = 12; @@ -14442,7 +14442,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -14528,14 +14528,14 @@ name = "Asteroid" }) "aDC" = ( -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /turf/open/floor/plating, /area/maintenance/fore) "aDD" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plating, /area/maintenance/fore) "aDE" = ( @@ -14924,8 +14924,8 @@ "aEz" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/cups, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, +/obj/item/storage/box/cups, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; @@ -14956,14 +14956,14 @@ }) "aEC" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria{ name = "Cafe" }) "aED" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/cafeteria{ name = "Cafe" @@ -15229,7 +15229,7 @@ /turf/open/floor/wood, /area/library) "aFi" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -15487,12 +15487,12 @@ /area/library) "aFK" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/library) "aFL" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -15627,16 +15627,16 @@ }) "aGa" = ( /obj/structure/janitorialcart, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plasteel, /area/janitor) "aGb" = ( -/obj/item/weapon/caution, -/obj/item/weapon/caution, -/obj/item/weapon/caution, -/obj/item/weapon/caution, -/obj/item/weapon/caution, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/caution, +/obj/item/caution, +/obj/item/caution, +/obj/item/caution, +/obj/item/caution, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/janitor) "aGc" = ( @@ -15646,7 +15646,7 @@ /area/janitor) "aGd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -15655,15 +15655,15 @@ /area/janitor) "aGe" = ( /obj/structure/table, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_y = -29 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel, /area/janitor) "aGf" = ( @@ -15721,7 +15721,7 @@ /area/chapel/main) "aGo" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /turf/open/floor/wood, /area/chapel/main) "aGp" = ( @@ -15794,10 +15794,10 @@ /area/chapel/main) "aGz" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel, -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel, -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel, -/obj/item/weapon/reagent_containers/food/snacks/poppypretzel, +/obj/item/reagent_containers/food/snacks/poppypretzel, +/obj/item/reagent_containers/food/snacks/poppypretzel, +/obj/item/reagent_containers/food/snacks/poppypretzel, +/obj/item/reagent_containers/food/snacks/poppypretzel, /turf/open/floor/plasteel/chapel{ tag = "icon-chapel (EAST)"; icon_state = "chapel"; @@ -15882,7 +15882,7 @@ dir = 4; pixel_x = 0 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/maintenance/starboard) "aGN" = ( @@ -16019,7 +16019,7 @@ pixel_x = 24 }, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, /turf/open/floor/plasteel/chapel, /area/chapel/main) "aHd" = ( @@ -16112,7 +16112,7 @@ icon_state = "bulb1"; dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ tag = "icon-plant-18"; icon_state = "plant-18" }, @@ -16162,7 +16162,7 @@ }) "aHs" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/machinery/power/apc{ dir = 2; name = "Cafateria APC"; @@ -16195,7 +16195,7 @@ dir = 4; pixel_x = 0 }, -/obj/item/weapon/storage/backpack/botany, +/obj/item/storage/backpack/botany, /turf/open/floor/plating, /area/maintenance/starboard) "aHv" = ( @@ -16237,8 +16237,8 @@ /area/chapel/main) "aHA" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/wood, /area/chapel/main) "aHB" = ( @@ -16403,7 +16403,7 @@ /area/maintenance/starboard) "aHW" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/structure/cable{ icon_state = "2-4"; tag = "icon-2-8" @@ -16412,7 +16412,7 @@ /area/chapel/main) "aHX" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -16487,7 +16487,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -16745,8 +16745,8 @@ "aIC" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/wood, /area/chapel/main) "aID" = ( @@ -17074,7 +17074,7 @@ /area/chapel/main) "aJm" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine, +/obj/item/reagent_containers/food/drinks/bottle/wine, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -17250,7 +17250,7 @@ /area/hydroponics) "aJG" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aJH" = ( @@ -17435,7 +17435,7 @@ /area/chapel/main) "aKe" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/bun, +/obj/item/reagent_containers/food/snacks/bun, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -17825,7 +17825,7 @@ "aLb" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/wood, /area/crew_quarters/theatre) "aLc" = ( @@ -18074,7 +18074,7 @@ }, /obj/structure/table, /obj/machinery/juicer, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/hydroponics_pod_people, /obj/machinery/camera/autoname{ tag = "icon-camera (EAST)"; icon_state = "camera"; @@ -18175,8 +18175,8 @@ /area/chapel/main) "aLL" = ( /obj/structure/closet/wardrobe/chaplain_black, -/obj/item/weapon/storage/book/bible/booze, -/obj/item/weapon/nullrod, +/obj/item/storage/book/bible/booze, +/obj/item/nullrod, /turf/open/floor/plasteel/grimy, /area/chapel/office) "aLM" = ( @@ -18402,8 +18402,8 @@ /area/crew_quarters/bar) "aMl" = ( /obj/structure/closet/secure_closet/bar, -/obj/item/weapon/vending_refill/boozeomat, -/obj/item/weapon/vending_refill/cigarette, +/obj/item/vending_refill/boozeomat, +/obj/item/vending_refill/cigarette, /obj/machinery/atmospherics/components/unary/vent_pump{ name = "regular air vent"; on = 1 @@ -18419,7 +18419,7 @@ }, /obj/item/clothing/head/that, /obj/structure/table/wood, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/sunglasses/reagent, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18427,7 +18427,7 @@ /turf/open/floor/wood, /area/crew_quarters/bar) "aMn" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_y = 32 }, /obj/structure/reagent_dispensers/beerkeg, @@ -18603,7 +18603,7 @@ /area/hydroponics) "aMH" = ( /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/watertank, +/obj/item/watertank, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aMI" = ( @@ -18655,9 +18655,9 @@ /area/hydroponics) "aMP" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel{ icon_state = "hydrofloor" }, @@ -18711,8 +18711,8 @@ /area/medical/morgue) "aMW" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/airalarm{ dir = 8; icon_state = "alarm0"; @@ -19231,7 +19231,7 @@ /area/medical/morgue) "aOc" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/black, /area/medical/morgue) "aOd" = ( @@ -19255,7 +19255,7 @@ /area/chapel/office) "aOg" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/structure/cable{ tag = "icon-1-2"; icon_state = "1-2" @@ -19264,8 +19264,8 @@ /area/chapel/office) "aOh" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/grimy, /area/chapel/office) "aOi" = ( @@ -19319,7 +19319,7 @@ /area/crew_quarters/theatre) "aOq" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick, +/obj/item/lipstick, /turf/open/floor/wood, /area/crew_quarters/theatre) "aOr" = ( @@ -19375,7 +19375,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aOy" = ( @@ -19383,11 +19383,11 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 9 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aOz" = ( @@ -19403,7 +19403,7 @@ icon_state = "pipe-j2" }, /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aOB" = ( @@ -19594,7 +19594,7 @@ /area/chapel/office) "aOZ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -19684,7 +19684,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, /obj/structure/table/wood/bar, /turf/open/floor/wood, /area/crew_quarters/theatre) @@ -19771,7 +19771,7 @@ name = "HoochMaster Deluxe"; pixel_x = -4 }, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aPt" = ( @@ -19808,8 +19808,8 @@ /area/crew_quarters/kitchen) "aPx" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -20205,8 +20205,8 @@ /area/crew_quarters/theatre) "aQu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/rag, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aQv" = ( @@ -20310,8 +20310,8 @@ /area/quartermaster/miningdock) "aQK" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/shovel, +/obj/item/storage/bag/ore, +/obj/item/shovel, /turf/open/floor/plasteel/brown{ tag = "icon-brown (NORTHWEST)"; dir = 9; @@ -20332,12 +20332,12 @@ /area/quartermaster/miningdock) "aQN" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/open/floor/plating, /area/maintenance/port) "aQO" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plating, /area/maintenance/port) "aQP" = ( @@ -20350,7 +20350,7 @@ /area/maintenance/port) "aQQ" = ( /obj/structure/closet, -/obj/item/weapon/storage/backpack/chemistry, +/obj/item/storage/backpack/chemistry, /turf/open/floor/plating, /area/maintenance/port) "aQR" = ( @@ -20539,7 +20539,7 @@ /area/crew_quarters/bar) "aRq" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) @@ -20609,7 +20609,7 @@ /area/shuttle/labor) "aRA" = ( /obj/structure/table, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plasteel/brown{ dir = 8 }, @@ -20808,7 +20808,7 @@ /area/crew_quarters/kitchen) "aSb" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/tray, +/obj/item/storage/bag/tray, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "aSc" = ( @@ -20906,13 +20906,13 @@ /area/medical/genetics) "aSq" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/white, /area/medical/genetics) "aSr" = ( /obj/machinery/light/small, /obj/structure/table/glass, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/open/floor/plasteel/white, /area/medical/genetics) "aSs" = ( @@ -20924,8 +20924,8 @@ }, /obj/structure/cable, /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/folder/white, +/obj/item/paper_bin, +/obj/item/folder/white, /turf/open/floor/plasteel/white, /area/medical/genetics) "aSt" = ( @@ -20937,8 +20937,8 @@ pixel_y = 28 }, /obj/structure/table, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "aSv" = ( @@ -20946,14 +20946,14 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/scalpel, -/obj/item/weapon/retractor, +/obj/item/scalpel, +/obj/item/retractor, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "aSw" = ( /obj/structure/table, -/obj/item/weapon/hemostat, -/obj/item/weapon/cautery, +/obj/item/hemostat, +/obj/item/cautery, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "aSx" = ( @@ -20961,12 +20961,12 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel/white/side, /area/medical/surgery) "aSy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white/corner{ tag = "icon-whitecorner (WEST)"; icon_state = "whitecorner"; @@ -20989,7 +20989,7 @@ /obj/machinery/firealarm{ pixel_y = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light/small{ @@ -21223,7 +21223,7 @@ /area/medical/surgery) "aTh" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/white/side{ tag = "icon-whitehall (WEST)"; icon_state = "whitehall"; @@ -21292,7 +21292,7 @@ /area/crew_quarters/bar) "aTs" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/grass, /area/construction/hallway{ name = "Biodome Hallway" @@ -21393,7 +21393,7 @@ layer = 2.9 }, /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/port) "aTG" = ( @@ -21457,8 +21457,8 @@ icon_state = "0-8" }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/disks, -/obj/item/weapon/storage/pill_bottle/mutadone, +/obj/item/storage/box/disks, +/obj/item/storage/pill_bottle/mutadone, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -21474,8 +21474,8 @@ pixel_y = 24 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/injectors, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/box/injectors, +/obj/item/storage/pill_bottle/mannitol, /obj/structure/cable{ tag = "icon-2-8"; icon_state = "2-8" @@ -21558,7 +21558,7 @@ /turf/open/floor/plasteel/black, /area/medical/surgery) "aTW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ tag = "icon-plant-17"; icon_state = "plant-17" }, @@ -21741,10 +21741,10 @@ name = "Spares"; req_access_txt = "57" }, -/obj/item/weapon/storage/box/ids, -/obj/item/weapon/storage/box/ids, -/obj/item/weapon/storage/box/PDAs, -/obj/item/weapon/storage/box/PDAs, +/obj/item/storage/box/ids, +/obj/item/storage/box/ids, +/obj/item/storage/box/PDAs, +/obj/item/storage/box/PDAs, /turf/open/floor/wood, /area/crew_quarters/heads) "aUu" = ( @@ -21825,7 +21825,7 @@ /area/maintenance/port) "aUE" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /turf/open/floor/plating, /area/maintenance/port) "aUF" = ( @@ -22080,13 +22080,13 @@ /area/maintenance/port) "aVk" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/poster/random_contraband, +/obj/item/paper, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/port) "aVl" = ( /obj/structure/rack, -/obj/item/weapon/razor, +/obj/item/razor, /turf/open/floor/plating, /area/maintenance/port) "aVm" = ( @@ -22181,11 +22181,11 @@ /area/medical/surgery) "aVx" = ( /obj/structure/table, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/masks{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/white/side{ tag = "icon-whitehall (NORTH)"; icon_state = "whitehall"; @@ -22211,7 +22211,7 @@ /area/medical/surgery) "aVA" = ( /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/black, @@ -22372,7 +22372,7 @@ /area/crew_quarters/heads) "aVU" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -22523,10 +22523,10 @@ }) "aWp" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 9 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/plasteel/bar, /area/crew_quarters/bar) "aWq" = ( @@ -22611,8 +22611,8 @@ /area/crew_quarters/heads) "aWA" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/hop, +/obj/item/folder/blue, +/obj/item/stamp/hop, /turf/open/floor/wood, /area/crew_quarters/heads) "aWB" = ( @@ -22906,7 +22906,7 @@ /area/crew_quarters/heads) "aXl" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood, /area/crew_quarters/heads) "aXm" = ( @@ -22932,7 +22932,7 @@ dir = 8 }, /obj/structure/rack, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating, /area/maintenance/port) "aXr" = ( @@ -23062,7 +23062,7 @@ "aXD" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/glass, -/obj/item/weapon/storage/box/rxglasses, +/obj/item/storage/box/rxglasses, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -23303,7 +23303,7 @@ icon_state = "1-2" }, /obj/structure/rack, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, /turf/open/floor/plating, /area/maintenance/port) "aYi" = ( @@ -23414,7 +23414,7 @@ /area/medical/genetics_cloning) "aYu" = ( /obj/machinery/computer/cloning, -/obj/item/weapon/book/manual/medical_cloning, +/obj/item/book/manual/medical_cloning, /turf/open/floor/plasteel/whitepurple, /area/medical/genetics_cloning) "aYv" = ( @@ -23734,14 +23734,14 @@ /area/medical/patients_rooms) "aZb" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/salglu_solution, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/salglu_solution, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "aZc" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/landmark{ name = "revenantspawn" }, @@ -23768,7 +23768,7 @@ /area/medical/patients_rooms) "aZg" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cmo, +/obj/item/bedsheet/cmo, /turf/open/floor/carpet, /area/medical/medbay3) "aZh" = ( @@ -23799,8 +23799,8 @@ /area/medical/cryo) "aZm" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/open/floor/plasteel/whitepurple/corner{ tag = "icon-whitepurplecorner (EAST)"; icon_state = "whitepurplecorner"; @@ -23817,8 +23817,8 @@ /area/medical/cryo) "aZo" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /turf/open/floor/plasteel/whitepurple/corner{ tag = "icon-whitepurplecorner (NORTH)"; icon_state = "whitepurplecorner"; @@ -23850,8 +23850,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -24142,7 +24142,7 @@ tag = "icon-1-2"; icon_state = "1-2" }, -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/open/floor/plating, /area/maintenance/port) "aZY" = ( @@ -24261,8 +24261,8 @@ /area/medical/cmo) "bam" = ( /obj/structure/bookcase/manuals/medical, -/obj/item/weapon/book/manual/wiki/chemistry, -/obj/item/weapon/book/manual/medical_cloning, +/obj/item/book/manual/wiki/chemistry, +/obj/item/book/manual/medical_cloning, /turf/open/floor/plasteel/cmo, /area/medical/cmo) "ban" = ( @@ -24517,7 +24517,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/phone, +/obj/item/phone, /turf/open/floor/plating, /area/maintenance/port) "baP" = ( @@ -25365,7 +25365,7 @@ }, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; @@ -25436,10 +25436,10 @@ /obj/structure/table/wood, /obj/machinery/computer/med_data/laptop, /obj/structure/window/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 9 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/cmo, /area/medical/cmo) "bcz" = ( @@ -25454,7 +25454,7 @@ /obj/structure/table/wood, /obj/structure/window/reinforced, /obj/machinery/keycard_auth, -/obj/item/weapon/stamp/cmo{ +/obj/item/stamp/cmo{ pixel_x = 9 }, /turf/open/floor/plasteel/cmo, @@ -25901,8 +25901,8 @@ /area/medical/patients_rooms) "bdw" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "bdx" = ( @@ -26531,10 +26531,10 @@ /area/medical/patients_rooms) "beF" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/drinkingglass, +/obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/barber, /area/medical/medbay3) "beG" = ( @@ -26634,8 +26634,8 @@ }) "beQ" = ( /obj/structure/table/glass, -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/soap/nanotrasen, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -26714,7 +26714,7 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/cmo, /area/medical/cmo) "beY" = ( @@ -26745,22 +26745,22 @@ "bfb" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/darkred, /area/ai_monitored/security/armory{ name = "Emergency Storage" }) "bfc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/machinery/button/door{ id = "civ armory outer"; name = "Civilian Armory Outer Shutters"; @@ -26779,11 +26779,11 @@ }) "bfe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/medipens{ +/obj/item/storage/box/medipens{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/medipens/utility, +/obj/item/storage/box/medipens/utility, /obj/machinery/button/door{ id = "civ armory inner"; name = "Civilian Armory Inner Shutters"; @@ -26800,8 +26800,8 @@ req_access_txt = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/storage/backpack/dufflebag/sec{ - contents = newlist(/obj/item/weapon/scalpel,/obj/item/weapon/hemostat,/obj/item/weapon/retractor,/obj/item/weapon/cautery,/obj/item/weapon/circular_saw,/obj/item/weapon/surgical_drapes,/obj/item/clothing/mask/surgical); +/obj/item/storage/backpack/dufflebag/sec{ + contents = newlist(/obj/item/scalpel,/obj/item/hemostat,/obj/item/retractor,/obj/item/cautery,/obj/item/circular_saw,/obj/item/surgical_drapes,/obj/item/clothing/mask/surgical); desc = "A large dufflebag for holding extra supplies - this one has a material inlay with space for various sharp-looking tools."; name = "dufflebag"; pixel_y = 5 @@ -26991,8 +26991,8 @@ pixel_y = -22 }, /obj/structure/table, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/bag/ore, +/obj/item/pickaxe, +/obj/item/storage/bag/ore, /turf/open/floor/plasteel/brown, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -27052,8 +27052,8 @@ "bfG" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/salglu_solution, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/salglu_solution, /turf/open/floor/plasteel/white, /area/medical/patients_rooms) "bfH" = ( @@ -27076,11 +27076,11 @@ }, /obj/structure/table, /obj/machinery/juicer, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, /turf/open/floor/plasteel/barber, /area/medical/medbay3) "bfJ" = ( @@ -27472,17 +27472,17 @@ }) "bgy" = ( /obj/structure/table, -/obj/item/weapon/pickaxe, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/shovel, /turf/open/floor/plasteel/brown, /area/quartermaster/miningdock{ name = "\improper Mining Office" }) "bgz" = ( /obj/structure/table, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plasteel/brown, /area/quartermaster/miningdock{ name = "\improper Mining Office" @@ -27572,7 +27572,7 @@ "bgK" = ( /obj/structure/table, /obj/machinery/microwave, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/item/device/radio/intercom{ dir = 8; pixel_x = -28 @@ -27658,7 +27658,7 @@ }) "bgT" = ( /obj/machinery/chem_dispenser, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (NORTHWEST)"; icon_state = "whiteyellow"; @@ -27667,7 +27667,7 @@ /area/medical/chemistry) "bgU" = ( /obj/machinery/chem_master, -/obj/item/weapon/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (NORTH)"; icon_state = "whiteyellow"; @@ -27690,7 +27690,7 @@ /obj/machinery/vending/wallmed{ pixel_y = 28 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/clothing/glasses/science, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (NORTH)"; @@ -27727,7 +27727,7 @@ dir = 1 }, /obj/machinery/chem_master, -/obj/item/weapon/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (NORTH)"; icon_state = "whiteyellow"; @@ -27736,7 +27736,7 @@ /area/medical/chemistry) "bha" = ( /obj/machinery/chem_dispenser, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (NORTHEAST)"; icon_state = "whiteyellow"; @@ -27757,7 +27757,7 @@ /area/hallway/primary/port) "bhd" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" @@ -27765,25 +27765,25 @@ "bhe" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" }) "bhf" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" }) "bhg" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/silver_ids{ +/obj/item/storage/box/silver_ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" @@ -27822,14 +27822,14 @@ }) "bhi" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/flashbangs, +/obj/item/storage/box/flashbangs, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" }) "bhj" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/flashes, +/obj/item/storage/box/flashes, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" @@ -27839,7 +27839,7 @@ req_access_txt = 1 }, /obj/structure/rack, -/obj/item/weapon/storage/box/mechabeacons, +/obj/item/storage/box/mechabeacons, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" @@ -27851,7 +27851,7 @@ icon_state = "1-2" }, /obj/structure/rack, -/obj/item/weapon/storage/box/teargas, +/obj/item/storage/box/teargas, /turf/open/floor/plasteel/black, /area/ai_monitored/security/armory{ name = "Emergency Storage" @@ -28126,12 +28126,12 @@ }) "bhT" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/pill_bottle/epinephrine, -/obj/item/weapon/storage/pill_bottle/charcoal, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/storage/pill_bottle/epinephrine, +/obj/item/storage/pill_bottle/charcoal, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -28249,8 +28249,8 @@ /area/security/checkpoint) "bif" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, +/obj/item/paper_bin, +/obj/item/pen/red, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 0; @@ -28411,8 +28411,8 @@ /area/security/checkpoint) "biq" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, +/obj/item/paper_bin, +/obj/item/pen/red, /obj/machinery/camera/autoname{ tag = "icon-camera (SOUTHEAST)"; icon_state = "camera"; @@ -28955,7 +28955,7 @@ /area/security/checkpoint) "bjx" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/hand_labeler_refill, /turf/open/floor/plasteel, /area/quartermaster/office) @@ -29190,7 +29190,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/starboard) "bjQ" = ( @@ -29435,7 +29435,7 @@ dir = 8 }, /obj/structure/closet/wardrobe/chemistry_white, -/obj/item/weapon/storage/backpack/chemistry, +/obj/item/storage/backpack/chemistry, /turf/open/floor/plasteel/whiteyellow/side{ tag = "icon-whiteyellow (SOUTHWEST)"; icon_state = "whiteyellow"; @@ -29445,15 +29445,15 @@ "bkj" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/box/pillbottles{ +/obj/item/storage/box/pillbottles{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plasteel/whiteyellow/side, /area/medical/chemistry) "bkk" = ( @@ -29466,11 +29466,11 @@ /area/medical/chemistry) "bkl" = ( /obj/structure/table/glass, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/screwdriver, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver, /turf/open/floor/plasteel/whiteyellow/side, /area/medical/chemistry) "bkm" = ( @@ -29541,7 +29541,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/status_display{ dir = 8; pixel_x = -32 @@ -29575,7 +29575,7 @@ "bkw" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/darkbrown/side{ tag = "icon-darkbrown (NORTH)"; icon_state = "darkbrown"; @@ -29606,11 +29606,11 @@ tag = "" }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/multitool, /turf/open/floor/plasteel/darkbrown/side{ tag = "icon-darkbrown (NORTH)"; @@ -29674,7 +29674,7 @@ icon_state = "2-8" }, /obj/structure/table, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /obj/item/device/assembly/flash, /obj/machinery/status_display{ dir = 4; @@ -30080,7 +30080,7 @@ pixel_x = -24; pixel_y = 0 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/black, /area/bridge) "blz" = ( @@ -30339,8 +30339,8 @@ "bmi" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/salglu_solution, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/salglu_solution, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -30348,7 +30348,7 @@ /area/medical/patients_rooms) "bmj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -30399,7 +30399,7 @@ pixel_x = -24; pixel_y = 0 }, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -30431,9 +30431,9 @@ /area/medical/medbay3) "bmr" = ( /obj/structure/rack, -/obj/item/weapon/caution, -/obj/item/weapon/caution, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/caution, +/obj/item/caution, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -30648,7 +30648,7 @@ tag = "icon-pipe-j1 (WEST)" }, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -31276,10 +31276,10 @@ pixel_x = -24 }, /obj/structure/rack, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/glass/bottle/potass_iodide, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/glass/bottle/potass_iodide, +/obj/item/reagent_containers/glass/bottle/morphine, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -31303,7 +31303,7 @@ /area/medical/medbay3) "bnP" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -31798,8 +31798,8 @@ pixel_y = 23 }, /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /turf/open/floor/plasteel/brown{ tag = "icon-brown (NORTH)"; icon_state = "brown"; @@ -31825,7 +31825,7 @@ /area/quartermaster/office) "boP" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/brown{ tag = "icon-brown (NORTH)"; icon_state = "brown"; @@ -31835,7 +31835,7 @@ "boQ" = ( /obj/structure/table, /obj/item/device/multitool, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/brown{ tag = "icon-brown (NORTH)"; icon_state = "brown"; @@ -31845,7 +31845,7 @@ "boR" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/brown{ tag = "icon-brown (NORTHEAST)"; icon_state = "brown"; @@ -31995,10 +31995,10 @@ pixel_y = 0 }, /obj/structure/rack, -/obj/item/weapon/reagent_containers/glass/bottle/histamine, -/obj/item/weapon/reagent_containers/glass/bottle/histamine, -/obj/item/weapon/reagent_containers/glass/bottle/formaldehyde, -/obj/item/weapon/reagent_containers/glass/bottle/toxin, +/obj/item/reagent_containers/glass/bottle/histamine, +/obj/item/reagent_containers/glass/bottle/histamine, +/obj/item/reagent_containers/glass/bottle/formaldehyde, +/obj/item/reagent_containers/glass/bottle/toxin, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -32010,10 +32010,10 @@ /area/medical/medbay3) "bpg" = ( /obj/structure/rack, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/chemistry, -/obj/item/weapon/cartridge/chemistry, +/obj/item/cartridge/medical, +/obj/item/cartridge/medical, +/obj/item/cartridge/chemistry, +/obj/item/cartridge/chemistry, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, @@ -32022,16 +32022,16 @@ }, /area/medical/medbay3) "bph" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = -3; pixel_y = -3 }, @@ -32086,20 +32086,20 @@ pixel_x = 24 }, /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/BMinus, -/obj/item/weapon/reagent_containers/blood/BMinus, -/obj/item/weapon/reagent_containers/blood/BPlus, -/obj/item/weapon/reagent_containers/blood/BPlus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus, -/obj/item/weapon/reagent_containers/blood/OPlus, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/BMinus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/BPlus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/OPlus, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; @@ -32319,12 +32319,12 @@ pixel_y = 24 }, /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes/cigars, -/obj/item/weapon/coin/plasma{ +/obj/item/storage/fancy/cigarettes/cigars, +/obj/item/coin/plasma{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = -6 }, /turf/open/floor/wood, @@ -32374,12 +32374,12 @@ /area/crew_quarters/captain) "bpS" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue, +/obj/item/stamp/captain, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, -/obj/item/weapon/melee/chainofcommand, +/obj/item/melee/chainofcommand, /obj/item/device/radio/intercom{ desc = "Talk smack through this."; dir = 4; @@ -32625,25 +32625,25 @@ /area/medical/medbay3) "bqq" = ( /obj/structure/rack, -/obj/item/weapon/gun/syringe, -/obj/item/weapon/gun/syringe, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/syringes, +/obj/item/gun/syringe, +/obj/item/gun/syringe, +/obj/item/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plating{ icon_state = "floorgrime" }, /area/medical/medbay3) "bqr" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute{ pixel_x = -3; pixel_y = -3 }, @@ -32685,11 +32685,11 @@ }) "bqu" = ( /obj/structure/table, -/obj/item/weapon/storage/box/medipens{ +/obj/item/storage/box/medipens{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (EAST)"; icon_state = "whiteblue"; @@ -32725,7 +32725,7 @@ /area/security/checkpoint/medical) "bqy" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -32747,8 +32747,8 @@ /area/security/checkpoint/medical) "bqA" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel{ icon_state = "redfull" }, @@ -32842,8 +32842,8 @@ /area/bridge/meeting_room) "bqJ" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/carpet, /area/bridge/meeting_room) "bqK" = ( @@ -32852,8 +32852,8 @@ initialize_directions = 11 }, /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/carpet, /area/bridge/meeting_room) "bqL" = ( @@ -32941,7 +32941,7 @@ /turf/open/floor/wood, /area/crew_quarters/captain) "bqV" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/wood, @@ -33056,11 +33056,11 @@ /area/quartermaster/office) "brf" = ( /obj/structure/table, -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -6 }, -/obj/item/weapon/stamp/denied, -/obj/item/weapon/pen{ +/obj/item/stamp/denied, +/obj/item/pen{ pixel_x = 4; pixel_y = 7 }, @@ -33245,13 +33245,13 @@ /area/medical/medbay3) "brx" = ( /obj/structure/closet/crate, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor, -/obj/item/weapon/scalpel, -/obj/item/weapon/hemostat, -/obj/item/weapon/cautery, -/obj/item/weapon/surgical_drapes, +/obj/item/surgicaldrill, +/obj/item/circular_saw, +/obj/item/retractor, +/obj/item/scalpel, +/obj/item/hemostat, +/obj/item/cautery, +/obj/item/surgical_drapes, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -33264,16 +33264,16 @@ }, /area/medical/medbay3) "brz" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin{ pixel_x = -3; pixel_y = -3 }, @@ -33287,16 +33287,16 @@ name = "Medbay Storage" }) "brA" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2{ pixel_x = -3; pixel_y = -3 }, @@ -33325,11 +33325,11 @@ }) "brD" = ( /obj/structure/table, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/masks{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (SOUTHEAST)"; icon_state = "whiteblue"; @@ -33474,8 +33474,8 @@ "brS" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/blue, +/obj/item/folder/blue, +/obj/item/pen/blue, /turf/open/floor/carpet, /area/bridge/meeting_room) "brT" = ( @@ -33504,7 +33504,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/bridge/meeting_room) "brW" = ( @@ -33641,7 +33641,7 @@ }, /obj/structure/table/wood, /obj/machinery/recharger, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/structure/window/reinforced{ dir = 8 }, @@ -34001,9 +34001,9 @@ dir = 4; pixel_x = 0 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/blue, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, /obj/machinery/door/firedoor/border_only{ tag = "icon-door_open (EAST)"; icon_state = "door_open"; @@ -34033,8 +34033,8 @@ /area/hallway/primary/port) "btc" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/camera/autoname{ tag = "icon-camera (EAST)"; icon_state = "camera"; @@ -34045,8 +34045,8 @@ "btd" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/carpet, /area/bridge/meeting_room) "bte" = ( @@ -34072,8 +34072,8 @@ /area/ai_monitored/turret_protected/ai_upload) "bth" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/freeformcore, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -34082,14 +34082,14 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/corp, +/obj/item/aiModule/core/full/corp, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/custom, /turf/open/floor/plasteel/blue, /area/ai_monitored/turret_protected/ai_upload) "bti" = ( @@ -34104,8 +34104,8 @@ /area/ai_monitored/turret_protected/ai_upload) "btk" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/zeroth/oneHuman, +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/zeroth/oneHuman, /obj/machinery/door/window{ base_state = "left"; dir = 8; @@ -34113,16 +34113,16 @@ name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/reset/purge, +/obj/item/aiModule/reset/purge, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/antimov, +/obj/item/aiModule/core/full/antimov, /obj/structure/window/reinforced{ dir = 1 }, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/aiModule/supplied/protectStation, +/obj/item/aiModule/supplied/protectStation, /turf/open/floor/plasteel/blue, /area/ai_monitored/turret_protected/ai_upload) "btl" = ( @@ -34135,13 +34135,13 @@ pixel_y = -22 }, /obj/structure/table/wood, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /turf/open/floor/wood, /area/crew_quarters/captain) "btn" = ( /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /turf/open/floor/wood, /area/crew_quarters/captain) "bto" = ( @@ -34323,7 +34323,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/maintenance/asmaint2) "btL" = ( @@ -34348,19 +34348,19 @@ /obj/item/ammo_casing/a762, /obj/item/ammo_casing/a762, /obj/item/ammo_casing/a762, -/obj/item/weapon/gun/ballistic/shotgun/boltaction, +/obj/item/gun/ballistic/shotgun/boltaction, /turf/open/floor/plasteel/darkred, /area/security/transfer) "btO" = ( /obj/structure/table/reinforced, /obj/item/device/electropack, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/signaler, /turf/open/floor/plasteel/darkred, /area/security/transfer) "btP" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/breath, /turf/open/floor/plasteel/darkred, /area/security/transfer) @@ -34374,13 +34374,13 @@ "btR" = ( /obj/structure/table/reinforced, /obj/item/device/taperecorder, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/darkred, /area/security/transfer) "btS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/darkred, /area/security/transfer) "btT" = ( @@ -34388,7 +34388,7 @@ /turf/open/floor/plasteel/darkred, /area/security/transfer) "btU" = ( -/obj/item/weapon/restraints/handcuffs/cable/zipties/used, +/obj/item/restraints/handcuffs/cable/zipties/used, /turf/open/floor/plasteel{ icon_plating = "asteroid"; icon_state = "asteroid"; @@ -34485,7 +34485,7 @@ pixel_x = -24 }, /obj/structure/rack, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/whiteblue/side{ tag = "icon-whiteblue (WEST)"; icon_state = "whiteblue"; @@ -34503,7 +34503,7 @@ icon_state = "door_open"; dir = 4 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/white, /area/medical/medbay) "bue" = ( @@ -35078,8 +35078,8 @@ icon_state = "4-8" }, /obj/structure/table/wood, -/obj/item/weapon/card/id/captains_spare, -/obj/item/weapon/reagent_containers/food/drinks/flask/gold, +/obj/item/card/id/captains_spare, +/obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -35191,7 +35191,7 @@ /area/security/checkpoint/supply) "bvE" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/open/floor/plasteel/brown{ tag = "icon-brown (WEST)"; icon_state = "brown"; @@ -35269,7 +35269,7 @@ /area/quartermaster/storage) "bvP" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/hand_labeler_refill, /turf/open/floor/plasteel/brown{ tag = "icon-brown (SOUTHEAST)"; @@ -35561,7 +35561,7 @@ /area/ai_monitored/turret_protected/ai_upload) "bwy" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, +/obj/item/aiModule/core/full/asimov, /turf/open/floor/plasteel/blue, /area/ai_monitored/turret_protected/ai_upload) "bwz" = ( @@ -35590,8 +35590,8 @@ /area/ai_monitored/turret_protected/ai_upload) "bwB" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/freeformcore, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/core/freeformcore, +/obj/item/aiModule/reset, /turf/open/floor/plasteel/blue, /area/ai_monitored/turret_protected/ai_upload) "bwC" = ( @@ -35608,7 +35608,7 @@ on = 1 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/open/floor/wood, /area/crew_quarters/captain{ name = "\improper Captain's Quarters" @@ -35680,7 +35680,7 @@ req_access_txt = "47" }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -35689,7 +35689,7 @@ "bwL" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/white, /area/toxins/lab) "bwM" = ( @@ -35770,7 +35770,7 @@ /area/security/checkpoint/supply) "bwU" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/camera/autoname{ tag = "icon-camera (NORTH)"; icon_state = "camera"; @@ -36000,7 +36000,7 @@ /turf/open/floor/wood, /area/security/hos) "bxz" = ( -/obj/item/weapon/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/HoS{ pixel_x = 35 }, /obj/structure/closet/secure_closet/hos, @@ -36141,11 +36141,11 @@ pixel_y = 1 }, /obj/structure/table/glass, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = 10; pixel_y = 5 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/white, /area/toxins/lab) "bxS" = ( @@ -36596,8 +36596,8 @@ pixel_x = 24 }, /obj/structure/table/wood, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/food/drinks/flask/det, +/obj/item/hand_labeler, +/obj/item/reagent_containers/food/drinks/flask/det, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 0; @@ -36637,8 +36637,8 @@ /area/security/hos) "byN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/deputy, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/deputy, +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, @@ -36722,7 +36722,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/shower{ tag = "icon-shower (NORTH)"; icon_state = "shower"; @@ -36818,12 +36818,12 @@ /area/toxins/lab) "bzi" = ( /obj/structure/table/glass, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/item/stack/cable_coil{ pixel_x = 3; pixel_y = 3 @@ -36958,7 +36958,7 @@ name = "Waste to Filter"; on = 1 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bzy" = ( @@ -37257,7 +37257,7 @@ /area/toxins/lab) "bAi" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /turf/open/floor/plasteel/purple, /area/toxins/lab) "bAj" = ( @@ -37265,17 +37265,17 @@ /turf/open/floor/plasteel/white, /area/toxins/lab) "bAk" = ( -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/table/glass, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -37321,8 +37321,8 @@ on = 1 }, /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/security/transfer) "bAp" = ( @@ -37332,7 +37332,7 @@ on = 1 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black, /area/security/transfer) "bAq" = ( @@ -37341,7 +37341,7 @@ /area/security/transfer) "bAr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/black, /area/security/transfer) "bAs" = ( @@ -37366,12 +37366,12 @@ dir = 8; pixel_x = 0 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bAv" = ( /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bAw" = ( @@ -37514,8 +37514,8 @@ on = 1 }, /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel{ icon_state = "grimy" }, @@ -37526,8 +37526,8 @@ on = 1 }, /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/paper_bin, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel{ icon_state = "grimy" }, @@ -37662,7 +37662,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel/whitepurple/corner, /area/crew_quarters/hor) "bBf" = ( @@ -37758,18 +37758,18 @@ /turf/open/floor/plating, /area/toxins/lab) "bBo" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/structure/table, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 0; pixel_y = 0 }, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -37827,15 +37827,15 @@ /area/toxins/lab) "bBu" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/machinery/light{ dir = 4; icon_state = "tube1" @@ -38029,7 +38029,7 @@ /area/lawoffice) "bBO" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -38045,7 +38045,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/wood, /area/lawoffice) "bBQ" = ( @@ -38121,7 +38121,7 @@ dir = 4 }, /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/item/clothing/glasses/sunglasses, /turf/open/floor/plasteel{ icon_state = "grimy" @@ -38175,8 +38175,8 @@ "bCd" = ( /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /turf/open/floor/carpet, /area/security/hos) "bCe" = ( @@ -38272,7 +38272,7 @@ }) "bCp" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel{ icon_state = "whitepurplefull" }, @@ -38389,7 +38389,7 @@ icon_state = "4-8" }, /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bCD" = ( @@ -38548,7 +38548,7 @@ dir = 1; pixel_y = 0 }, -/obj/item/weapon/gavelblock, +/obj/item/gavelblock, /obj/machinery/door/firedoor/border_only{ tag = "icon-door_open (NORTH)"; icon_state = "door_open"; @@ -38641,7 +38641,7 @@ initialize_directions = 11 }, /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/black, /area/crew_quarters/courtroom) "bCV" = ( @@ -38661,7 +38661,7 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black, /area/crew_quarters/courtroom) "bCX" = ( @@ -38692,8 +38692,8 @@ /area/lawoffice) "bCZ" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/stamp/law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/stamp/law, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -38749,7 +38749,7 @@ }, /area/security/detectives_office) "bDg" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 0; pixel_y = -23 }, @@ -38769,7 +38769,7 @@ "bDi" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood, /area/security/hos) "bDj" = ( @@ -39259,7 +39259,7 @@ /area/ai_monitored/turret_protected/ai) "bEn" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, @@ -39348,7 +39348,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /turf/open/floor/plasteel{ icon_state = "whitepurplefull" }, @@ -39559,8 +39559,8 @@ /area/shuttle/labor) "bER" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium, /area/shuttle/labor) "bES" = ( @@ -39638,7 +39638,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/maintenance/port) "bFa" = ( @@ -39650,7 +39650,7 @@ /area/crew_quarters/courtroom) "bFb" = ( /obj/structure/closet/secure_closet/courtroom, -/obj/item/weapon/gavelhammer, +/obj/item/gavelhammer, /turf/open/floor/plasteel/blue/side{ tag = "icon-blue (SOUTHWEST)"; icon_state = "blue"; @@ -39715,7 +39715,7 @@ /turf/open/floor/wood, /area/lawoffice) "bFk" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ tag = "icon-plant-18"; icon_state = "plant-18" }, @@ -39795,7 +39795,7 @@ pixel_y = 24 }, /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/red/corner{ dir = 1 }, @@ -39812,7 +39812,7 @@ "bFu" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/camera/autoname, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -39848,7 +39848,7 @@ /area/security/main) "bFx" = ( /obj/structure/closet/cabinet, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth, +/obj/item/reagent_containers/food/drinks/bottle/vermouth, /obj/item/key/security, /obj/machinery/camera/autoname{ tag = "icon-camera (NORTHWEST)"; @@ -40390,7 +40390,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel, /area/security/main) "bGy" = ( @@ -40398,7 +40398,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel, /area/security/main) "bGz" = ( @@ -40771,15 +40771,15 @@ /area/ai_monitored/security/armory) "bHm" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 4; pixel_y = -6 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, @@ -40825,15 +40825,15 @@ /area/ai_monitored/security/armory) "bHo" = ( /obj/structure/rack, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = 4; pixel_y = -7 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = 0; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -4; pixel_y = 0 }, @@ -40883,7 +40883,7 @@ /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/sunglasses, /obj/item/clothing/glasses/sunglasses, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/power/apc{ cell_type = 5000; dir = 8; @@ -41633,7 +41633,7 @@ /area/security/transfer) "bIw" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bIx" = ( @@ -41692,7 +41692,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/showroomfloor, /area/security/warden{ name = "Security Control" @@ -41849,7 +41849,7 @@ /area/security/main) "bIW" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/red/corner{ dir = 4 }, @@ -42070,7 +42070,7 @@ layer = 2.9 }, /obj/structure/closet/crate, -/obj/item/weapon/storage/belt, +/obj/item/storage/belt, /turf/open/floor/plating, /area/maintenance/asmaint2) "bJu" = ( @@ -42091,17 +42091,17 @@ /area/shuttle/labor) "bJw" = ( /obj/structure/table, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/darkred, /area/security/transfer) "bJx" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = 3; pixel_y = -3 }, @@ -42661,11 +42661,11 @@ }) "bKC" = ( /obj/structure/rack, -/obj/item/weapon/storage/lockbox/loyalty{ +/obj/item/storage/lockbox/loyalty{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 4 @@ -42679,11 +42679,11 @@ /area/ai_monitored/security/armory) "bKE" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/storage/box/trackimp, +/obj/item/storage/box/trackimp, /obj/machinery/atmospherics/components/unary/vent_scrubber{ on = 1 }, @@ -42694,15 +42694,15 @@ /area/ai_monitored/security/armory) "bKF" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = -6 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = -6; pixel_y = 3 }, @@ -42771,8 +42771,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel/showroomfloor, /area/security/warden{ name = "Security Control" @@ -43222,8 +43222,8 @@ pixel_y = -24 }, /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen{ +/obj/item/folder/white, +/obj/item/pen{ desc = "Writes upside down!"; name = "astronaut pen" }, @@ -43370,7 +43370,7 @@ locked = 0; pixel_y = 23 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/white, /area/toxins/mixing) @@ -43442,15 +43442,15 @@ /area/security/transfer) "bLT" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/plasma/light{ +/obj/item/gun/energy/plasma/light{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/gun/energy/plasma/light{ +/obj/item/gun/energy/plasma/light{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/gun/energy/plasma/light, +/obj/item/gun/energy/plasma/light, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 4 @@ -43470,12 +43470,12 @@ /area/ai_monitored/security/armory) "bLW" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -43587,7 +43587,7 @@ dir = 4 }, /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/belt/security/full, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -43614,7 +43614,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/darkred, /area/security/brig{ name = "Security" @@ -43740,8 +43740,8 @@ /area/security/main) "bMt" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel/whitered/side{ tag = "icon-whitered (NORTHWEST)"; icon_state = "whitered"; @@ -43861,7 +43861,7 @@ "bMJ" = ( /obj/machinery/light, /obj/structure/closet, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/item/device/radio/intercom{ dir = 8; pixel_x = -28 @@ -44106,15 +44106,15 @@ /area/shuttle/labor) "bNj" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/rifle{ +/obj/item/gun/energy/laser/rifle{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/gun/energy/laser/rifle{ +/obj/item/gun/energy/laser/rifle{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/gun/energy/laser/rifle, +/obj/item/gun/energy/laser/rifle, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 4 @@ -44122,16 +44122,16 @@ /area/ai_monitored/security/armory) "bNk" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/dragnet{ +/obj/item/gun/energy/e_gun/dragnet{ layer = 3.1; pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 3; pixel_y = -6 }, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, /turf/open/floor/plasteel/darkred, /area/ai_monitored/security/armory) "bNl" = ( @@ -44142,19 +44142,19 @@ }, /obj/structure/rack, /obj/item/clothing/suit/armor/laserproof, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pixel_y = -4 }, /turf/open/floor/plasteel/darkred, /area/ai_monitored/security/armory) "bNm" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -44196,7 +44196,7 @@ pixel_x = 24 }, /obj/structure/table/reinforced, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/showroomfloor, /area/security/warden{ name = "Security Control" @@ -44233,7 +44233,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/belt/security/full, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -44594,12 +44594,12 @@ req_access_txt = "29" }, /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high{ pixel_x = 10; pixel_y = 5 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = 10; pixel_y = 5 }, @@ -44834,11 +44834,11 @@ /area/toxins/mixing) "bOx" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = -3; pixel_y = 3 }, @@ -44849,12 +44849,12 @@ /area/ai_monitored/security/armory) "bOy" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -44930,7 +44930,7 @@ "bOF" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/belt/security/full, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -45024,8 +45024,8 @@ /area/security/main) "bOO" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whitered/side{ tag = "icon-whitered (WEST)"; icon_state = "whitered"; @@ -45062,8 +45062,8 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whitered/side{ tag = "icon-whitered (EAST)"; icon_state = "whitered"; @@ -45180,7 +45180,7 @@ "bPj" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/whitepurple/corner{ tag = "icon-whitepurplecorner (NORTH)"; icon_state = "whitepurplecorner"; @@ -45361,8 +45361,8 @@ /area/toxins/mixing) "bPz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -45445,15 +45445,15 @@ /area/toxins/mixing) "bPI" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = 6; pixel_y = -6 }, -/obj/item/weapon/gun/ballistic/automatic/wt550{ +/obj/item/gun/ballistic/automatic/wt550{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /turf/open/floor/plasteel{ icon_state = "vault"; dir = 4 @@ -45468,16 +45468,16 @@ /area/security/armory) "bPK" = ( /obj/structure/rack, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 4; pixel_y = -4 }, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = -2; pixel_y = 2 }, @@ -45520,14 +45520,14 @@ pixel_x = 28; syndie = 1 }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/showroomfloor, /area/security/warden{ name = "Security Control" }) "bPQ" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/showroomfloor, /area/security/warden{ name = "Security Control" @@ -45762,7 +45762,7 @@ name = "Robotics Desk"; req_access_txt = "29" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -45806,11 +45806,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -46006,7 +46006,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/belt/security/full, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -46128,8 +46128,8 @@ }) "bQV" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/folder/red, /turf/open/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -46190,15 +46190,15 @@ /area/assembly/robotics) "bRf" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -46345,7 +46345,7 @@ dir = 5 }, /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/belt/security/full, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -46366,7 +46366,7 @@ pixel_x = -28 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -46400,7 +46400,7 @@ pixel_x = -28 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -46434,7 +46434,7 @@ pixel_x = -28 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/plasteel/black, /area/security/brig{ name = "Security" @@ -46529,8 +46529,8 @@ }) "bRP" = ( /obj/structure/table, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/pen/red, +/obj/item/storage/briefcase, +/obj/item/pen/red, /turf/open/floor/plating, /area/maintenance/maintcentral{ name = "Central Maintenance" @@ -47086,7 +47086,7 @@ /area/tcommsat/computer) "bSW" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -47381,8 +47381,8 @@ /area/tcommsat/computer) "bTH" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/blue, +/obj/item/folder/blue, +/obj/item/pen/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/tcommsat/computer) @@ -47421,8 +47421,8 @@ /area/assembly/robotics) "bTN" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/plasteel/white, /area/assembly/robotics) "bTO" = ( @@ -47434,8 +47434,8 @@ "bTP" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/white, /area/assembly/robotics) "bTQ" = ( @@ -47497,7 +47497,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/disks, +/obj/item/storage/box/disks, /turf/open/floor/plating, /area/maintenance/asmaint2) "bTW" = ( @@ -47798,8 +47798,8 @@ /area/assembly/chargebay) "bUz" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, /turf/open/floor/plasteel/white, @@ -47826,14 +47826,14 @@ }) "bUB" = ( /obj/structure/table, -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /turf/open/floor/plating, /area/maintenance/asmaint2) "bUC" = ( /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/lights, +/obj/item/storage/box/lights, /turf/open/floor/plating, /area/maintenance/asmaint2) "bUD" = ( @@ -48156,8 +48156,8 @@ /area/assembly/chargebay) "bVl" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/assembly/robotics) "bVm" = ( @@ -48369,7 +48369,7 @@ /area/ai_monitored/nuke_storage) "bVL" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -48386,10 +48386,10 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/paper/gravity_gen{ +/obj/item/paper/gravity_gen{ layer = 3 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -35 @@ -48565,7 +48565,7 @@ /obj/structure/table, /obj/item/device/plant_analyzer, /obj/item/device/gps/science, -/obj/item/weapon/storage/belt, +/obj/item/storage/belt, /turf/open/floor/plating, /area/maintenance/asmaint2) "bWi" = ( @@ -48989,7 +48989,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/open/floor/plasteel, /area/storage/eva) "bXe" = ( @@ -49020,7 +49020,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -49037,23 +49037,23 @@ /turf/open/floor/circuit, /area/ai_monitored/nuke_storage) "bXi" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -49359,7 +49359,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /turf/open/floor/plasteel, /area/storage/eva) "bXT" = ( @@ -49408,11 +49408,11 @@ "bXY" = ( /obj/structure/safe, /obj/item/clothing/head/bearpelt, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -49506,7 +49506,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -49688,12 +49688,12 @@ /area/shuttle/escape) "bYH" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/crowbar, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bYI" = ( @@ -50796,12 +50796,12 @@ /area/shuttle/escape) "cbl" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cbm" = ( @@ -52294,8 +52294,8 @@ /area/ai_monitored/storage/secure) "ceg" = ( /obj/structure/table, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /obj/machinery/light/small{ dir = 1 }, @@ -52306,7 +52306,7 @@ "ceh" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell, +/obj/item/stock_parts/cell, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -52611,32 +52611,32 @@ /area/engine/chiefs_office) "ceU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/lighter, +/obj/item/clipboard, +/obj/item/lighter, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/weapon/stamp/ce, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stamp/ce, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/wood, /area/engine/chiefs_office) "ceV" = ( -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 3 }, /obj/structure/table/reinforced, /obj/machinery/light_switch{ pixel_x = 27 }, -/obj/item/weapon/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -52674,7 +52674,7 @@ "ceZ" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -52690,21 +52690,21 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/pandemic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/destructive_analyzer, -/obj/item/weapon/circuitboard/machine/protolathe, -/obj/item/weapon/circuitboard/computer/aifixer, -/obj/item/weapon/circuitboard/computer/teleporter, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, -/obj/item/weapon/circuitboard/machine/mechfab, +/obj/item/circuitboard/machine/destructive_analyzer, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/computer/aifixer, +/obj/item/circuitboard/computer/teleporter, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/mechfab, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ icon_state = "floorgrime" @@ -52715,24 +52715,24 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/mining, -/obj/item/weapon/circuitboard/machine/autolathe{ +/obj/item/circuitboard/computer/mining, +/obj/item/circuitboard/machine/autolathe{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/computer/arcade/battle, +/obj/item/circuitboard/computer/arcade/battle, /turf/open/floor/plating{ icon_state = "floorgrime" }, /area/ai_monitored/storage/secure) "cfd" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/server, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/computer/message_monitor{ +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/server, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/computer/message_monitor{ pixel_y = -5 }, /obj/structure/cable{ @@ -52917,8 +52917,8 @@ /area/engine/chiefs_office) "cfy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/paper/monitorkey, +/obj/item/folder/yellow, +/obj/item/paper/monitorkey, /obj/effect/landmark/event_spawn, /turf/open/floor/wood, /area/engine/chiefs_office) @@ -52985,11 +52985,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/aiupload{ +/obj/item/circuitboard/computer/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -53323,11 +53323,11 @@ /area/engine/chiefs_office) "cgt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /turf/open/floor/wood, /area/engine/chiefs_office) "cgu" = ( @@ -53373,15 +53373,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/card{ +/obj/item/circuitboard/computer/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = 5; pixel_y = -5 }, @@ -53416,9 +53416,9 @@ /area/ai_monitored/storage/secure) "cgz" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -53667,7 +53667,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_1) "chd" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -53790,11 +53790,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/mecha_control{ +/obj/item/circuitboard/computer/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -53802,16 +53802,16 @@ /area/ai_monitored/storage/secure) "chr" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /obj/machinery/camera/autoname{ tag = "icon-camera (EAST)"; icon_state = "camera"; @@ -53823,9 +53823,9 @@ /area/ai_monitored/storage/secure) "chs" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -53835,16 +53835,16 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning{ +/obj/item/circuitboard/computer/cloning{ pixel_x = 0 }, -/obj/item/weapon/circuitboard/computer/med_data{ +/obj/item/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod, -/obj/item/weapon/circuitboard/computer/scan_consolenew, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/computer/scan_consolenew, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -53854,11 +53854,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = 1; pixel_y = -1 }, @@ -53871,15 +53871,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/powermonitor{ +/obj/item/circuitboard/computer/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/stationalert{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -53911,9 +53911,9 @@ name = "Atmospherics Desk"; req_access_txt = "24" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ density = 0; @@ -54238,22 +54238,22 @@ }) "cih" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /turf/open/floor/plating{ icon_state = "floorgrime" }, /area/ai_monitored/storage/secure) "cii" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, /obj/machinery/light/small, /turf/open/floor/plating{ icon_state = "floorgrime" @@ -54261,12 +54261,12 @@ /area/ai_monitored/storage/secure) "cij" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /turf/open/floor/plating{ icon_state = "floorgrime" }, @@ -54491,7 +54491,7 @@ /area/hallway/secondary/entry) "ciM" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /turf/open/floor/plasteel, /area/teleporter) "ciN" = ( @@ -54860,8 +54860,8 @@ /turf/open/floor/plating, /area/maintenance/aft) "cjM" = ( -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel{ @@ -54897,7 +54897,7 @@ }, /obj/structure/disposalpipe/segment, /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/atmos) "cjQ" = ( @@ -55097,7 +55097,7 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, /turf/open/floor/plasteel, /area/engine/break_room) "ckq" = ( @@ -55375,7 +55375,7 @@ pixel_x = -30 }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel{ icon_state = "redfull" }, @@ -55678,12 +55678,12 @@ /area/shuttle/escape) "clN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27; pixel_y = 0 @@ -57207,7 +57207,7 @@ dir = 4; initialize_directions = 11 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/atmos) "coL" = ( @@ -57413,7 +57413,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_2) "cpk" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -28 }, @@ -57548,7 +57548,7 @@ /area/atmos) "cpD" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel, /area/atmos) "cpE" = ( @@ -57714,7 +57714,7 @@ /turf/open/floor/plating, /area/maintenance/atmos_control) "cpW" = ( -/obj/item/weapon/storage/backpack/industrial, +/obj/item/storage/backpack/industrial, /turf/open/floor/plating, /area/maintenance/atmos_control) "cpX" = ( @@ -57882,7 +57882,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plating, /area/maintenance/aft) "cqv" = ( @@ -58585,7 +58585,7 @@ pixel_y = 23 }, /obj/structure/rack, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/yellow/side{ dir = 5 }, @@ -59581,8 +59581,8 @@ tag = "" }, /obj/structure/table, -/obj/item/weapon/storage/toolbox, -/obj/item/weapon/storage/toolbox, +/obj/item/storage/toolbox, +/obj/item/storage/toolbox, /turf/open/floor/plasteel, /area/engine/engineering) "ctP" = ( @@ -59664,7 +59664,7 @@ }, /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/reagent_containers/pill/charcoal, +/obj/item/reagent_containers/pill/charcoal, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "ctW" = ( @@ -59674,7 +59674,7 @@ icon_state = "4-8" }, /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/camera/autoname{ tag = "icon-camera (EAST)"; icon_state = "camera"; @@ -59737,9 +59737,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -59849,10 +59849,10 @@ /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/wallframe/camera, @@ -59941,7 +59941,7 @@ tag = "" }, /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/clothing/ears/earmuffs{ pixel_x = -3; pixel_y = -2 @@ -59960,7 +59960,7 @@ icon_state = "1-8" }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel, /area/engine/engineering) "cuv" = ( @@ -59976,8 +59976,8 @@ icon_state = "2-4" }, /obj/structure/table, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/apc, +/obj/item/electronics/apc, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; icon_state = "yellow"; @@ -60056,7 +60056,7 @@ /obj/machinery/light, /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/yellow, /area/engine/engineering) "cuD" = ( @@ -60066,11 +60066,11 @@ icon_state = "2-8" }, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 6 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = -6 }, /turf/open/floor/plasteel/yellow/side{ @@ -60299,7 +60299,7 @@ on = 1 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel, /area/engine/engineering) "cuY" = ( @@ -60309,8 +60309,8 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; icon_state = "yellow"; @@ -60350,10 +60350,10 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = 3 }, -/obj/item/weapon/book/manual/engineering_singularity_safety{ +/obj/item/book/manual/engineering_singularity_safety{ pixel_x = -3 }, /turf/open/floor/plasteel/yellow/side{ @@ -60729,7 +60729,7 @@ /area/engine/engineering) "cvG" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/engine/engineering) "cvH" = ( @@ -60739,7 +60739,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/electronics/firealarm, +/obj/item/electronics/firealarm, /obj/item/stack/cable_coil{ pixel_x = 5 }, @@ -60782,7 +60782,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (WEST)"; icon_state = "yellow"; @@ -60805,9 +60805,9 @@ tag = "" }, /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/storage/belt/utility, +/obj/item/wrench, +/obj/item/crowbar/red, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; icon_state = "yellow"; @@ -61000,8 +61000,8 @@ /area/mining_construction) "cwj" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/pipe_dispenser, +/obj/item/storage/box/lights/mixed, +/obj/item/pipe_dispenser, /obj/machinery/button/door{ id = "aux_base_shutters"; name = "Public Shutters Control"; @@ -61154,7 +61154,7 @@ }, /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/yellow/side{ tag = "icon-yellow (EAST)"; icon_state = "yellow"; @@ -61247,7 +61247,7 @@ /area/engine/engineering) "cwH" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_guide, /turf/open/floor/plasteel, /area/engine/engineering) "cwI" = ( diff --git a/_maps/map_files/Deltastation/DeltaStation2.dmm b/_maps/map_files/Deltastation/DeltaStation2.dmm index d1014775e4d..879739f5c69 100644 --- a/_maps/map_files/Deltastation/DeltaStation2.dmm +++ b/_maps/map_files/Deltastation/DeltaStation2.dmm @@ -233,7 +233,7 @@ /area/construction/mining/aux_base) "aaC" = ( /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aaD" = ( @@ -246,7 +246,7 @@ /obj/item/device/radio/intercom{ pixel_x = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -267,7 +267,7 @@ /obj/item/device/radio/intercom{ pixel_x = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -26 }, /obj/effect/turf_decal/stripes/line{ @@ -477,7 +477,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 5 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -514,7 +514,7 @@ /turf/open/floor/plasteel/neutral, /area/hallway/secondary/entry) "abi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/yellow/side{ dir = 9; initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -591,8 +591,8 @@ /area/shuttle/arrival) "abr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/wrench, +/obj/item/storage/belt/utility, +/obj/item/wrench, /turf/open/floor/plasteel/yellow/side{ dir = 8 }, @@ -832,8 +832,8 @@ /area/hallway/secondary/entry) "abI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/mining_voucher, +/obj/item/clipboard, +/obj/item/mining_voucher, /obj/machinery/camera{ c_tag = "Auxillary Construction - Storage"; dir = 4; @@ -982,19 +982,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -1048,7 +1048,7 @@ /area/shuttle/arrival) "aca" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -1057,11 +1057,11 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -1073,8 +1073,8 @@ /area/shuttle/arrival) "acd" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar/red, /turf/open/floor/plasteel/yellow/side{ dir = 10 }, @@ -1195,7 +1195,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -1213,7 +1213,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -1231,7 +1231,7 @@ name = "Construction RC"; pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/yellow/side{ dir = 9; initial_gas_mix = "o2=22;n2=82;TEMP=293.15" @@ -1256,7 +1256,7 @@ name = "Station Intercom"; pixel_y = 26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/yellow/side{ dir = 5 }, @@ -1291,7 +1291,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -1301,7 +1301,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -1318,7 +1318,7 @@ dir = 1 }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -1394,7 +1394,7 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -1514,8 +1514,8 @@ "adf" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/item/device/assault_pod/mining, /turf/open/floor/plasteel/yellow/side{ dir = 4 @@ -1610,14 +1610,14 @@ /area/hallway/secondary/entry) "adr" = ( /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, /area/hallway/secondary/entry) "ads" = ( /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -1721,7 +1721,7 @@ /area/shuttle/syndicate) "adC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -1790,7 +1790,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/arrival) "adM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -1800,20 +1800,20 @@ /area/shuttle/arrival) "adN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/assistant, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) "adO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/folder, +/obj/item/storage/pill_bottle/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) "adP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -1835,7 +1835,7 @@ /turf/open/floor/plasteel/neutral, /area/construction/mining/aux_base) "adS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -1845,7 +1845,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -1890,7 +1890,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -1973,7 +1973,7 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -1983,8 +1983,8 @@ /area/shuttle/syndicate) "aei" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -2008,11 +2008,11 @@ /area/shuttle/arrival) "aen" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -2039,7 +2039,7 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/yellow/side{ dir = 4 }, @@ -2120,7 +2120,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -2146,12 +2146,12 @@ pixel_y = -22 }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/mechanical, +/obj/item/wrench, /turf/open/floor/plasteel/yellow/side{ dir = 6 }, @@ -2173,7 +2173,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2185,11 +2185,11 @@ /area/shuttle/syndicate) "aeH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -2451,7 +2451,7 @@ /area/maintenance/starboard/fore) "afj" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/maintenance/starboard/fore) "afk" = ( @@ -2824,8 +2824,8 @@ }, /area/shuttle/syndicate) "agd" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -2851,7 +2851,7 @@ /area/space) "agh" = ( /obj/structure/table, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -3030,7 +3030,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -3054,11 +3054,11 @@ "agC" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human{ +/obj/item/reagent_containers/food/snacks/meat/slab/human{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human, +/obj/item/reagent_containers/food/snacks/meat/slab/human, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) @@ -3074,11 +3074,11 @@ /area/maintenance/starboard/fore) "agF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, /obj/effect/turf_decal/delivery, @@ -3107,7 +3107,7 @@ "agJ" = ( /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -3273,7 +3273,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -3338,7 +3338,7 @@ "ahn" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/clothing/mask/muzzle, /turf/open/floor/plasteel/red/corner{ dir = 8 @@ -3471,7 +3471,7 @@ /turf/open/floor/plasteel/neutral, /area/hallway/secondary/entry) "ahF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner, @@ -3494,7 +3494,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "ahJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ @@ -3652,21 +3652,21 @@ /area/maintenance/port/fore) "aie" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/tank/internals/oxygen, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/emergency, +/obj/item/tank/internals/oxygen, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/port/fore) "aif" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) "aig" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -3682,7 +3682,7 @@ "aii" = ( /obj/structure/table/wood, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -3690,11 +3690,11 @@ /area/security/vacantoffice) "aij" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) "aik" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -3735,7 +3735,7 @@ /area/maintenance/port/fore) "aiq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/open/floor/plasteel/blue/side{ dir = 9 }, @@ -3759,7 +3759,7 @@ pixel_x = 26; pixel_y = 26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 5 @@ -3789,15 +3789,15 @@ icon_state = "1-2" }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, -/obj/item/weapon/restraints/handcuffs, +/obj/item/crowbar, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/red/side{ dir = 1 }, /area/security/checkpoint/checkpoint2) "aix" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 @@ -3874,11 +3874,11 @@ "aiE" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/blood/random{ +/obj/item/reagent_containers/blood/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/starboard/fore) @@ -3895,8 +3895,8 @@ "aiH" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/kitchen/knife/butcher, +/obj/item/storage/box/donkpockets, +/obj/item/kitchen/knife/butcher, /obj/item/stack/packageWrap, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -3943,8 +3943,8 @@ "aiM" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/plasteel/red/corner{ dir = 1 }, @@ -3958,33 +3958,33 @@ }, /area/shuttle/syndicate) "aiO" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -4003,18 +4003,18 @@ }, /area/shuttle/syndicate) "aiQ" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "aiR" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -4026,7 +4026,7 @@ }, /area/shuttle/syndicate) "aiS" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -4053,7 +4053,7 @@ }, /area/shuttle/syndicate) "aiU" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -4133,12 +4133,12 @@ /area/security/vacantoffice) "aji" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) "ajj" = ( @@ -4254,7 +4254,7 @@ /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "ajt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "aju" = ( @@ -4264,7 +4264,7 @@ /area/hallway/secondary/entry) "ajv" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "ajw" = ( @@ -4368,7 +4368,7 @@ "ajF" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/neutral/side, /area/maintenance/starboard/fore) @@ -4447,14 +4447,14 @@ }, /area/engine/atmospherics_engine) "ajR" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/electronic_marketing_den) "ajS" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, @@ -4470,18 +4470,18 @@ /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "ajU" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "ajV" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "ajW" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/item/device/taperecorder, /turf/open/floor/wood{ icon_state = "wood-broken4" @@ -4489,12 +4489,12 @@ /area/crew_quarters/electronic_marketing_den) "ajX" = ( /obj/structure/table/wood, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/firelock, +/obj/item/electronics/airlock, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "ajY" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/wood, @@ -4506,13 +4506,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "aka" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/electronics/apc, +/obj/item/clipboard, +/obj/item/electronics/apc, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "akb" = ( @@ -4557,8 +4557,8 @@ /area/security/vacantoffice) "akg" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/carpet, /area/security/vacantoffice) "akh" = ( @@ -4614,7 +4614,7 @@ "akp" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 4 @@ -4690,8 +4690,8 @@ /area/security/checkpoint/checkpoint2) "akA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -4745,19 +4745,19 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "akG" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/maintenance/starboard/fore) "akH" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/redyellow, /area/maintenance/starboard/fore) "akI" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, /area/maintenance/starboard/fore) @@ -5021,8 +5021,8 @@ icon_state = "4-8" }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 4 @@ -5092,8 +5092,8 @@ icon_state = "4-8" }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 8; name = "Security Desk"; @@ -5170,7 +5170,7 @@ /area/maintenance/starboard/fore) "alD" = ( /obj/structure/table/wood, -/obj/item/weapon/coin/antagtoken, +/obj/item/coin/antagtoken, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -5186,8 +5186,8 @@ /area/maintenance/starboard/fore) "alF" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, +/obj/item/clipboard, +/obj/item/folder, /obj/item/toy/dummy, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -5201,7 +5201,7 @@ /area/maintenance/starboard/fore) "alH" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/syndicateballoon, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/redyellow, @@ -5216,9 +5216,9 @@ /area/maintenance/disposal) "alK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -5271,7 +5271,7 @@ }, /area/engine/atmospherics_engine) "alS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/black, /area/crew_quarters/electronic_marketing_den) "alT" = ( @@ -5305,9 +5305,9 @@ /area/crew_quarters/electronic_marketing_den) "alX" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/airlock, +/obj/item/clipboard, +/obj/item/electronics/airalarm, +/obj/item/electronics/airlock, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -5336,7 +5336,7 @@ /area/crew_quarters/electronic_marketing_den) "amb" = ( /obj/structure/frame/computer, -/obj/item/weapon/circuitboard/computer/secure_data, +/obj/item/circuitboard/computer/secure_data, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood{ icon_state = "wood-broken2" @@ -5421,8 +5421,8 @@ /area/security/checkpoint/customs) "amm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/blue/side{ icon_state = "blue"; dir = 4 @@ -5515,7 +5515,7 @@ }, /area/maintenance/starboard/fore) "amz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/maintenance/starboard/fore) "amA" = ( @@ -5546,17 +5546,17 @@ "amF" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_x = 6 }, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_x = -6 }, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_y = 6 @@ -5565,7 +5565,7 @@ /area/maintenance/starboard/fore) "amG" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/clothing/head/collectable/HoP, /turf/open/floor/plasteel/redyellow, /area/maintenance/starboard/fore) @@ -5680,12 +5680,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -5693,12 +5693,12 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "amR" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -5716,22 +5716,22 @@ }, /area/shuttle/syndicate) "amT" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -5826,15 +5826,15 @@ /area/engine/atmospherics_engine) "and" = ( /obj/structure/table/wood, -/obj/item/weapon/circuitboard/computer/arcade, +/obj/item/circuitboard/computer/arcade, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/electronic_marketing_den) "ane" = ( /obj/structure/table/wood, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/circuitboard/computer/med_data, +/obj/item/electronics/airalarm, +/obj/item/circuitboard/computer/med_data, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -5856,8 +5856,8 @@ /area/crew_quarters/electronic_marketing_den) "anh" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -5921,7 +5921,7 @@ /area/maintenance/port/fore) "ano" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -5933,8 +5933,8 @@ /area/security/vacantoffice) "anq" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -5942,7 +5942,7 @@ /area/security/vacantoffice) "anr" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/machinery/camera{ c_tag = "Vacant Office"; dir = 1; @@ -5951,7 +5951,7 @@ /turf/open/floor/plasteel/grimy, /area/security/vacantoffice) "ans" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/security/vacantoffice) "ant" = ( @@ -5965,7 +5965,7 @@ /turf/open/floor/wood, /area/security/vacantoffice) "anu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/wood, @@ -5993,7 +5993,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/blue/side{ dir = 10 }, @@ -6019,7 +6019,7 @@ /area/security/checkpoint/customs) "anA" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "anB" = ( @@ -6039,7 +6039,7 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/grimy, @@ -6053,8 +6053,8 @@ /area/hallway/secondary/entry) "anE" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/entry) "anF" = ( @@ -6260,8 +6260,8 @@ /turf/open/floor/plasteel, /area/maintenance/disposal) "anW" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -6318,9 +6318,9 @@ }, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/machine/microwave, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/machine/microwave, /turf/open/floor/plasteel/black, /area/crew_quarters/electronic_marketing_den) "aoc" = ( @@ -6356,7 +6356,7 @@ }, /area/crew_quarters/electronic_marketing_den) "aoi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white, /obj/machinery/power/apc{ dir = 2; @@ -6370,8 +6370,8 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/lighter, +/obj/item/folder/red, +/obj/item/lighter, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) @@ -6455,7 +6455,7 @@ }, /area/maintenance/starboard/fore) "aoq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating, @@ -6549,8 +6549,8 @@ }, /area/maintenance/disposal) "aoz" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -6558,14 +6558,14 @@ /area/shuttle/syndicate) "aoA" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "aoB" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -6832,7 +6832,7 @@ }, /area/hallway/secondary/entry) "ape" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ @@ -6867,7 +6867,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "api" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ @@ -6912,7 +6912,7 @@ "apn" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin" }, @@ -6948,7 +6948,7 @@ }, /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin" }, @@ -6956,7 +6956,7 @@ /area/maintenance/starboard/fore) "apt" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted, +/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -7737,7 +7737,7 @@ "aqO" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/device/assembly/voice, /obj/item/clothing/head/welding, /obj/effect/spawner/lootdrop/maintenance, @@ -8019,10 +8019,10 @@ /area/engine/atmospherics_engine) "arn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = -5 }, -/obj/item/weapon/tank/internals/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 5 }, /obj/item/device/geiger_counter, @@ -8097,7 +8097,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/neutral/corner{ @@ -8151,7 +8151,7 @@ /area/hallway/secondary/entry) "arC" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/neutral/corner, @@ -8652,7 +8652,7 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "ass" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -8687,7 +8687,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/neutral/side{ dir = 4 @@ -8719,15 +8719,15 @@ /area/maintenance/port/fore) "asA" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port/fore) "asB" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/wood{ icon_state = "wood-broken7" }, @@ -8766,18 +8766,18 @@ /obj/structure/sign/nanotrasen{ pixel_y = 32 }, -/obj/item/weapon/storage/box/mousetraps{ +/obj/item/storage/box/mousetraps{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/storage/box/mousetraps, +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, /obj/effect/decal/cleanable/cobweb, @@ -8790,7 +8790,7 @@ pixel_y = 32 }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/item/key/janitor, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/neutral, @@ -8833,7 +8833,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/janitor, /turf/open/floor/plasteel/neutral, /area/janitor) @@ -8843,8 +8843,8 @@ dir = 1 }, /obj/item/stack/packageWrap, -/obj/item/weapon/crowbar, -/obj/item/weapon/hand_labeler, +/obj/item/crowbar, +/obj/item/hand_labeler, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -8859,7 +8859,7 @@ "asM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/bot, /obj/machinery/light_switch{ pixel_x = -26 @@ -9069,7 +9069,7 @@ /turf/open/space, /area/space) "ati" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -9195,7 +9195,7 @@ /area/maintenance/port/fore) "aty" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/melee/skateboard, +/obj/item/melee/skateboard, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -9272,20 +9272,20 @@ }, /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/orange, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/neutral, /area/janitor) @@ -9334,7 +9334,7 @@ /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel/neutral, @@ -9376,7 +9376,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "atS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Auxiliary Restroom"; dir = 2; @@ -9492,7 +9492,7 @@ /area/quartermaster/warehouse) "aug" = ( /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -9537,7 +9537,7 @@ /area/quartermaster/storage) "aum" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 1 @@ -9545,7 +9545,7 @@ /area/quartermaster/storage) "aun" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 26 @@ -9624,7 +9624,7 @@ "aux" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "auy" = ( @@ -9767,7 +9767,7 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "auM" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -9791,7 +9791,7 @@ /area/maintenance/port/fore) "auP" = ( /obj/structure/rack, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -9859,11 +9859,11 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/lightreplacer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -10220,7 +10220,7 @@ "avM" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/turf_decal/bot, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -10362,15 +10362,15 @@ /area/maintenance/port/fore) "awc" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -10379,10 +10379,10 @@ /area/maintenance/port/fore) "awd" = ( /obj/structure/table/wood, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/nineteenXnineteen, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/open/floor/wood{ @@ -10509,7 +10509,7 @@ }, /area/quartermaster/warehouse) "awr" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/quartermaster/warehouse) "aws" = ( @@ -11281,7 +11281,7 @@ /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "ayb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ dir = 1 }, @@ -11292,7 +11292,7 @@ "ayc" = ( /obj/structure/table, /obj/item/clothing/suit/apron/overalls, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) @@ -11309,9 +11309,9 @@ }, /obj/item/seeds/poppy/geranium, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/apple, /obj/effect/turf_decal/bot, /obj/machinery/airalarm{ pixel_y = 23 @@ -11326,7 +11326,7 @@ /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "ayg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/status_display{ pixel_y = 32 }, @@ -11337,10 +11337,10 @@ /obj/structure/table, /obj/item/stack/packageWrap, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/reagent_containers/food/snacks/grown/tea, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/cherries, +/obj/item/hand_labeler, +/obj/item/reagent_containers/food/snacks/grown/tea, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cherries, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) @@ -11638,7 +11638,7 @@ /area/quartermaster/warehouse) "ayH" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/warehouse) @@ -12356,7 +12356,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 5 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) @@ -12466,7 +12466,7 @@ /area/hallway/secondary/service) "aAp" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/service) "aAq" = ( @@ -12481,14 +12481,14 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/open/floor/plasteel/grimy, /area/hallway/secondary/service) "aAs" = ( /turf/open/floor/plasteel/grimy, /area/hallway/secondary/service) "aAt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nanotrasen{ pixel_x = 32 }, @@ -12989,8 +12989,8 @@ /area/maintenance/port/fore) "aBp" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -13116,7 +13116,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/storage/box/beanbag, +/obj/item/storage/box/beanbag, /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aBC" = ( @@ -13153,9 +13153,9 @@ pixel_y = 32; receive_ore_updates = 1 }, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -13165,19 +13165,19 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/bartender, /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aBH" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes/cigars{ +/obj/item/storage/fancy/cigarettes/cigars{ pixel_y = 6 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba{ +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ pixel_y = 3 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigars/havana, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 26 @@ -13339,7 +13339,7 @@ /area/maintenance/disposal/incinerator) "aCb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ pixel_x = -26 @@ -13354,7 +13354,7 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aCc" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -13450,7 +13450,7 @@ /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aCn" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -13458,15 +13458,15 @@ /area/engine/atmospherics_engine) "aCo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/light/small, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmospherics_engine) "aCp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -13480,14 +13480,14 @@ /area/hydroponics/garden/abandoned) "aCr" = ( /obj/structure/table, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/shovel/spade, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ pixel_x = -5 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white, /obj/machinery/power/apc{ @@ -13503,14 +13503,14 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) "aCt" = ( /obj/structure/table, /obj/item/device/plant_analyzer, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -13532,9 +13532,9 @@ /area/hydroponics/garden/abandoned) "aCw" = ( /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics/garden/abandoned) @@ -13853,7 +13853,7 @@ pixel_x = -32 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /obj/machinery/button/door{ desc = "A remote control switch."; @@ -13949,19 +13949,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -14084,7 +14084,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -14122,7 +14122,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /mob/living/simple_animal/mouse, /turf/open/floor/plasteel/neutral/corner{ @@ -14272,7 +14272,7 @@ /turf/open/floor/plasteel/vault, /area/maintenance/disposal/incinerator) "aDD" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -14441,7 +14441,7 @@ /area/engine/atmospherics_engine) "aDP" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -14502,7 +14502,7 @@ /turf/open/floor/plasteel/neutral/side, /area/maintenance/port/fore) "aDU" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -14603,7 +14603,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar) "aEb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -15324,8 +15324,8 @@ "aFp" = ( /obj/structure/table/wood, /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -15336,7 +15336,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/bedsheet/orange, +/obj/item/bedsheet/orange, /turf/open/floor/wood, /area/hallway/secondary/service) "aFr" = ( @@ -15392,7 +15392,7 @@ /area/crew_quarters/bar) "aFy" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/gun/ballistic/revolver/doublebarrel, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -15403,11 +15403,11 @@ /area/crew_quarters/bar) "aFA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/machinery/camera{ c_tag = "Bar - Fore"; dir = 4; @@ -15421,7 +15421,7 @@ /area/crew_quarters/bar) "aFC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, @@ -15459,8 +15459,8 @@ /area/hallway/primary/fore) "aFG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/sorting) @@ -15627,7 +15627,7 @@ }, /area/security/prison) "aGa" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating{ @@ -15699,9 +15699,9 @@ /area/maintenance/solars/port/fore) "aGj" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution{ dir = 9 @@ -16055,7 +16055,7 @@ /area/crew_quarters/bar) "aGT" = ( /obj/structure/closet/gmcloset, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -16080,7 +16080,7 @@ "aGV" = ( /obj/structure/table/wood, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "aGW" = ( @@ -16116,8 +16116,8 @@ "aHc" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 4; name = "Cargo Desk"; @@ -16230,7 +16230,7 @@ dir = 4; name = "Security Desk" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -16357,7 +16357,7 @@ /area/prison/execution_room) "aHA" = ( /obj/structure/lattice/catwalk, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/space, /area/space) "aHB" = ( @@ -16599,7 +16599,7 @@ /area/maintenance/port/fore) "aHY" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/button/door{ id = "AuxCabinB"; name = "Dormitory Door Lock"; @@ -16627,14 +16627,14 @@ /area/hallway/secondary/service) "aIb" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, /turf/open/floor/wood, /area/hallway/secondary/service) "aIc" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -16690,7 +16690,7 @@ /turf/open/floor/plasteel/loadingarea, /area/hallway/primary/fore) "aIi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 8 @@ -16768,7 +16768,7 @@ /turf/open/floor/plasteel/red/side, /area/security/checkpoint/supply) "aIp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -16829,14 +16829,14 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aIx" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/structure/sign/electricshock{ pixel_y = 32 }, @@ -16946,7 +16946,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light/small{ dir = 1 }, @@ -16956,7 +16956,7 @@ /area/security/prison) "aIG" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -16981,7 +16981,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -17231,17 +17231,17 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "aJk" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "aJl" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "aJm" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) @@ -17261,7 +17261,7 @@ }, /area/crew_quarters/abandoned_gambling_den) "aJo" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/abandoned_gambling_den) "aJp" = ( @@ -17332,7 +17332,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aJy" = ( @@ -17510,7 +17510,7 @@ /area/security/prison) "aJU" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -17526,8 +17526,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -17874,7 +17874,7 @@ /turf/open/floor/plasteel/vault, /area/engine/atmos) "aKE" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/engine/atmos) "aKF" = ( @@ -17891,8 +17891,8 @@ /area/crew_quarters/abandoned_gambling_den) "aKH" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, +/obj/item/clipboard, +/obj/item/folder/red, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "aKI" = ( @@ -17946,8 +17946,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/item/device/flashlight/lamp/bananalamp{ pixel_y = 5 }, @@ -17956,7 +17956,7 @@ pixel_y = 26 }, /obj/item/toy/figure/clown, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /turf/open/floor/plasteel/redblue, /area/crew_quarters/theatre) "aKQ" = ( @@ -17991,7 +17991,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/crew_quarters/bar/atrium) "aKX" = ( @@ -18008,15 +18008,15 @@ /area/crew_quarters/bar/atrium) "aKZ" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLa" = ( -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, /obj/structure/table/wood, @@ -18024,7 +18024,7 @@ /area/crew_quarters/bar/atrium) "aLb" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aLc" = ( @@ -18037,7 +18037,7 @@ pixel_y = 5 }, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/power/apc{ dir = 8; name = "Delivery Office APC"; @@ -18250,8 +18250,8 @@ /area/quartermaster/storage) "aLx" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/book/manual/chef_recipes, +/obj/item/storage/box/donkpockets, /obj/item/clothing/head/chefhat, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -18280,7 +18280,7 @@ /area/security/prison) "aLB" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/deadmouse{ +/obj/item/reagent_containers/food/snacks/deadmouse{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -18410,9 +18410,9 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/general/visible, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/reagent_containers/pill/patch/silver_sulf, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/reagent_containers/pill/patch/silver_sulf, /obj/structure/disposalpipe/segment, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/caution, @@ -18425,8 +18425,8 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/caution, /area/maintenance/disposal/incinerator) "aLT" = ( @@ -18446,8 +18446,8 @@ pixel_y = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -18501,8 +18501,8 @@ pixel_y = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -18513,10 +18513,10 @@ /area/engine/atmos) "aLZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = 6 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -6 }, /obj/item/clothing/mask/breath, @@ -18536,7 +18536,7 @@ }, /area/engine/atmos) "aMa" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -18546,7 +18546,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aMc" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -18562,10 +18562,10 @@ dir = 8 }, /obj/structure/table/reinforced, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/firealarm, -/obj/item/weapon/electronics/firealarm, +/obj/item/electronics/airalarm, +/obj/item/electronics/airalarm, +/obj/item/electronics/firealarm, +/obj/item/electronics/firealarm, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -18583,7 +18583,7 @@ }, /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -18592,7 +18592,7 @@ }, /area/engine/atmos) "aMf" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, @@ -18611,7 +18611,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "aMh" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 8 @@ -18630,7 +18630,7 @@ /obj/item/stack/rods{ amount = 23 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/caution{ dir = 9 }, @@ -18642,7 +18642,7 @@ }, /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/caution{ dir = 1 }, @@ -18687,7 +18687,7 @@ /area/maintenance/port/fore) "aMp" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/grimy, /area/crew_quarters/abandoned_gambling_den) "aMq" = ( @@ -18830,7 +18830,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice, +/obj/item/reagent_containers/food/drinks/bottle/orangejuice, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aMJ" = ( @@ -18838,7 +18838,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aMK" = ( @@ -18914,11 +18914,11 @@ /area/hallway/primary/fore) "aMR" = ( /obj/structure/table, -/obj/item/weapon/storage/box{ +/obj/item/storage/box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -18937,7 +18937,7 @@ /area/quartermaster/sorting) "aMS" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/destTagger, /turf/open/floor/plasteel/brown, /area/quartermaster/sorting) @@ -18952,7 +18952,7 @@ /area/quartermaster/sorting) "aMU" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -19131,15 +19131,15 @@ /area/quartermaster/qm) "aNm" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whitered/side{ dir = 9 }, /area/security/prison) "aNn" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/device/healthanalyzer, /obj/machinery/light{ dir = 1 @@ -19150,8 +19150,8 @@ /area/security/prison) "aNo" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whitered/side{ dir = 5 }, @@ -19172,7 +19172,7 @@ /area/security/prison) "aNr" = ( /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/red/corner{ dir = 8 @@ -19214,7 +19214,7 @@ /turf/open/floor/plasteel, /area/security/prison) "aNw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /turf/open/floor/plating{ @@ -19929,7 +19929,7 @@ "aOD" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) "aOE" = ( @@ -19938,7 +19938,7 @@ /area/quartermaster/storage) "aOF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/neutral, /area/quartermaster/storage) "aOG" = ( @@ -19970,7 +19970,7 @@ /area/quartermaster/qm) "aOJ" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/qm, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -20016,9 +20016,9 @@ /area/quartermaster/qm) "aOO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light{ dir = 4 }, @@ -20043,7 +20043,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/bedsheet/qm, +/obj/item/bedsheet/qm, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 1 @@ -20160,21 +20160,21 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 7; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = -7; pixel_y = 7 }, -/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate{ +/obj/item/reagent_containers/glass/bottle/chloralhydrate{ pixel_x = -7 }, -/obj/item/weapon/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/glass/bottle/facid{ pixel_x = 7 }, -/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ +/obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /turf/open/floor/plasteel/darkred/side{ @@ -20215,10 +20215,10 @@ pixel_y = 38; req_access_txt = "3" }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 @@ -20351,7 +20351,7 @@ }, /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/caution{ icon_state = "caution"; dir = 10 @@ -20680,7 +20680,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, @@ -20699,15 +20699,15 @@ /area/crew_quarters/bar/atrium) "aPT" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -20735,7 +20735,7 @@ /area/crew_quarters/bar/atrium) "aPX" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aPY" = ( @@ -20797,9 +20797,9 @@ /area/quartermaster/office) "aQe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/multitool, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, @@ -20844,7 +20844,7 @@ /area/quartermaster/office) "aQi" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/requests_console{ department = "Cargo Office"; departmentType = 0; @@ -20863,7 +20863,7 @@ /area/quartermaster/office) "aQj" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/power/apc{ dir = 1; name = "Cargo Office APC"; @@ -20896,7 +20896,7 @@ }, /area/quartermaster/office) "aQm" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 4 }, @@ -20931,7 +20931,7 @@ /area/quartermaster/storage) "aQo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -21127,7 +21127,7 @@ /area/security/prison) "aQJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -21164,7 +21164,7 @@ /area/security/prison) "aQM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/effect/decal/cleanable/dirt, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/red/side{ @@ -21314,13 +21314,13 @@ /obj/structure/sign/nanotrasen{ pixel_x = 32 }, -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = -3 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/light{ dir = 4 }, @@ -21485,7 +21485,7 @@ /turf/open/floor/engine/air, /area/engine/atmos) "aRq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/effect/decal/cleanable/dirt, @@ -21494,18 +21494,18 @@ "aRr" = ( /obj/machinery/light/small, /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle, +/obj/item/storage/pill_bottle, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "aRu" = ( /obj/machinery/light/small, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/syringe{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -21518,15 +21518,15 @@ name = "Theatre RC"; pixel_x = -32 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -21543,7 +21543,7 @@ /area/crew_quarters/theatre) "aRy" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/mime, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/theatre) @@ -21553,7 +21553,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/camera{ c_tag = "Service Hallway - Aft"; @@ -21591,17 +21591,17 @@ /area/crew_quarters/bar/atrium) "aRF" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aRG" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aRH" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aRI" = ( @@ -22002,8 +22002,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/qm, +/obj/item/folder/yellow, +/obj/item/stamp/qm, /turf/open/floor/plasteel/neutral, /area/quartermaster/qm) "aSk" = ( @@ -22087,7 +22087,7 @@ /area/quartermaster/qm) "aSp" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitered/side{ dir = 8 @@ -22120,8 +22120,8 @@ /area/security/prison) "aSt" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 4 @@ -22169,8 +22169,8 @@ /area/security/prison) "aSy" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -22527,7 +22527,7 @@ pixel_x = -26; pixel_y = -32 }, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /obj/item/clothing/head/witchwig, /turf/open/floor/plasteel/vault{ dir = 5 @@ -22765,13 +22765,13 @@ /area/quartermaster/qm) "aTN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = -6 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_y = 6 }, /obj/item/device/gps/mining, @@ -23047,7 +23047,7 @@ /area/engine/atmos) "aUr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/lightreplacer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -23091,9 +23091,9 @@ /area/engine/atmos) "aUv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -23462,12 +23462,12 @@ /area/quartermaster/office) "aVc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/stamp/denied{ +/obj/item/folder, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -23477,7 +23477,7 @@ }, /area/quartermaster/office) "aVd" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; pixel_x = -24; @@ -23508,7 +23508,7 @@ /turf/open/floor/plasteel/purple/side, /area/quartermaster/storage) "aVg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/brown, /area/quartermaster/storage) @@ -23560,7 +23560,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 32; pixel_y = -32 }, @@ -23596,11 +23596,11 @@ "aVo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/brown, /area/quartermaster/qm) "aVp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /obj/machinery/newscaster{ pixel_y = -32 @@ -23669,7 +23669,7 @@ /turf/open/floor/plating, /area/quartermaster/qm) "aVw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d1 = 2; d2 = 8; @@ -24189,7 +24189,7 @@ dir = 8 }, /obj/machinery/meter, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/neutral, /area/engine/atmos) "aWl" = ( @@ -24437,7 +24437,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar/atrium) "aWO" = ( @@ -24501,17 +24501,17 @@ /turf/open/floor/plasteel/brown, /area/quartermaster/office) "aWU" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/brown, /area/quartermaster/office) "aWV" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/cargotech, /turf/open/floor/plasteel/brown, /area/quartermaster/office) "aWW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1 }, @@ -24812,7 +24812,7 @@ }, /area/security/prison) "aXy" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/pods{ dir = 8; pixel_y = -32 @@ -24916,7 +24916,7 @@ /obj/item/device/radio/intercom{ pixel_y = 24 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -25116,7 +25116,7 @@ dir = 1; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -25168,7 +25168,7 @@ /area/hydroponics) "aYk" = ( /obj/structure/table/glass, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/suit/apron, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -25267,14 +25267,14 @@ id = "kitchencounter"; name = "Kitchen Counter Shutters" }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -25295,7 +25295,7 @@ id = "kitchencounter"; name = "Kitchen Counter Shutters" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -25368,8 +25368,8 @@ "aYD" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 1; req_access_txt = "50" @@ -25408,7 +25408,7 @@ /area/quartermaster/miningoffice) "aYH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel/purple/side{ icon_state = "purple"; dir = 1 @@ -25425,7 +25425,7 @@ "aYJ" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/miner, /obj/machinery/firealarm{ dir = 8; @@ -25489,7 +25489,7 @@ /area/quartermaster/miningoffice) "aYQ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -25513,8 +25513,8 @@ /area/shuttle/mining) "aYU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/vault, /area/security/prison) "aYV" = ( @@ -25565,8 +25565,8 @@ /area/security/prison) "aYZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, @@ -25582,19 +25582,19 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault, /area/security/prison) "aZb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, @@ -25634,8 +25634,8 @@ /area/security/prison) "aZf" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/red/side{ dir = 10 @@ -25648,7 +25648,7 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/clothing/suit/armor/vest, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/red/side, @@ -26060,9 +26060,9 @@ /area/crew_quarters/kitchen) "aZT" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/chef_recipes, +/obj/item/book/manual/chef_recipes, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -26116,8 +26116,8 @@ /area/hallway/primary/fore) "baa" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 8 }, @@ -26133,7 +26133,7 @@ "bab" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/brown{ @@ -26215,7 +26215,7 @@ }, /area/quartermaster/miningoffice) "ban" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 8 @@ -26318,7 +26318,7 @@ /area/quartermaster/miningoffice) "bay" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -26338,9 +26338,9 @@ "baA" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -26463,7 +26463,7 @@ /area/engine/atmos) "baN" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -26486,7 +26486,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/storage/backpack/satchel/eng, +/obj/item/storage/backpack/satchel/eng, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/atmos) @@ -26497,7 +26497,7 @@ "baR" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -26564,10 +26564,10 @@ /area/maintenance/port/fore) "baY" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, -/obj/item/weapon/wirecutters, -/obj/item/weapon/shovel/spade, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/wirecutters, +/obj/item/shovel/spade, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -26651,7 +26651,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/service) "bbj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 4 @@ -26773,8 +26773,8 @@ "bbB" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/window/westleft{ dir = 4; name = "Mining Desk"; @@ -27276,19 +27276,19 @@ /area/crew_quarters/kitchen) "bcB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/bag/tray, +/obj/item/storage/bag/tray, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bcC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) "bcD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -27395,7 +27395,7 @@ /turf/open/floor/plating, /area/quartermaster/miningoffice) "bcP" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -27427,7 +27427,7 @@ /area/quartermaster/miningoffice) "bcT" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -27802,7 +27802,7 @@ /area/engine/atmos) "bdG" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/window/reinforced{ dir = 8 }, @@ -27811,7 +27811,7 @@ /area/hydroponics) "bdH" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/window/reinforced{ dir = 4 }, @@ -27841,11 +27841,11 @@ name = "Station Intercom"; pixel_y = 26 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -27863,7 +27863,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/botanist, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -27954,7 +27954,7 @@ /area/crew_quarters/kitchen) "bdX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/dough, +/obj/item/reagent_containers/food/snacks/dough, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -27965,19 +27965,19 @@ /area/crew_quarters/kitchen) "bdZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/papersack{ +/obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" }, -/obj/item/weapon/storage/box/papersack{ +/obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" }, -/obj/item/weapon/storage/box/papersack{ +/obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" }, -/obj/item/weapon/storage/box/papersack{ +/obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" }, -/obj/item/weapon/storage/box/papersack{ +/obj/item/storage/box/papersack{ icon_state = "paperbag_NanotrasenStandard_closed" }, /obj/effect/turf_decal/bot, @@ -28299,7 +28299,7 @@ "beI" = ( /obj/structure/bed, /obj/machinery/iv_drip, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_y = 26; @@ -28345,7 +28345,7 @@ }, /area/security/brig) "beL" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d1 = 1; d2 = 2; @@ -28367,7 +28367,7 @@ }, /area/security/brig) "beN" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side{ dir = 9 }, @@ -28440,7 +28440,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side{ dir = 1 }, @@ -29055,7 +29055,7 @@ /area/hallway/primary/fore) "bgb" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/brown{ @@ -29065,7 +29065,7 @@ /area/hallway/primary/fore) "bgc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/purple/side{ icon_state = "purple"; dir = 8 @@ -29099,7 +29099,7 @@ /area/quartermaster/miningoffice) "bgg" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 8 @@ -29178,7 +29178,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/gps/mining, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -29233,19 +29233,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -29290,8 +29290,8 @@ }, /obj/structure/closet/crate/internals, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/pickaxe/emergency, -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, +/obj/item/pickaxe/emergency, /obj/effect/turf_decal/delivery, /obj/machinery/light/small{ dir = 8 @@ -29344,11 +29344,11 @@ }, /obj/item/clothing/gloves/color/latex, /obj/item/device/healthanalyzer, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 5; pixel_y = -1 }, @@ -29510,7 +29510,7 @@ /obj/item/device/taperecorder{ pixel_x = 3 }, -/obj/item/weapon/storage/box/deputy, +/obj/item/storage/box/deputy, /obj/item/device/flashlight/seclite, /turf/open/floor/plasteel/vault{ dir = 8 @@ -29518,8 +29518,8 @@ /area/crew_quarters/heads/hos) "bgM" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/storage/secure/briefcase, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -29809,7 +29809,7 @@ name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/machinery/door/window/eastright, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -29853,7 +29853,7 @@ name = "Kitchen Desk"; req_access_txt = "28" }, -/obj/item/weapon/storage/bag/tray, +/obj/item/storage/bag/tray, /obj/machinery/door/window/westleft, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -29895,8 +29895,8 @@ pixel_y = -26; req_access_txt = "28" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/item/clothing/head/chefhat, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -29906,8 +29906,8 @@ /area/crew_quarters/kitchen) "bhF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -29930,7 +29930,7 @@ /area/crew_quarters/kitchen) "bhH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/chef, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -29952,7 +29952,7 @@ "bhJ" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/apron/chef, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -29961,14 +29961,14 @@ /area/crew_quarters/kitchen) "bhK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -30002,9 +30002,9 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 10 @@ -30025,7 +30025,7 @@ /area/hallway/primary/fore) "bhT" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/brown, @@ -30044,13 +30044,13 @@ /area/hallway/primary/fore) "bhW" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/brown, /area/hallway/primary/fore) "bhX" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -30105,7 +30105,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/light, /obj/machinery/power/apc{ dir = 4; @@ -30125,18 +30125,18 @@ "bid" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/weapon/shovel, -/obj/item/weapon/shovel, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, +/obj/item/shovel, +/obj/item/shovel, +/obj/item/pickaxe, +/obj/item/pickaxe, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -30166,7 +30166,7 @@ name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/item/weapon/storage/backpack/satchel/explorer, +/obj/item/storage/backpack/satchel/explorer, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningoffice) @@ -30216,10 +30216,10 @@ /area/security/brig) "bin" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whitered/side{ dir = 10 }, @@ -30306,13 +30306,13 @@ /area/security/main) "bix" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/clothing/mask/gas/sechailer, /turf/open/floor/plasteel/red, /area/security/main) "biy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/red, /area/security/main) "biz" = ( @@ -30325,7 +30325,7 @@ /turf/open/floor/plasteel/neutral, /area/security/main) "biB" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -30392,8 +30392,8 @@ /area/crew_quarters/heads/hos) "biI" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/button/door{ id = "hosprivacy"; name = "Privacy Control"; @@ -30431,7 +30431,7 @@ /area/crew_quarters/heads/hos) "biL" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/hos, +/obj/item/bedsheet/hos, /obj/machinery/status_display{ pixel_y = 32 }, @@ -30444,7 +30444,7 @@ /area/crew_quarters/heads/hos) "biM" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/HoS{ pixel_x = 32 }, /obj/item/device/flashlight/lamp, @@ -30464,7 +30464,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -30486,7 +30486,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -30642,8 +30642,8 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -30658,7 +30658,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 9 }, @@ -31065,7 +31065,7 @@ /area/security/main) "bjX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -31090,15 +31090,15 @@ /area/security/main) "bka" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 9 @@ -31324,7 +31324,7 @@ /area/engine/atmos) "bkz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible, /obj/effect/turf_decal/bot, @@ -31341,7 +31341,7 @@ /area/engine/atmos) "bkB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/effect/decal/cleanable/dirt, /obj/item/toy/figure/atmos, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ @@ -31430,7 +31430,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ @@ -31697,7 +31697,7 @@ /turf/open/floor/plating, /area/security/transfer) "bll" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -31802,13 +31802,13 @@ /area/security/main) "blx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/clothing/accessory/armband/deputy, /obj/item/clothing/accessory/armband/deputy, /obj/item/clothing/accessory/armband/deputy, /obj/item/clothing/accessory/armband/deputy, /obj/item/clothing/accessory/armband/deputy, -/obj/item/weapon/reagent_containers/food/snacks/donut/jelly/cherryjelly, +/obj/item/reagent_containers/food/snacks/donut/jelly/cherryjelly, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -31913,8 +31913,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -32226,7 +32226,7 @@ /turf/open/floor/plasteel/neutral, /area/engine/atmos) "bmi" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -32310,7 +32310,7 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "bms" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/yellow/corner{ @@ -32498,14 +32498,14 @@ "bmH" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/door/window/eastleft{ dir = 8; name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/apple, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -32957,7 +32957,7 @@ /area/security/main) "bnt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/flashlight/seclite, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -32982,7 +32982,7 @@ /area/security/main) "bnw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 @@ -33063,7 +33063,7 @@ /area/crew_quarters/heads/hos) "bnD" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -33322,8 +33322,8 @@ /area/engine/atmos) "boe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/cyan/visible{ @@ -33341,7 +33341,7 @@ /area/engine/atmos) "bog" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/t_scanner, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 2 @@ -33544,9 +33544,9 @@ /obj/item/seeds/grape{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/banana, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -33812,8 +33812,8 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) "bpc" = ( -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/structure/table/reinforced, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) @@ -33887,12 +33887,12 @@ /area/security/transfer) "bpi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/storage/box/prisoner, +/obj/item/storage/box/prisoner, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -34077,8 +34077,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/folder/red, +/obj/item/storage/secure/briefcase, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -34091,8 +34091,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -34565,8 +34565,8 @@ dir = 4 }, /obj/item/stack/packageWrap, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/hand_labeler, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -34890,7 +34890,7 @@ }, /area/security/main) "bqW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/power/apc{ dir = 2; name = "Head of Security's Office APC"; @@ -34903,7 +34903,7 @@ /area/crew_quarters/heads/hos) "bqX" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/hos, /turf/open/floor/plasteel/vault{ dir = 8 @@ -34916,15 +34916,15 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/crew_quarters/heads/hos) "bqZ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -35075,7 +35075,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "brn" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small, /obj/machinery/light_switch{ pixel_x = 26; @@ -35355,17 +35355,17 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 6 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 6 }, -/obj/item/weapon/coin/silver, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -35381,7 +35381,7 @@ /area/security/nuke_storage) "brU" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /obj/machinery/light/small{ dir = 1 }, @@ -35467,7 +35467,7 @@ /turf/open/floor/plasteel/red/side, /area/security/transfer) "bse" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -35480,7 +35480,7 @@ }, /area/security/transfer) "bsf" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side{ dir = 10 }, @@ -35515,7 +35515,7 @@ /turf/open/floor/plasteel/red/side, /area/security/main) "bsk" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side, /area/security/main) "bsl" = ( @@ -35530,7 +35530,7 @@ }, /area/security/main) "bsm" = ( -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 32 }, /obj/effect/landmark/secequipment, @@ -35566,7 +35566,7 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai) @@ -35599,7 +35599,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, @@ -35841,11 +35841,11 @@ /area/hallway/primary/port) "bsK" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/mecha_control, +/obj/item/circuitboard/computer/mecha_control, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -35858,12 +35858,12 @@ /area/storage/tech) "bsL" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/card, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/card, +/obj/item/circuitboard/computer/crew{ pixel_x = 3; pixel_y = -3 }, @@ -35887,12 +35887,12 @@ /area/storage/tech) "bsM" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/aiupload, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/aiupload, +/obj/item/circuitboard/computer/borgupload{ pixel_x = 3; pixel_y = -3 }, @@ -35907,9 +35907,9 @@ /turf/open/floor/plasteel, /area/storage/tech) "bsN" = ( -/obj/item/weapon/shovel/spade, -/obj/item/weapon/crowbar, -/obj/item/weapon/cultivator, +/obj/item/shovel/spade, +/obj/item/crowbar, +/obj/item/cultivator, /obj/structure/table/glass, /obj/item/seeds/wheat{ pixel_x = 6 @@ -35918,10 +35918,10 @@ /obj/item/seeds/pumpkin{ pixel_x = -6 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -36201,7 +36201,7 @@ /turf/open/floor/plating, /area/security/transfer) "btp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -36415,8 +36415,8 @@ /area/engine/break_room) "btN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, @@ -36455,8 +36455,8 @@ /area/engine/break_room) "btR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/device/analyzer{ pixel_x = 7; pixel_y = 3 @@ -36479,7 +36479,7 @@ /area/engine/atmos) "btT" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/caution{ dir = 4 }, @@ -36527,7 +36527,7 @@ dir = 8; pixel_x = 24 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/caution{ dir = 4 @@ -36624,7 +36624,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/black, /area/bridge) @@ -36656,7 +36656,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/black, /area/bridge) "bun" = ( @@ -36858,7 +36858,7 @@ /obj/machinery/gulag_item_reclaimer{ pixel_y = 28 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -36887,11 +36887,11 @@ /area/security/transfer) "buE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/red/side{ dir = 1 }, @@ -36901,22 +36901,22 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 1 }, /area/security/transfer) "buG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 1 }, /area/security/transfer) "buH" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -36948,7 +36948,7 @@ /turf/closed/wall, /area/security/main) "buL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -37011,7 +37011,7 @@ /area/aisat) "buS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/bodypart/l_leg/robot, /obj/item/bodypart/r_leg/robot, /turf/open/floor/plasteel/vault{ @@ -37126,7 +37126,7 @@ /turf/open/floor/circuit/green, /area/ai_monitored/turret_protected/ai) "bvb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -37171,8 +37171,8 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/structure/sign/nosmoking_2{ pixel_y = 32 }, @@ -37181,8 +37181,8 @@ /area/engine/break_room) "bvi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/wrench/power, +/obj/item/storage/toolbox/electrical, +/obj/item/wrench/power, /obj/machinery/status_display{ pixel_y = 32 }, @@ -37220,7 +37220,7 @@ /obj/item/stack/sheet/plasteel{ amount = 50 }, -/obj/item/weapon/crowbar/power, +/obj/item/crowbar/power, /obj/structure/sign/nanotrasen{ pixel_x = 32 }, @@ -37231,11 +37231,11 @@ "bvm" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/bonfire, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; name = "Carton of Estus" }, -/obj/item/weapon/nullrod/claymore/glowing{ +/obj/item/nullrod/claymore/glowing{ desc = "Don't tell anyone you put any points into dex, though."; force = 10; name = "moonlight greatsword" @@ -37247,7 +37247,7 @@ /area/engine/break_room) "bvn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -37363,8 +37363,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; name = "Atmospherics Lockdown Blast door" @@ -37589,7 +37589,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkblue/corner{ dir = 1 }, @@ -37651,7 +37651,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/timer, /obj/item/device/assembly/signaler, /turf/open/floor/plasteel/darkyellow/corner{ @@ -37723,19 +37723,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -37959,8 +37959,8 @@ /area/security/main) "bwq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -38025,8 +38025,8 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Security - Interrogation Monitoring"; dir = 8; @@ -38054,14 +38054,14 @@ /area/ai_monitored/turret_protected/ai) "bwy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ai_monitored/turret_protected/ai) "bwz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -38134,8 +38134,8 @@ /area/ai_monitored/turret_protected/ai) "bwG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -38390,10 +38390,10 @@ /area/engine/atmos) "bxd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = 6 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -6 }, /obj/item/clothing/mask/breath, @@ -38468,7 +38468,7 @@ /turf/open/floor/plasteel, /area/storage/tech) "bxk" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/storage/tech) @@ -38483,7 +38483,7 @@ /turf/open/floor/plasteel, /area/storage/tech) "bxm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/delivery, @@ -38491,7 +38491,7 @@ /area/storage/tech) "bxn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/item/device/assembly/flash/handheld, /obj/item/device/assembly/flash/handheld, /obj/effect/turf_decal/bot, @@ -38606,7 +38606,7 @@ name = "WARNING: BLAST DOORS"; pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkblue/side{ @@ -38624,7 +38624,7 @@ }, /area/bridge) "bxz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/darkblue/side{ icon_state = "darkblue"; dir = 1 @@ -38668,8 +38668,8 @@ /area/bridge) "bxF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/mining_voucher, +/obj/item/clipboard, +/obj/item/mining_voucher, /turf/open/floor/plasteel/black, /area/bridge) "bxG" = ( @@ -38790,7 +38790,7 @@ /obj/structure/closet/crate{ name = "Gold Crate" }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -38816,7 +38816,7 @@ "bxV" = ( /obj/structure/safe, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/book{ +/obj/item/book{ desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes" @@ -38833,7 +38833,7 @@ /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c500, /obj/machinery/light/small, -/obj/item/weapon/gun/ballistic/automatic/pistol/deagle, +/obj/item/gun/ballistic/automatic/pistol/deagle, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -39005,8 +39005,8 @@ /area/security/main) "byn" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -39331,7 +39331,7 @@ }, /area/engine/break_room) "byS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 1 }, @@ -39423,8 +39423,8 @@ /area/engine/atmos) "byZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -39434,8 +39434,8 @@ "bza" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/status_display{ pixel_y = -32 }, @@ -39579,19 +39579,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -39643,8 +39643,8 @@ /area/storage/primary) "bzp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/weldingtool, +/obj/item/storage/belt/utility, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/machinery/newscaster{ pixel_y = 32 @@ -39830,7 +39830,7 @@ }, /area/bridge) "bzA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -40207,7 +40207,7 @@ /turf/open/floor/plasteel/red/side, /area/security/transfer) "bzY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, @@ -40777,7 +40777,7 @@ }, /area/hallway/primary/port) "bAN" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/status_display{ pixel_x = -32 }, @@ -40787,12 +40787,12 @@ /area/storage/tech) "bAO" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/scan_consolenew{ +/obj/item/circuitboard/computer/scan_consolenew{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/med_data, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/med_data, +/obj/item/circuitboard/computer/pandemic{ pixel_x = 3; pixel_y = -3 }, @@ -40801,21 +40801,21 @@ /area/storage/tech) "bAP" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/aifixer{ +/obj/item/circuitboard/computer/aifixer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, /obj/effect/turf_decal/bot, -/obj/item/weapon/circuitboard/machine/autolathe, +/obj/item/circuitboard/machine/autolathe, /turf/open/floor/plasteel, /area/storage/tech) "bAQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/ai_status_display{ pixel_x = 32 }, @@ -40909,8 +40909,8 @@ /area/storage/primary) "bAY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/gps, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -41073,7 +41073,7 @@ }, /area/bridge) "bBm" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /turf/open/floor/plasteel/darkblue/side{ icon_state = "darkblue"; @@ -41085,7 +41085,7 @@ dir = 8 }, /obj/structure/table/wood, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -41131,7 +41131,7 @@ /turf/open/floor/plasteel/grimy, /area/bridge) "bBs" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -41491,7 +41491,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/break_room) @@ -41525,7 +41525,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/break_room) @@ -41613,7 +41613,7 @@ }, /area/engine/break_room) "bCn" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -41717,8 +41717,8 @@ /area/hallway/primary/port) "bCw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /turf/open/floor/plasteel/vault{ dir = 8 @@ -41726,12 +41726,12 @@ /area/storage/tech) "bCx" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/cloning{ +/obj/item/circuitboard/computer/cloning{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod{ +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod{ pixel_x = 3; pixel_y = -3 }, @@ -41740,13 +41740,13 @@ /area/storage/tech) "bCy" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/destructive_analyzer{ +/obj/item/circuitboard/machine/destructive_analyzer{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/machine/protolathe, -/obj/item/weapon/circuitboard/machine/mechfab, -/obj/item/weapon/circuitboard/machine/circuit_imprinter{ +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/machine/mechfab, +/obj/item/circuitboard/machine/circuit_imprinter{ pixel_x = 3; pixel_y = -3 }, @@ -41755,12 +41755,12 @@ /area/storage/tech) "bCz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 26 @@ -41771,7 +41771,7 @@ /area/storage/tech) "bCA" = ( /obj/structure/rack, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/item/device/toner, /obj/machinery/status_display{ pixel_x = -32 @@ -41799,7 +41799,7 @@ }, /area/storage/primary) "bCF" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/storage/primary) @@ -41842,7 +41842,7 @@ /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkblue/side, @@ -41926,7 +41926,7 @@ /obj/structure/rack, /obj/machinery/light/small, /obj/item/device/aicard, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/vault{ icon_state = "vault"; dir = 8 @@ -41973,8 +41973,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -41983,8 +41983,8 @@ "bDa" = ( /obj/structure/rack, /obj/machinery/light/small, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, /turf/open/floor/plasteel/vault{ icon_state = "vault"; dir = 8 @@ -42040,7 +42040,7 @@ pixel_y = -32 }, /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkblue/side, @@ -42063,7 +42063,7 @@ /area/security/detectives_office) "bDk" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/red/corner{ @@ -42075,7 +42075,7 @@ /area/hallway/primary/starboard) "bDm" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ @@ -42301,8 +42301,8 @@ /area/security/warden) "bDD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/mmi, /turf/open/floor/plasteel/vault{ dir = 8 @@ -42382,7 +42382,7 @@ /obj/item/stack/sheet/plasteel{ amount = 20 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/gravity_generator) @@ -42436,7 +42436,7 @@ /turf/closed/wall, /area/engine/break_room) "bDP" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 8 }, @@ -42457,20 +42457,20 @@ /area/engine/break_room) "bDR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/break_room) "bDS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/break_room) "bDT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/lightreplacer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, @@ -42640,8 +42640,8 @@ d2 = 4; icon_state = "0-4" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/electronics/airlock, +/obj/item/folder/yellow, +/obj/item/electronics/airlock, /obj/machinery/power/apc{ dir = 8; name = "Technology Storage APC"; @@ -42699,7 +42699,7 @@ dir = 4 }, /obj/effect/turf_decal/bot, -/obj/item/weapon/circuitboard/machine/autolathe, +/obj/item/circuitboard/machine/autolathe, /turf/open/floor/plasteel, /area/storage/tech) "bEl" = ( @@ -42717,13 +42717,13 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -42752,13 +42752,13 @@ "bEp" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/storage/primary) "bEq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -42869,7 +42869,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, /area/bridge) @@ -42947,7 +42947,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/bridge) @@ -42957,7 +42957,7 @@ /area/bridge) "bEK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/vault{ icon_state = "vault"; dir = 8 @@ -43096,7 +43096,7 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/camera/detective, /turf/open/floor/plasteel/vault, /area/security/detectives_office) @@ -43112,7 +43112,7 @@ pixel_y = 24 }, /obj/item/device/taperecorder, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/vault, /area/security/detectives_office) "bFa" = ( @@ -43148,11 +43148,11 @@ /area/security/detectives_office) "bFd" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/vault, /area/security/detectives_office) "bFe" = ( @@ -43288,7 +43288,7 @@ "bFp" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -43420,7 +43420,7 @@ /area/ai_monitored/turret_protected/ai) "bFD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -43446,7 +43446,7 @@ /turf/closed/wall/r_wall, /area/engine/transit_tube) "bFG" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -43469,18 +43469,18 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/disposalpipe/segment{ dir = 4 }, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/heads/chief) "bFJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/device/gps/engineering{ gpstag = "CE0" }, @@ -43496,8 +43496,8 @@ /area/crew_quarters/heads/chief) "bFK" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/crowbar, +/obj/item/storage/toolbox/mechanical, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = 32 }, @@ -43512,7 +43512,7 @@ }, /area/crew_quarters/heads/chief) "bFL" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -43694,8 +43694,8 @@ /area/hallway/primary/port) "bGe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/airalarm, +/obj/item/electronics/apc, /obj/machinery/camera{ c_tag = "Technology Storage"; dir = 4; @@ -43707,12 +43707,12 @@ /area/storage/tech) "bGf" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/prisoner, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/prisoner, +/obj/item/circuitboard/computer/secure_data{ pixel_x = 3; pixel_y = -3 }, @@ -43722,12 +43722,12 @@ /area/storage/tech) "bGg" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/powermonitor, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/powermonitor, +/obj/item/circuitboard/computer/stationalert{ pixel_x = 3; pixel_y = -3 }, @@ -43736,11 +43736,11 @@ /area/storage/tech) "bGh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/folder/white, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -43757,7 +43757,7 @@ "bGj" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/storage/primary) @@ -43805,7 +43805,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/bridge/meeting_room/council) "bGr" = ( @@ -43894,7 +43894,7 @@ /area/tcommsat/computer) "bGB" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/captain, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, @@ -43950,7 +43950,7 @@ }, /area/crew_quarters/heads/captain) "bGJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/heads/captain) "bGK" = ( @@ -44181,7 +44181,7 @@ dir = 10 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/red/side{ dir = 6 }, @@ -44415,7 +44415,7 @@ /turf/open/floor/plasteel/vault, /area/engine/transit_tube) "bHA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -44432,7 +44432,7 @@ }, /area/engine/transit_tube) "bHB" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 8 }, @@ -44713,7 +44713,7 @@ }, /area/hallway/primary/port) "bHW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/ai_status_display{ pixel_x = -32 }, @@ -44723,12 +44723,12 @@ /area/storage/tech) "bHX" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/teleporter_hub{ +/obj/item/circuitboard/machine/teleporter_hub{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/machine/teleporter_station, -/obj/item/weapon/circuitboard/computer/teleporter{ +/obj/item/circuitboard/machine/teleporter_station, +/obj/item/circuitboard/computer/teleporter{ pixel_x = 3; pixel_y = -3 }, @@ -44738,16 +44738,16 @@ /area/storage/tech) "bHY" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/server{ +/obj/item/circuitboard/machine/telecomms/server{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/machine/telecomms/relay, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/hub, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster{ +/obj/item/circuitboard/machine/telecomms/relay, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/hub, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster{ pixel_x = 3; pixel_y = -3 }, @@ -44755,7 +44755,7 @@ /turf/open/floor/plasteel, /area/storage/tech) "bHZ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/status_display{ pixel_x = 32 }, @@ -44765,12 +44765,12 @@ /area/storage/tech) "bIa" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 3; pixel_y = -3 }, @@ -44785,7 +44785,7 @@ /turf/open/floor/plasteel/neutral, /area/storage/primary) "bIc" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/bot, @@ -44858,10 +44858,10 @@ /area/bridge/meeting_room/council) "bIk" = ( /obj/structure/table/wood, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 7 }, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -44896,7 +44896,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -44907,8 +44907,8 @@ name = "Station Intercom"; pixel_y = 26 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bIq" = ( @@ -44918,7 +44918,7 @@ name = "Telecomms Monitoring APC"; pixel_y = 28 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d2 = 2; icon_state = "0-2" @@ -44962,7 +44962,7 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -45040,7 +45040,7 @@ /area/crew_quarters/heads/captain) "bID" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain) "bIE" = ( @@ -45248,7 +45248,7 @@ /turf/closed/wall, /area/security/brig) "bJa" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/door_timer{ id = "brig1"; name = "Cell 1"; @@ -45309,8 +45309,8 @@ /area/security/warden) "bJe" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = 3; pixel_y = -3 }, @@ -45333,16 +45333,16 @@ }, /area/ai_monitored/security/armory) "bJg" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 6; pixel_y = -2 }, @@ -45356,13 +45356,13 @@ }, /area/ai_monitored/security/armory) "bJh" = ( -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 6 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = -3 }, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /obj/structure/table/reinforced, /obj/machinery/airalarm{ pixel_y = 22 @@ -45372,8 +45372,8 @@ }, /area/ai_monitored/security/armory) "bJi" = ( -/obj/item/weapon/storage/box/firingpins, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /obj/item/key/security, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ @@ -45381,12 +45381,12 @@ }, /area/ai_monitored/security/armory) "bJj" = ( -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -3; pixel_y = -3 }, @@ -45623,8 +45623,8 @@ /area/crew_quarters/heads/chief) "bJF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral, /area/crew_quarters/heads/chief) "bJG" = ( @@ -45680,12 +45680,12 @@ /area/engine/break_room) "bJM" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 3; pixel_y = -3 }, @@ -45693,8 +45693,8 @@ /area/engine/break_room) "bJN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /turf/open/floor/plasteel/yellow/side, /area/engine/break_room) @@ -45704,8 +45704,8 @@ pixel_y = -26 }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/yellow/side, /area/engine/break_room) "bJP" = ( @@ -45732,7 +45732,7 @@ /turf/open/floor/plasteel/yellow/side, /area/engine/break_room) "bJT" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/yellow/side{ dir = 6 }, @@ -45778,7 +45778,7 @@ "bJZ" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/device/multitool, /obj/machinery/light{ dir = 8 @@ -45796,10 +45796,10 @@ /area/storage/tech) "bKb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/electronics/firealarm, -/obj/item/weapon/electronics/firealarm, +/obj/item/electronics/firelock, +/obj/item/electronics/firelock, +/obj/item/electronics/firealarm, +/obj/item/electronics/firealarm, /obj/machinery/light{ dir = 4 }, @@ -45856,7 +45856,7 @@ /area/storage/primary) "bKi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/storage/primary) @@ -45916,8 +45916,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/carpet, /area/bridge/meeting_room/council) "bKo" = ( @@ -45932,8 +45932,8 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/lighter, +/obj/item/folder/red, +/obj/item/lighter, /turf/open/floor/carpet, /area/bridge/meeting_room/council) "bKp" = ( @@ -45948,13 +45948,13 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/structure/disposalpipe/segment, /turf/open/floor/carpet, /area/bridge/meeting_room/council) "bKq" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -46195,7 +46195,7 @@ /area/storage/tools) "bKQ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/item/clothing/gloves/color/latex, /turf/open/floor/plasteel/vault{ dir = 8 @@ -46234,8 +46234,8 @@ /area/security/detectives_office) "bKV" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/hand_labeler, +/obj/item/folder/red, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/security/detectives_office) @@ -46259,9 +46259,9 @@ /area/security/detectives_office) "bKY" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -46333,8 +46333,8 @@ /obj/machinery/door/window/westleft{ name = "Warden's Desk" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/warden) @@ -46519,7 +46519,7 @@ /turf/closed/wall, /area/engine/transit_tube) "bLA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -46539,7 +46539,7 @@ }, /area/engine/transit_tube) "bLC" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ dir = 8 @@ -46583,12 +46583,12 @@ d2 = 4; icon_state = "2-4" }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/lighter, +/obj/item/folder/yellow, +/obj/item/lighter, /turf/open/floor/plasteel/neutral, /area/crew_quarters/heads/chief) "bLH" = ( @@ -46664,7 +46664,7 @@ /turf/closed/wall, /area/engine/break_room) "bLO" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/break_room) @@ -46728,7 +46728,7 @@ /area/hallway/primary/port) "bLX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_y = 3 }, /turf/open/floor/plasteel/vault{ @@ -46745,7 +46745,7 @@ /turf/open/floor/plasteel, /area/storage/tech) "bLZ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -46755,7 +46755,7 @@ /turf/open/floor/plasteel, /area/storage/tech) "bMa" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light_switch{ pixel_y = -26 }, @@ -46764,8 +46764,8 @@ /area/storage/tech) "bMb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/device/paicard, /obj/machinery/newscaster{ pixel_y = -32 @@ -46775,7 +46775,7 @@ /area/storage/tech) "bMc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/item/device/flashlight, /turf/open/floor/plasteel/vault{ @@ -46804,8 +46804,8 @@ /area/storage/primary) "bMg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -46863,8 +46863,8 @@ /area/bridge/meeting_room/council) "bMl" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/wood, /area/bridge/meeting_room/council) "bMm" = ( @@ -46898,7 +46898,7 @@ /area/bridge/meeting_room/council) "bMq" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/bridge/meeting_room/council) @@ -46914,7 +46914,7 @@ /turf/open/floor/wood, /area/bridge/meeting_room/council) "bMt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -46924,7 +46924,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -47044,11 +47044,11 @@ /area/hallway/primary/central) "bML" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light_switch{ @@ -47080,14 +47080,14 @@ "bMO" = ( /obj/structure/table, /obj/item/stack/sheet/glass/fifty, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/yellow/corner, /area/storage/tools) "bMP" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/yellow/side{ dir = 6 @@ -47114,7 +47114,7 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -47175,8 +47175,8 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/carpet, /area/security/detectives_office) @@ -47202,10 +47202,10 @@ "bMY" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/food/drinks/flask/det, /turf/open/floor/carpet, /area/security/detectives_office) "bMZ" = ( @@ -47217,7 +47217,7 @@ }, /area/security/detectives_office) "bNa" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 1 }, @@ -47251,8 +47251,8 @@ /area/security/brig) "bNc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -47298,11 +47298,11 @@ /area/ai_monitored/security/armory) "bNg" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -47409,7 +47409,7 @@ "bNo" = ( /obj/machinery/cell_charger, /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -47426,7 +47426,7 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "bNr" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) "bNs" = ( @@ -47450,13 +47450,13 @@ /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) "bNv" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) "bNw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -47606,7 +47606,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/ce, /turf/open/floor/plasteel/neutral, /area/crew_quarters/heads/chief) @@ -47630,7 +47630,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "bNQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -47648,7 +47648,7 @@ /area/crew_quarters/heads/chief) "bNS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/ce, +/obj/item/bedsheet/ce, /obj/machinery/light{ dir = 1 }, @@ -47860,11 +47860,11 @@ pixel_x = -32 }, /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/wood, /area/bridge/meeting_room/council) "bOl" = ( @@ -47883,7 +47883,7 @@ /area/bridge/meeting_room/council) "bOm" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/bridge/meeting_room/council) "bOn" = ( @@ -47928,7 +47928,7 @@ /area/tcommsat/computer) "bOr" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOs" = ( @@ -47936,12 +47936,12 @@ /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOu" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOv" = ( @@ -47950,8 +47950,8 @@ /area/tcommsat/computer) "bOw" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bOx" = ( @@ -47960,12 +47960,12 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 6 }, /turf/open/floor/plasteel/vault{ @@ -47992,9 +47992,9 @@ /area/crew_quarters/heads/captain) "bOz" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/fourcolor, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue, +/obj/item/pen/fourcolor, +/obj/item/stamp/captain, /obj/structure/cable/white{ d1 = 1; d2 = 2; @@ -48010,7 +48010,7 @@ /area/crew_quarters/heads/captain) "bOA" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -48022,11 +48022,11 @@ /area/crew_quarters/heads/captain) "bOC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /obj/structure/window/reinforced{ dir = 1; layer = 2.9 @@ -48035,7 +48035,7 @@ /area/crew_quarters/heads/captain) "bOD" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /obj/item/device/camera, /turf/open/floor/wood, /area/crew_quarters/heads/captain) @@ -48156,7 +48156,7 @@ "bOO" = ( /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/red/side{ dir = 6 }, @@ -48197,7 +48197,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/warden, /obj/machinery/light{ dir = 8 @@ -48242,21 +48242,21 @@ /area/security/warden) "bOV" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, @@ -48270,12 +48270,12 @@ /area/ai_monitored/security/armory) "bOW" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -48307,7 +48307,7 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/plasteel/vault{ @@ -48484,7 +48484,7 @@ /turf/closed/wall/r_wall, /area/ai_monitored/turret_protected/aisat_interior) "bPo" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/turretid{ control_area = "AI Satellite Antechamber"; enabled = 1; @@ -48624,9 +48624,9 @@ network = list("Sat"); start_active = 1 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -48651,7 +48651,7 @@ }, /area/engine/transit_tube) "bPB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -48669,7 +48669,7 @@ }, /area/crew_quarters/heads/chief) "bPD" = ( -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -48693,16 +48693,16 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 6 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -6 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_y = 6 }, -/obj/item/weapon/reagent_containers/pill/patch/silver_sulf, +/obj/item/reagent_containers/pill/patch/silver_sulf, /turf/open/floor/plasteel/neutral, /area/crew_quarters/heads/chief) "bPF" = ( @@ -48876,7 +48876,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -49302,11 +49302,11 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/obj/item/weapon/coin/adamantine{ +/obj/item/coin/adamantine{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain) "bQC" = ( @@ -49559,7 +49559,7 @@ }, /area/hallway/primary/starboard) "bQW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/door_timer{ id = "brig2"; name = "Cell 2"; @@ -49591,12 +49591,12 @@ /area/security/warden) "bQZ" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/screwdriver{ +/obj/item/storage/toolbox/electrical, +/obj/item/screwdriver{ pixel_y = 5 }, /obj/item/device/multitool, @@ -49621,12 +49621,12 @@ /area/ai_monitored/security/armory) "bRc" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -49654,12 +49654,12 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -50097,7 +50097,7 @@ }, /area/engine/transit_tube) "bRO" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ dir = 4 }, @@ -50169,7 +50169,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/chief) "bRW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; pixel_x = -24; @@ -50307,7 +50307,7 @@ dir = 8; pixel_x = 24 }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /turf/open/floor/plasteel/red/side{ icon_state = "red"; @@ -50413,8 +50413,8 @@ /area/hallway/primary/central) "bSw" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -50464,12 +50464,12 @@ /area/crew_quarters/heads/hop) "bSy" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/stamp/hop, +/obj/item/paper_bin, +/obj/item/stamp/hop, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bSz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -50489,17 +50489,17 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bSB" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bSC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/ids{ +/obj/item/storage/box/ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/silver_ids, +/obj/item/storage/box/silver_ids, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -50600,7 +50600,7 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/captain/private) @@ -51059,12 +51059,12 @@ /area/ai_monitored/security/armory) "bTu" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -51092,9 +51092,9 @@ /area/ai_monitored/security/armory) "bTw" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/item/clothing/suit/armor/laserproof, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/temperature/security, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -51168,7 +51168,7 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "bTD" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -51260,7 +51260,7 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "bTM" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -51371,17 +51371,17 @@ "bTW" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/crew_quarters/heads/chief) "bTX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/cartridge/atmos, -/obj/item/weapon/cartridge/atmos, -/obj/item/weapon/cartridge/atmos, +/obj/item/folder/yellow, +/obj/item/cartridge/atmos, +/obj/item/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -51392,7 +51392,7 @@ /area/crew_quarters/heads/chief) "bTY" = ( /obj/structure/rack, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -51418,7 +51418,7 @@ }, /area/crew_quarters/heads/chief) "bUb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light_switch{ pixel_x = 26; pixel_y = -26 @@ -51709,7 +51709,7 @@ /area/hallway/primary/central) "bUC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor/preopen{ id = "hopblast"; @@ -52307,11 +52307,11 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "bVG" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/table/reinforced, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -52320,7 +52320,7 @@ /area/ai_monitored/turret_protected/aisat_interior) "bVH" = ( /obj/structure/cable/white, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) @@ -52349,7 +52349,7 @@ /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/aisat_interior) "bVL" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; @@ -52369,18 +52369,18 @@ /area/ai_monitored/turret_protected/aisat_interior) "bVN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/ai_monitored/turret_protected/aisat_interior) "bVO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/borg, /obj/machinery/light, /obj/item/device/radio/intercom{ @@ -52396,11 +52396,11 @@ /area/ai_monitored/turret_protected/aisat_interior) "bVP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/ai_status_display{ pixel_y = -32 }, @@ -52430,7 +52430,7 @@ /area/engine/engineering) "bVU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -52447,7 +52447,7 @@ /area/engine/engineering) "bVX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -52508,7 +52508,7 @@ /turf/open/floor/plating, /area/security/checkpoint/engineering) "bWd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/yellow/corner{ @@ -52868,7 +52868,7 @@ dir = 1; icon_state = "pipe-c" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ @@ -53182,7 +53182,7 @@ /turf/closed/wall, /area/engine/engineering) "bXx" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -53224,7 +53224,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "bXB" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ pixel_y = 26 @@ -53448,8 +53448,8 @@ /area/library) "bXT" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/firealarm{ pixel_y = 24 }, @@ -53474,8 +53474,8 @@ dir = 1 }, /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -53541,7 +53541,7 @@ /obj/structure/table/wood, /obj/machinery/light, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -53615,7 +53615,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -53660,8 +53660,8 @@ /area/tcommsat/server) "bYo" = ( /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -53699,7 +53699,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -53712,7 +53712,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain/private) "bYu" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -53744,7 +53744,7 @@ /turf/open/floor/plasteel/vault, /area/security/courtroom) "bYz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/security/courtroom) "bYB" = ( @@ -53753,7 +53753,7 @@ /turf/open/floor/plating, /area/security/courtroom) "bYC" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -53809,8 +53809,8 @@ /area/security/courtroom) "bYI" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder{ pixel_x = 3 }, @@ -53828,7 +53828,7 @@ /area/lawoffice) "bYJ" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/lawyer, /turf/open/floor/wood, /area/lawoffice) @@ -53867,8 +53867,8 @@ id = "brigwindows"; name = "Brig Front Blast door" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 2; name = "Security Desk"; @@ -53942,8 +53942,8 @@ name = "Armoury Desk"; req_access_txt = "3" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/southright{ name = "Armoury Desk" }, @@ -53964,7 +53964,7 @@ }, /area/ai_monitored/turret_protected/ai_upload) "bYY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 1 }, @@ -53994,7 +53994,7 @@ /turf/open/floor/plasteel/vault, /area/ai_monitored/turret_protected/ai_upload) "bZc" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light{ @@ -54329,8 +54329,8 @@ /area/maintenance/port) "bZG" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, @@ -54388,8 +54388,8 @@ /area/library) "bZN" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/status_display{ pixel_x = 32 }, @@ -54424,7 +54424,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -54614,8 +54614,8 @@ /area/tcommsat/server) "cah" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/fourcolor, +/obj/item/folder/blue, +/obj/item/pen/fourcolor, /obj/machinery/status_display{ pixel_x = -32 }, @@ -54702,7 +54702,7 @@ dir = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -55108,12 +55108,12 @@ name = "Core Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/core/full/paladin{ +/obj/item/aiModule/core/full/paladin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/full/corp{ +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/full/corp{ pixel_x = -3; pixel_y = -3 }, @@ -55170,12 +55170,12 @@ name = "Core Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/core/full/antimov{ +/obj/item/aiModule/core/full/antimov{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/supplied/protectStation{ +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/supplied/protectStation{ pixel_x = -3; pixel_y = -3 }, @@ -55416,7 +55416,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/kiddieplaque{ desc = "A long list of rules to be followed when in the library, extolling the virtues of being quiet at all times and threatening those who would dare eat hot food inside."; name = "Library Rules Sign"; @@ -55437,7 +55437,7 @@ /turf/open/floor/plasteel/grimy, /area/library) "cbA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ dir = 4 }, @@ -55500,7 +55500,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, @@ -55571,11 +55571,11 @@ name = "Captain's Intercom"; pixel_x = -26 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/food/drinks/flask/gold, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/razor, +/obj/item/razor, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain/private) "cbR" = ( @@ -55588,7 +55588,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain/private) "cbS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -55610,7 +55610,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "cbU" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 1; pixel_y = -26 @@ -55653,7 +55653,7 @@ /obj/machinery/ai_status_display{ pixel_x = -32 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -55691,8 +55691,8 @@ /area/security/courtroom) "ccc" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, @@ -55726,8 +55726,8 @@ /area/security/courtroom) "ccg" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -55774,7 +55774,7 @@ /area/lawoffice) "cck" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/clothing/glasses/sunglasses/big{ pixel_x = 3; pixel_y = 3 @@ -55829,7 +55829,7 @@ /obj/machinery/newscaster/security_unit{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/secofficer, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -55952,7 +55952,7 @@ /area/security/brig) "ccy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -56090,11 +56090,11 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/freeformcore{ +/obj/item/aiModule/core/freeformcore{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/custom, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -56197,12 +56197,12 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/tyrant{ +/obj/item/aiModule/core/full/tyrant{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/zeroth/oneHuman, -/obj/item/weapon/aiModule/reset/purge{ +/obj/item/aiModule/zeroth/oneHuman, +/obj/item/aiModule/reset/purge{ pixel_x = -3; pixel_y = -3 }, @@ -56401,8 +56401,8 @@ /area/maintenance/port) "cdl" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -56414,7 +56414,7 @@ /turf/open/floor/wood, /area/library) "cdn" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/library) "cdo" = ( @@ -56591,7 +56591,7 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "cdK" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -56642,8 +56642,8 @@ /area/security/courtroom) "cdQ" = ( /obj/structure/table/wood, -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -56654,7 +56654,7 @@ /area/security/courtroom) "cdR" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -56692,12 +56692,12 @@ name = "'Law Office RC"; pixel_y = -64 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/law, +/obj/item/folder/red, +/obj/item/stamp/law, /turf/open/floor/plasteel/grimy, /area/lawoffice) "cdV" = ( @@ -57090,26 +57090,26 @@ /area/engine/engineering) "ceH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering_guide{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/engineering_particle_accelerator, +/obj/item/book/manual/engineering_particle_accelerator, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) "ceI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/engineering_singularity_safety, +/obj/item/book/manual/engineering_singularity_safety, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -57168,8 +57168,8 @@ /area/library) "ceR" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/wood, /area/library) "ceS" = ( @@ -57229,13 +57229,13 @@ pixel_x = -32; pixel_y = -32 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "cfa" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) @@ -57443,11 +57443,11 @@ name = "Station Intercom"; pixel_y = -32 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/blue/side{ dir = 8 @@ -57484,7 +57484,7 @@ /area/lawoffice) "cfE" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/wood, /area/lawoffice) "cfG" = ( @@ -57499,11 +57499,11 @@ /area/lawoffice) "cfH" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/wood, /area/lawoffice) "cfI" = ( @@ -57577,7 +57577,7 @@ /area/aisat) "cfM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -57630,7 +57630,7 @@ /area/ai_monitored/turret_protected/ai_upload) "cfS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /obj/item/device/radio/intercom{ broadcasting = 1; frequency = 1447; @@ -57805,9 +57805,9 @@ /area/maintenance/port) "cgj" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/airalarm{ @@ -58061,11 +58061,11 @@ /area/security/courtroom) "cgN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/blue/side, /area/security/courtroom) "cgO" = ( @@ -58123,8 +58123,8 @@ "cgU" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/crowbar/red, +/obj/item/book/manual/wiki/security_space_law, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) @@ -58271,7 +58271,7 @@ /area/security/range) "chj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -58311,12 +58311,12 @@ /area/ai_monitored/turret_protected/ai_upload) "chn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/core/full/drone{ +/obj/item/aiModule/core/full/drone{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/reporter, -/obj/item/weapon/aiModule/core/full/liveandletlive{ +/obj/item/aiModule/core/full/reporter, +/obj/item/aiModule/core/full/liveandletlive{ pixel_x = -3; pixel_y = -3 }, @@ -58359,8 +58359,8 @@ /area/engine/engineering) "chu" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/stack/cable_coil/white, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -58383,7 +58383,7 @@ req_access_txt = "11" }, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson/engine, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -58400,7 +58400,7 @@ /area/engine/engineering) "chz" = ( /obj/structure/closet/wardrobe/engineering_yellow, -/obj/item/weapon/storage/backpack/satchel/eng, +/obj/item/storage/backpack/satchel/eng, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -58590,7 +58590,7 @@ /turf/open/floor/wood, /area/library) "chT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/wood, @@ -58649,7 +58649,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -58689,7 +58689,7 @@ "cif" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, @@ -58698,7 +58698,7 @@ /area/teleporter) "cig" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/machinery/power/apc{ cell_type = 10000; dir = 1; @@ -58719,7 +58719,7 @@ "cih" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/disposalpipe/segment{ dir = 2; @@ -58823,8 +58823,8 @@ /area/security/courtroom) "ciq" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 10; heat_capacity = 1e+006 @@ -58851,8 +58851,8 @@ /area/security/courtroom) "ciu" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/green/side{ dir = 8 }, @@ -59205,7 +59205,7 @@ /area/aisat) "ciR" = ( /obj/structure/cable/white, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/power/apc{ @@ -59233,7 +59233,7 @@ icon_state = "1-2" }, /obj/structure/table/reinforced, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-07"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -59252,7 +59252,7 @@ }, /area/ai_monitored/turret_protected/ai_upload) "ciV" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /obj/machinery/airalarm{ dir = 1; @@ -59343,7 +59343,7 @@ /area/engine/engineering) "cjd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -59432,14 +59432,14 @@ /area/library) "cjp" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/grimy, /area/library) "cjq" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/library) "cjr" = ( @@ -59464,7 +59464,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "cju" = ( @@ -59533,7 +59533,7 @@ name = "Station Intercom"; pixel_x = 26 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/hop{ pixel_x = 3; pixel_y = 3 @@ -59606,9 +59606,9 @@ /area/tcommsat/server) "cjH" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, +/obj/item/crowbar, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/teleporter) @@ -59714,7 +59714,7 @@ /turf/open/floor/plasteel/neutral/corner, /area/hallway/primary/central) "cjQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -59917,11 +59917,11 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/gun/energy/laser/practice{ +/obj/item/gun/energy/laser/practice{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, /obj/effect/decal/cleanable/dirt, @@ -60072,14 +60072,14 @@ /area/engine/engineering) "ckA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/engineer, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/engineering) "ckB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -60093,7 +60093,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, @@ -60240,7 +60240,7 @@ "ckV" = ( /obj/structure/closet/secure_closet/hop, /obj/item/clothing/suit/ianshirt, -/obj/item/weapon/bedsheet/ian, +/obj/item/bedsheet/ian, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/hop) "ckW" = ( @@ -60248,7 +60248,7 @@ /turf/closed/wall, /area/crew_quarters/heads/hop) "ckX" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "ckY" = ( @@ -60268,7 +60268,7 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "cla" = ( @@ -60285,7 +60285,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "clb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -60338,8 +60338,8 @@ pixel_x = 26 }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 5 }, /obj/effect/turf_decal/delivery, @@ -60347,7 +60347,7 @@ /area/tcommsat/server) "clh" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/device/radio, /obj/machinery/firealarm{ dir = 1; @@ -60427,21 +60427,21 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/security/courtroom) "clq" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/security/courtroom) "clr" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/side, /area/security/courtroom) "cls" = ( @@ -60823,7 +60823,7 @@ /area/library) "cml" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/structure/window/reinforced{ dir = 8 }, @@ -60988,7 +60988,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -61022,8 +61022,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault, /area/security/courtroom) "cmH" = ( @@ -61035,14 +61035,14 @@ /area/security/courtroom) "cmI" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, +/obj/item/clipboard, +/obj/item/folder, /turf/open/floor/plasteel/vault, /area/security/courtroom) "cmJ" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/plasteel/vault, /area/security/courtroom) "cmL" = ( @@ -61193,7 +61193,7 @@ }, /area/aisat) "cnd" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating/airless, /area/space) "cne" = ( @@ -61255,7 +61255,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cnn" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Engineering - Central"; dir = 4; @@ -61450,12 +61450,12 @@ /area/library) "cnF" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/blue{ +/obj/item/folder, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -61478,7 +61478,7 @@ /area/library) "cnI" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/bag/books, +/obj/item/storage/bag/books, /obj/item/device/taperecorder, /obj/structure/noticeboard{ dir = 8; @@ -61866,7 +61866,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 32 }, /turf/open/floor/plasteel/neutral/corner{ @@ -62171,7 +62171,7 @@ /turf/open/floor/plasteel, /area/maintenance/port) "cpe" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -62191,7 +62191,7 @@ /area/library) "cph" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Library - Aft"; dir = 1; @@ -62201,7 +62201,7 @@ /area/library) "cpi" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -32 }, @@ -62212,7 +62212,7 @@ /area/library) "cpj" = ( /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light_switch{ pixel_y = -26 }, @@ -62220,12 +62220,12 @@ /turf/open/floor/plasteel/grimy, /area/library) "cpk" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/library) "cpl" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/curator, /obj/machinery/airalarm{ dir = 8; @@ -62458,7 +62458,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/blue/corner{ @@ -62527,7 +62527,7 @@ icon_state = "4-8" }, /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -62773,7 +62773,7 @@ /area/maintenance/starboard) "cpY" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -62781,7 +62781,7 @@ "cpZ" = ( /obj/structure/table, /obj/item/clothing/under/rank/security, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, /obj/machinery/power/apc{ @@ -62799,7 +62799,7 @@ }, /obj/item/clothing/shoes/jackboots, /obj/item/device/radio, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance{ @@ -62824,7 +62824,7 @@ }, /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/box/flashes, +/obj/item/storage/box/flashes, /obj/effect/turf_decal/stripes/end, /turf/open/floor/plating, /area/maintenance/starboard) @@ -62841,7 +62841,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -62851,7 +62851,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -62929,7 +62929,7 @@ /area/engine/engineering) "cqo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -62955,8 +62955,8 @@ /area/engine/engineering) "cqr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -62996,9 +62996,9 @@ /area/engine/engineering) "cqw" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -63012,8 +63012,8 @@ /obj/item/stack/sheet/glass{ amount = 30 }, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -63023,19 +63023,19 @@ /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/electronics/firelock, +/obj/item/stock_parts/console_screen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/port) "cqz" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/firealarm, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/electronics/airalarm, +/obj/item/electronics/firealarm, +/obj/item/stock_parts/cell/high, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -63440,7 +63440,7 @@ /area/crew_quarters/locker) "cro" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -63511,7 +63511,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "crx" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -63533,9 +63533,9 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Recreation - Fore"; dir = 2; @@ -63547,8 +63547,8 @@ /area/crew_quarters/fitness/recreation) "crB" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -63577,7 +63577,7 @@ "crF" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/machinery/light{ dir = 8 }, @@ -63617,23 +63617,23 @@ /turf/open/floor/plating, /area/maintenance/port) "crK" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/black, /area/library) "crL" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/library) "crM" = ( /obj/structure/easel, -/obj/item/weapon/canvas/nineteenXnineteen, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/machinery/light_switch{ pixel_y = 26 }, @@ -63641,19 +63641,19 @@ /area/library) "crN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/library) "crO" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/black, /area/library) "crP" = ( @@ -63674,7 +63674,7 @@ /turf/open/floor/plasteel/black, /area/library) "crS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -63710,7 +63710,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -63729,7 +63729,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "crY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -63761,7 +63761,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -63769,7 +63769,7 @@ /area/ai_monitored/storage/eva) "csc" = ( /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -63819,7 +63819,7 @@ icon_state = "4-8" }, /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/blue/corner, /area/hallway/secondary/command) "csg" = ( @@ -63865,7 +63865,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/blue/corner, @@ -63929,7 +63929,7 @@ /turf/open/floor/plasteel, /area/gateway) "csp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -63940,7 +63940,7 @@ /obj/item/stack/rods{ amount = 25 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight, /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -64011,7 +64011,7 @@ /turf/open/floor/plasteel/neutral, /area/hallway/primary/central) "csA" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral, @@ -64033,13 +64033,13 @@ /area/crew_quarters/locker) "csD" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/neutral, /area/crew_quarters/locker) "csE" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/neutral, /area/crew_quarters/locker) "csF" = ( @@ -64226,8 +64226,8 @@ /area/engine/engineering) "csX" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wirecutters, +/obj/item/crowbar, +/obj/item/wirecutters, /obj/item/stack/cable_coil/white, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -64240,8 +64240,8 @@ pixel_y = 26; req_access_txt = "11" }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/weldingtool, +/obj/item/storage/belt/utility, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -64277,7 +64277,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "ctc" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/electricshock{ pixel_y = 32 @@ -64400,8 +64400,8 @@ /area/maintenance/port) "cto" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, +/obj/item/clipboard, +/obj/item/folder, /obj/machinery/ai_status_display{ pixel_x = -32 }, @@ -64448,11 +64448,11 @@ /area/library) "ctv" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -64462,7 +64462,7 @@ /area/library) "ctw" = ( /obj/structure/destructible/cult/tome, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -64519,7 +64519,7 @@ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -64618,7 +64618,7 @@ icon_state = "4-8" }, /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -64726,7 +64726,7 @@ /area/gateway) "ctW" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/gateway) @@ -65010,7 +65010,7 @@ /area/maintenance/starboard) "cuw" = ( /obj/structure/rack, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -65177,7 +65177,7 @@ "cuP" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/meson/engine, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -65210,15 +65210,15 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/effect/decal/cleanable/dirt, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, /obj/effect/turf_decal/bot, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel, /area/engine/storage) "cuT" = ( @@ -65280,8 +65280,8 @@ /area/library) "cuY" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 @@ -65330,8 +65330,8 @@ /area/library) "cve" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/status_display{ pixel_y = -32 }, @@ -65342,7 +65342,7 @@ "cvf" = ( /obj/machinery/light, /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/item/device/laser_pointer{ pixel_x = 3 }, @@ -65540,10 +65540,10 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper/pamphlet/gateway, -/obj/item/weapon/paper/pamphlet/gateway, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/clipboard, +/obj/item/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -65639,11 +65639,11 @@ /area/crew_quarters/locker) "cvJ" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/neutral, /area/crew_quarters/locker) "cvK" = ( @@ -65653,7 +65653,7 @@ /area/crew_quarters/locker) "cvL" = ( /obj/structure/table, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/neutral, /area/crew_quarters/locker) "cvM" = ( @@ -65800,8 +65800,8 @@ /area/engine/engineering) "cwe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -65809,7 +65809,7 @@ "cwf" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -65890,17 +65890,17 @@ "cwo" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/port) "cwp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = 6 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -6 }, /obj/item/clothing/mask/breath, @@ -65914,7 +65914,7 @@ "cwq" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 1 @@ -65925,13 +65925,13 @@ /area/maintenance/port) "cwr" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/port) "cws" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -65945,7 +65945,7 @@ /area/library) "cwu" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/carpet, /area/library) @@ -65979,7 +65979,7 @@ /turf/open/floor/plasteel/black, /area/library) "cwz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -66139,11 +66139,11 @@ /obj/item/stack/medical/gauze, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/syringe/charcoal, +/obj/item/reagent_containers/syringe/charcoal, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; req_access_txt = "0"; @@ -66253,7 +66253,7 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -66294,7 +66294,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -66369,7 +66369,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/restrooms) "cxj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -66426,8 +66426,8 @@ /area/crew_quarters/locker) "cxn" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -66541,9 +66541,9 @@ pixel_x = 26; pixel_y = 26 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, +/obj/item/reagent_containers/food/snacks/grown/poppy/geranium, /obj/machinery/airalarm{ pixel_y = 23 }, @@ -66559,8 +66559,8 @@ /area/crew_quarters/dorms) "cxx" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -66594,7 +66594,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /obj/machinery/status_display{ pixel_y = 32 }, @@ -66832,11 +66832,11 @@ /area/maintenance/port) "cxY" = ( /obj/structure/table/wood, -/obj/item/weapon/newspaper{ +/obj/item/newspaper{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /obj/machinery/status_display{ pixel_x = -32 }, @@ -66930,12 +66930,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 4; pixel_y = -1 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 }, @@ -67037,7 +67037,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "cyr" = ( @@ -67052,7 +67052,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "cys" = ( @@ -67067,7 +67067,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "cyt" = ( @@ -67146,19 +67146,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -67385,16 +67385,16 @@ /area/crew_quarters/dorms) "cyU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cyV" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/razor, +/obj/item/razor, /turf/open/floor/wood, /area/crew_quarters/dorms) "cyW" = ( @@ -67408,8 +67408,8 @@ /area/crew_quarters/dorms) "cyY" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/structure/sign/nanotrasen{ pixel_x = -32 }, @@ -67420,8 +67420,8 @@ /area/crew_quarters/dorms) "cza" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/ai_status_display{ pixel_x = -32 }, @@ -67611,11 +67611,11 @@ /area/engine/storage) "czw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide, /obj/machinery/power/apc{ dir = 4; name = "Engineering Storage APC"; @@ -67695,7 +67695,7 @@ /area/library) "czE" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -67705,13 +67705,13 @@ }, /area/library) "czF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/black, /area/library) "czG" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -67736,11 +67736,11 @@ /area/library) "czI" = ( /obj/structure/table/wood, -/obj/item/weapon/dice/d20{ +/obj/item/dice/d20{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/dice/d10{ +/obj/item/dice/d10{ pixel_x = -3 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -67825,12 +67825,12 @@ "czQ" = ( /obj/item/stack/sheet/metal/fifty, /obj/item/stack/sheet/glass/fifty, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, /obj/structure/table/reinforced, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -67911,7 +67911,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/dsquad, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) @@ -67931,8 +67931,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "cAd" = ( @@ -67958,7 +67958,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/carpet, /area/bridge/showroom/corporate) "cAf" = ( @@ -67974,12 +67974,12 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) "cAh" = ( /obj/structure/table, -/obj/item/weapon/storage/belt, +/obj/item/storage/belt, /obj/item/device/radio, /obj/item/device/radio, /obj/item/device/radio, @@ -68357,7 +68357,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cAL" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nanotrasen{ pixel_x = 32 }, @@ -68365,7 +68365,7 @@ /area/crew_quarters/dorms) "cAM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/wood, /area/crew_quarters/dorms) "cAN" = ( @@ -68384,7 +68384,7 @@ /area/crew_quarters/dorms) "cAP" = ( /obj/structure/table, -/obj/item/weapon/folder, +/obj/item/folder, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -68553,7 +68553,7 @@ /area/engine/engineering) "cBe" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d1 = 1; d2 = 8; @@ -68573,8 +68573,8 @@ /area/engine/storage) "cBg" = ( /obj/structure/rack, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/weldingtool, +/obj/item/storage/belt/utility, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -68645,8 +68645,8 @@ /turf/open/floor/plasteel/neutral, /area/maintenance/port) "cBq" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/machinery/light, /obj/structure/table/reinforced, /obj/item/device/gps, @@ -68674,7 +68674,7 @@ name = "Station Intercom"; pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -68695,7 +68695,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cBw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) @@ -68709,7 +68709,7 @@ /turf/open/floor/plasteel, /area/ai_monitored/storage/eva) "cBy" = ( -/obj/item/weapon/storage/belt, +/obj/item/storage/belt, /obj/item/device/radio, /obj/machinery/light, /obj/structure/table/reinforced, @@ -68724,7 +68724,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/clothing/under/rank/centcom_commander{ desc = "A replica of a jumpsuit worn by the highest ranking commanders under Nanotrasen's central command."; name = "Replica CentCom officer's jumpsuit" @@ -68741,7 +68741,7 @@ /area/bridge/showroom/corporate) "cBA" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) "cBB" = ( @@ -68749,7 +68749,7 @@ dir = 1; pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) @@ -68795,7 +68795,7 @@ pixel_x = 7; pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /turf/open/floor/plasteel/grimy, /area/bridge/showroom/corporate) @@ -68811,7 +68811,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/toy/gun, /obj/item/clothing/head/beret/sec{ armor = list("melee" = 0, "bullet" = 0, "laser" = 0, "energy" = 0, "bomb" = 0, "bio" = 0, "rad" = 0); @@ -68860,7 +68860,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 @@ -68953,7 +68953,7 @@ }, /area/crew_quarters/locker) "cBX" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -68977,8 +68977,8 @@ /area/crew_quarters/locker) "cCa" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -68995,7 +68995,7 @@ }, /area/crew_quarters/locker) "cCc" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1 }, @@ -69012,8 +69012,8 @@ /area/crew_quarters/locker) "cCe" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/lighter, +/obj/item/folder/blue, +/obj/item/lighter, /obj/machinery/button/door{ id = "Dorm1"; name = "Dormitory Door Lock"; @@ -69033,7 +69033,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cCg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/dorms) "cCh" = ( @@ -69043,7 +69043,7 @@ /area/crew_quarters/dorms) "cCi" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/button/door{ id = "Dorm3"; name = "Dormitory Door Lock"; @@ -69057,7 +69057,7 @@ /turf/open/floor/carpet, /area/crew_quarters/dorms) "cCj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/carpet, /area/crew_quarters/dorms) @@ -69150,7 +69150,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cCt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -69214,7 +69214,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cCz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 9 @@ -69225,7 +69225,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cCA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/electricshock{ pixel_y = -32 @@ -69266,25 +69266,25 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/engine/storage) "cCF" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plating, /area/maintenance/port) "cCH" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 3; pixel_y = -3 }, @@ -69294,7 +69294,7 @@ /area/maintenance/port) "cCI" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/maintenance/port) "cCJ" = ( @@ -69551,7 +69551,7 @@ /area/maintenance/starboard/aft) "cDh" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cDi" = ( @@ -70057,7 +70057,7 @@ "cEi" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/item/roller, /turf/open/floor/plasteel/blue/corner{ icon_state = "bluecorner"; @@ -70066,15 +70066,15 @@ /area/maintenance/starboard/aft) "cEj" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cEk" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cEl" = ( @@ -71329,9 +71329,9 @@ dir = 10 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cFW" = ( @@ -71369,7 +71369,7 @@ /turf/open/floor/plating, /area/crew_quarters/dorms) "cGb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 @@ -71397,7 +71397,7 @@ /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) "cGg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) @@ -71457,8 +71457,8 @@ /area/crew_quarters/fitness/recreation) "cGo" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -71939,7 +71939,7 @@ }, /area/crew_quarters/dorms) "cHp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -72137,8 +72137,8 @@ /area/crew_quarters/fitness/recreation) "cHE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/folder/blue, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 @@ -72151,9 +72151,9 @@ /area/crew_quarters/fitness/recreation) "cHG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, -/obj/item/weapon/paper/fluff/holodeck/disclaimer, +/obj/item/clipboard, +/obj/item/folder, +/obj/item/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -72246,8 +72246,8 @@ /area/science/xenobiology) "cHT" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -72563,7 +72563,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/storage/backpack/satchel/med, +/obj/item/storage/backpack/satchel/med, /turf/open/floor/plasteel/neutral/side, /area/medical/storage) "cII" = ( @@ -72814,7 +72814,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -72823,11 +72823,11 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/electronics/apc{ +/obj/item/electronics/apc{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/apc, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -72841,7 +72841,7 @@ /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cJp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -72860,7 +72860,7 @@ /obj/machinery/light_switch{ pixel_y = 26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, @@ -72882,11 +72882,11 @@ /area/maintenance/department/electrical) "cJu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -72921,7 +72921,7 @@ /area/maintenance/port) "cJy" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_guide, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -73100,14 +73100,14 @@ /area/science/research) "cJU" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/paicard, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, /area/science/research) "cJV" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 1 }, @@ -73186,8 +73186,8 @@ /area/hallway/primary/aft) "cKg" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, @@ -73212,17 +73212,17 @@ /area/medical/medbay/central) "cKk" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/syringe, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, /area/medical/medbay/central) "cKl" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 1 }, @@ -73265,7 +73265,7 @@ /area/medical/medbay/central) "cKr" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/device/radio/intercom{ dir = 8; name = "Station Intercom (General)"; @@ -73290,7 +73290,7 @@ "cKu" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cKv" = ( @@ -73549,7 +73549,7 @@ /turf/open/floor/carpet, /area/crew_quarters/dorms) "cKM" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 26; @@ -73562,8 +73562,8 @@ /area/crew_quarters/dorms) "cKN" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen/blue, +/obj/item/folder/blue, +/obj/item/pen/blue, /obj/machinery/button/door{ id = "Dorm6"; name = "Dormitory Door Lock"; @@ -73623,8 +73623,8 @@ "cKU" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -73673,7 +73673,7 @@ }, /area/maintenance/department/electrical) "cLa" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/department/electrical) @@ -73683,12 +73683,12 @@ /turf/open/floor/plating, /area/maintenance/department/electrical) "cLc" = ( -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/wiki/engineering_construction{ pixel_x = 3; pixel_y = -3 }, @@ -73769,7 +73769,7 @@ "cLk" = ( /obj/machinery/cell_charger, /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ d2 = 8; @@ -73858,7 +73858,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/storage/backpack/satchel/tox, +/obj/item/storage/backpack/satchel/tox, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/research) @@ -73880,7 +73880,7 @@ }, /area/science/research) "cLu" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 @@ -73922,7 +73922,7 @@ /area/security/checkpoint/science/research) "cLy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /obj/machinery/ai_status_display{ pixel_y = 32 @@ -73936,7 +73936,7 @@ /area/security/checkpoint/science/research) "cLz" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/assembly/infra, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 @@ -73990,7 +73990,7 @@ /turf/open/floor/plasteel/neutral, /area/science/research) "cLJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whitepurple/corner{ @@ -73998,7 +73998,7 @@ }, /area/science/research) "cLK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -74020,7 +74020,7 @@ /turf/open/floor/plasteel/blue, /area/medical/medbay/central) "cLP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -74028,7 +74028,7 @@ }, /area/medical/medbay/central) "cLQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; id = "MedbayFoyer"; @@ -74065,7 +74065,7 @@ /turf/closed/wall, /area/medical/storage) "cLW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 8 }, @@ -74173,20 +74173,20 @@ /area/maintenance/starboard/aft) "cMj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/clown, +/obj/item/bedsheet/clown, /turf/open/floor/wood, /area/crew_quarters/dorms) "cMk" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/cane, +/obj/item/cane, /turf/open/floor/carpet, /area/crew_quarters/dorms) "cMl" = ( @@ -74199,7 +74199,7 @@ /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cMm" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nanotrasen{ pixel_x = 32; pixel_y = -32 @@ -74441,8 +74441,8 @@ name = "Station Intercom"; pixel_x = 26 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -74684,7 +74684,7 @@ }, /area/security/checkpoint/science/research) "cNh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whitepurple/corner{ @@ -74879,7 +74879,7 @@ pixel_x = -32 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /obj/machinery/button/door{ desc = "A remote control switch for the medbay foyer."; @@ -74937,11 +74937,11 @@ /area/security/checkpoint/medical) "cNH" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -74951,11 +74951,11 @@ /area/medical/medbay/central) "cNI" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 26 @@ -74965,8 +74965,8 @@ }, /area/medical/medbay/central) "cNJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, -/obj/item/weapon/storage/pod{ +/obj/item/twohanded/required/kirbyplants/random, +/obj/item/storage/pod{ pixel_x = 32; pixel_y = 32 }, @@ -74984,16 +74984,16 @@ /area/medical/storage) "cNL" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire{ pixel_x = -3; pixel_y = -3 }, @@ -75011,16 +75011,16 @@ /area/medical/storage) "cNO" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ pixel_x = -3; pixel_y = -3 }, @@ -75069,8 +75069,8 @@ /area/maintenance/starboard/aft) "cNS" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -75082,12 +75082,12 @@ /area/crew_quarters/dorms) "cNU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/mime, +/obj/item/bedsheet/mime, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "cNV" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 8 @@ -75099,8 +75099,8 @@ /area/crew_quarters/fitness/recreation) "cNX" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/razor, +/obj/item/folder, +/obj/item/razor, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) "cNY" = ( @@ -75112,7 +75112,7 @@ /area/crew_quarters/fitness/recreation) "cNZ" = ( /obj/structure/table, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) "cOa" = ( @@ -75127,8 +75127,8 @@ /area/holodeck/rec_center) "cOb" = ( /obj/structure/table, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/extinguisher/mini, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /obj/machinery/light/small{ dir = 1 @@ -75158,7 +75158,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -75302,7 +75302,7 @@ /turf/open/floor/plasteel/neutral, /area/science/xenobiology) "cOx" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, @@ -75453,16 +75453,16 @@ /area/science/xenobiology) "cON" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 32 }, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -75893,16 +75893,16 @@ /area/medical/medbay/central) "cPD" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute{ pixel_x = -3; pixel_y = -3 }, @@ -75918,16 +75918,16 @@ /area/medical/storage) "cPF" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = -3; pixel_y = -3 }, @@ -76006,8 +76006,8 @@ /area/maintenance/starboard/aft) "cPM" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/light, /obj/machinery/status_display{ pixel_y = -32 @@ -76030,7 +76030,7 @@ "cPO" = ( /obj/structure/bed, /obj/machinery/light, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/status_display{ pixel_y = -32 }, @@ -76073,9 +76073,9 @@ /area/crew_quarters/dorms) "cPR" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -76103,13 +76103,13 @@ /area/crew_quarters/fitness/recreation) "cPU" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) "cPV" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) "cPW" = ( @@ -76224,8 +76224,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -76412,7 +76412,7 @@ }, /area/science/xenobiology) "cQC" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 1 }, @@ -76487,13 +76487,13 @@ /area/science/xenobiology) "cQJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /obj/machinery/light{ dir = 4 }, @@ -76558,7 +76558,7 @@ /turf/open/floor/plating, /area/security/checkpoint/science/research) "cQR" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whitepurple/corner{ @@ -76576,7 +76576,7 @@ /turf/open/floor/plasteel/purple, /area/science/research) "cQU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whitepurple/corner, @@ -76603,7 +76603,7 @@ icon_state = "pipe-s"; dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -76625,7 +76625,7 @@ /turf/open/floor/plasteel/blue, /area/medical/medbay/central) "cRa" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/corner, @@ -76721,12 +76721,12 @@ /area/medical/storage) "cRj" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/gun/syringe, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, /obj/machinery/status_display{ pixel_x = -32 }, @@ -76754,13 +76754,13 @@ /area/medical/storage) "cRn" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/belt/medical, -/obj/item/weapon/storage/belt/medical, +/obj/item/storage/belt/medical, +/obj/item/storage/belt/medical, /obj/item/clothing/neck/stethoscope, /obj/item/clothing/neck/stethoscope, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, @@ -76878,15 +76878,15 @@ /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cRy" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/department/electrical) "cRz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -77261,7 +77261,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Security Post - Science"; dir = 8; @@ -77274,9 +77274,9 @@ /area/security/checkpoint/science/research) "cSe" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/clipboard, +/obj/item/electronics/airlock, +/obj/item/stock_parts/console_screen, /obj/item/device/assembly/signaler, /obj/machinery/airalarm{ dir = 1; @@ -77301,7 +77301,7 @@ }, /area/science/research) "cSh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whitepurple/corner{ @@ -77311,7 +77311,7 @@ "cSi" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Science - Waiting Room"; @@ -77334,13 +77334,13 @@ /area/science/research) "cSk" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) "cSl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whitepurple/corner, @@ -77379,8 +77379,8 @@ /area/hallway/primary/aft) "cSr" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 @@ -77388,7 +77388,7 @@ /area/medical/medbay/central) "cSs" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 }, @@ -77408,7 +77408,7 @@ /area/medical/medbay/central) "cSv" = ( /obj/structure/disposalpipe/segment, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -77443,7 +77443,7 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "cSz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner, @@ -77453,8 +77453,8 @@ /area/medical/medbay/central) "cSB" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "cSC" = ( @@ -77550,7 +77550,7 @@ /area/medical/medbay/central) "cSN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/corner{ dir = 1 @@ -77651,7 +77651,7 @@ /area/maintenance/starboard/aft) "cSY" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -77765,8 +77765,8 @@ /area/maintenance/department/electrical) "cTn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -77785,7 +77785,7 @@ /obj/machinery/light_switch{ pixel_y = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/maintenance/department/electrical) @@ -77906,7 +77906,7 @@ /turf/open/floor/plasteel/neutral/side, /area/science/xenobiology) "cTE" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -77970,8 +77970,8 @@ /area/science/xenobiology) "cTL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -78122,8 +78122,8 @@ "cTZ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/door/window/southleft{ name = "Research Lab Desk"; req_access_txt = "7" @@ -78188,7 +78188,7 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/door/window/northleft, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -78201,26 +78201,26 @@ "cUi" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/hypospray/medipen, +/obj/item/folder/white, +/obj/item/reagent_containers/hypospray/medipen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/medbay/central) "cUj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/syringe, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/medbay/central) "cUk" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/medbay/central) @@ -78294,7 +78294,7 @@ /turf/open/floor/plasteel/red/side, /area/security/checkpoint/medical) "cUp" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -78353,7 +78353,7 @@ }, /area/medical/medbay/central) "cUv" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, @@ -78606,7 +78606,7 @@ "cUP" = ( /obj/structure/table, /obj/item/clothing/under/suit_jacket/really_black, -/obj/item/weapon/cane, +/obj/item/cane, /obj/item/clothing/head/bowler{ pixel_y = 5 }, @@ -78617,8 +78617,8 @@ /area/crew_quarters/fitness/recreation) "cUQ" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, +/obj/item/clipboard, +/obj/item/folder, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -78627,7 +78627,7 @@ "cUR" = ( /obj/structure/table, /obj/item/toy/sword, -/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow, +/obj/item/gun/ballistic/shotgun/toy/crossbow, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -78653,8 +78653,8 @@ /area/crew_quarters/fitness/recreation) "cUV" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/escape{ icon_state = "escape"; dir = 4 @@ -78663,7 +78663,7 @@ "cUW" = ( /obj/structure/mopbucket, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plating, /area/maintenance/port) "cUX" = ( @@ -78672,7 +78672,7 @@ name = "old sink"; pixel_y = 28 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/maintenance/port) "cUY" = ( @@ -78742,7 +78742,7 @@ /turf/open/floor/plasteel/neutral, /area/science/xenobiology) "cVf" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -79001,7 +79001,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/status_display{ pixel_y = 32 }, @@ -79036,7 +79036,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/machinery/newscaster{ pixel_y = 32 @@ -79077,14 +79077,14 @@ /area/medical/chemistry) "cVM" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -79095,7 +79095,7 @@ /area/medical/chemistry) "cVN" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/chemist, /turf/open/floor/plasteel/whiteyellow/corner{ icon_state = "whiteyellowcorner"; @@ -79343,19 +79343,19 @@ /area/crew_quarters/fitness/recreation) "cWs" = ( /obj/structure/table, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) "cWt" = ( -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/structure/table, /turf/open/floor/plasteel/neutral, /area/crew_quarters/fitness/recreation) @@ -79379,9 +79379,9 @@ /area/crew_quarters/fitness/recreation) "cWx" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/machinery/light/small{ dir = 4 }, @@ -79394,12 +79394,12 @@ /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/item/clothing/gloves/color/orange, -/obj/item/weapon/storage/box/mousetraps{ +/obj/item/storage/box/mousetraps{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/storage/box/lights/mixed, +/obj/item/grenade/chem_grenade/cleaner, /turf/open/floor/plasteel/green/side{ dir = 8 }, @@ -79607,8 +79607,8 @@ /area/science/xenobiology) "cWS" = ( /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/light, /obj/structure/extinguisher_cabinet{ @@ -79824,8 +79824,8 @@ /area/science/xenobiology) "cXh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/structure/cable/white{ d2 = 8; icon_state = "0-8" @@ -79923,12 +79923,12 @@ /area/science/research) "cXr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -80181,8 +80181,8 @@ /area/medical/medbay/central) "cXU" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/folder/white, +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, @@ -80211,7 +80211,7 @@ "cXY" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet/crate, -/obj/item/weapon/retractor, +/obj/item/retractor, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, @@ -80320,7 +80320,7 @@ /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/fitness/recreation) "cYl" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/corner, /area/crew_quarters/fitness/recreation) "cYm" = ( @@ -80501,14 +80501,14 @@ /area/science/xenobiology) "cYF" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 }, -/obj/item/weapon/storage/bag/bio, -/obj/item/weapon/storage/bag/bio, +/obj/item/storage/bag/bio, +/obj/item/storage/bag/bio, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -80517,7 +80517,7 @@ /turf/open/floor/plasteel, /area/science/xenobiology) "cYH" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/xenobiology) @@ -80619,13 +80619,13 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -80664,7 +80664,7 @@ /area/science/lab) "cYX" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -80687,11 +80687,11 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/screwdriver, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver, /turf/open/floor/plasteel/whiteyellow/corner{ icon_state = "whiteyellowcorner"; dir = 8 @@ -80722,8 +80722,8 @@ /obj/machinery/reagentgrinder{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/whiteyellow/corner{ dir = 4 }, @@ -80743,7 +80743,7 @@ /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) "cZj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) @@ -80856,8 +80856,8 @@ /area/medical/medbay/central) "cZy" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral/corner, /area/medical/medbay/central) "cZz" = ( @@ -80883,7 +80883,7 @@ /obj/structure/sign/examroom{ pixel_x = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whiteblue/corner{ dir = 1 }, @@ -80899,12 +80899,12 @@ /turf/open/floor/plasteel/neutral, /area/medical/abandoned) "cZF" = ( -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/blue, /area/medical/abandoned) "cZG" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/medical/abandoned) @@ -80987,7 +80987,7 @@ /area/maintenance/port) "cZO" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -81106,26 +81106,26 @@ /area/science/research) "cZZ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/research) "daa" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/research) "dab" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, -/obj/item/weapon/storage/pod{ +/obj/item/twohanded/required/kirbyplants/random, +/obj/item/storage/pod{ pixel_x = 32 }, /obj/effect/turf_decal/delivery, @@ -81140,11 +81140,11 @@ /area/science/research) "dae" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/folder/white, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/structure/cable/white{ d2 = 4; icon_state = "0-4" @@ -81256,11 +81256,11 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/dropper, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -81285,8 +81285,8 @@ "dap" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/folder/white, +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, @@ -81406,7 +81406,7 @@ /turf/open/floor/plating, /area/medical/medbay/central) "daB" = ( -/obj/item/weapon/firstaid_arm_assembly, +/obj/item/firstaid_arm_assembly, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 8 @@ -81483,7 +81483,7 @@ /turf/open/floor/plasteel/blue, /area/medical/abandoned) "daH" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -81528,7 +81528,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "daN" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -81540,7 +81540,7 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "daP" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) @@ -81556,7 +81556,7 @@ icon_state = "0-2" }, /obj/item/clothing/gloves/color/fyellow, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/machinery/power/apc{ dir = 1; name = "Abandoned Gambling Den APC"; @@ -81583,7 +81583,7 @@ /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "daT" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "daV" = ( @@ -81732,7 +81732,7 @@ }, /area/science/xenobiology) "dbj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, @@ -81876,8 +81876,8 @@ "dby" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "rdrnd"; name = "Research and Development Shutters" @@ -81910,7 +81910,7 @@ /area/science/lab) "dbB" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/scientist, /turf/open/floor/plasteel/whitepurple/side{ dir = 10 @@ -81923,13 +81923,13 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = -6 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 6 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_y = 6 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -81942,7 +81942,7 @@ /turf/open/floor/plasteel/neutral, /area/science/lab) "dbE" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitepurple/corner, /area/science/lab) "dbF" = ( @@ -81956,8 +81956,8 @@ /area/science/lab) "dbG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/purple, /area/hallway/primary/aft) "dbH" = ( @@ -81970,8 +81970,8 @@ /area/hallway/primary/aft) "dbI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -82051,7 +82051,7 @@ /obj/machinery/door/window/eastright{ name = "Chemistry Desk" }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -82243,12 +82243,12 @@ /obj/structure/table/optable, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/blue, /area/medical/abandoned) "dco" = ( /obj/structure/frame/computer, -/obj/item/weapon/circuitboard/computer/operating, +/obj/item/circuitboard/computer/operating, /turf/open/floor/plasteel/neutral, /area/medical/abandoned) "dcp" = ( @@ -82540,8 +82540,8 @@ "dcY" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 8; name = "Research Lab Desk"; @@ -82573,8 +82573,8 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/turf_decal/delivery, /obj/machinery/door/window/southleft{ dir = 8; @@ -82913,9 +82913,9 @@ "ddK" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/grenade/smokebomb, +/obj/item/storage/secure/briefcase, +/obj/item/restraints/handcuffs, +/obj/item/grenade/smokebomb, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ddL" = ( @@ -82983,7 +82983,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/wallet/random, +/obj/item/storage/wallet/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -82991,7 +82991,7 @@ /area/crew_quarters/abandoned_gambling_den) "ddT" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -83013,11 +83013,11 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) "ddW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/science/research/abandoned) "ddX" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) @@ -83026,9 +83026,9 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/clipboard, +/obj/item/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/dropper, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, @@ -83036,12 +83036,12 @@ /area/science/research/abandoned) "ddZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, /obj/machinery/status_display{ pixel_y = 32 }, @@ -83055,7 +83055,7 @@ /turf/open/floor/plasteel, /area/science/research/abandoned) "deb" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -83064,7 +83064,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -83072,8 +83072,8 @@ /area/science/research/abandoned) "ded" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plating, /area/science/research/abandoned) "dee" = ( @@ -83280,7 +83280,7 @@ /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) "deF" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -83321,7 +83321,7 @@ "deI" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -83332,11 +83332,11 @@ /area/science/lab) "deJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, /obj/machinery/status_display{ @@ -83363,10 +83363,10 @@ /area/science/lab) "deL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /obj/structure/extinguisher_cabinet{ pixel_y = -32 }, @@ -83378,8 +83378,8 @@ "deM" = ( /obj/structure/table/reinforced, /obj/machinery/light, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/button/door{ id = "rndlab1"; name = "Primary Research Shutters Control"; @@ -83400,13 +83400,13 @@ /turf/open/floor/plasteel, /area/science/lab) "deN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/purple, /area/hallway/primary/aft) "deO" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/orange, @@ -83442,7 +83442,7 @@ "deS" = ( /obj/structure/table/glass, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -83661,7 +83661,7 @@ "dfp" = ( /obj/structure/rack, /obj/item/roller, -/obj/item/weapon/reagent_containers/blood, +/obj/item/reagent_containers/blood, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -83695,7 +83695,7 @@ /area/medical/abandoned) "dfs" = ( /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/medical/abandoned) @@ -83704,7 +83704,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, @@ -83715,7 +83715,7 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -83725,12 +83725,12 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/syringe/epinephrine{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/vault, /area/medical/abandoned) @@ -83738,12 +83738,12 @@ /obj/structure/table/reinforced, /obj/machinery/light/small, /obj/structure/bedsheetbin, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault, /area/medical/abandoned) "dfx" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/effect/decal/cleanable/dirt, @@ -83920,11 +83920,11 @@ /area/crew_quarters/abandoned_gambling_den) "dfN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/disk/tech_disk, +/obj/item/disk/tech_disk, /obj/item/device/assembly/timer, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -83962,8 +83962,8 @@ /area/science/research/abandoned) "dfT" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/research/abandoned) @@ -84004,8 +84004,8 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -84403,7 +84403,7 @@ /turf/closed/wall, /area/hallway/secondary/construction) "dgQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18" }, /obj/effect/decal/cleanable/dirt, @@ -84461,7 +84461,7 @@ /area/crew_quarters/abandoned_gambling_den) "dgX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -84519,7 +84519,7 @@ /area/science/research/abandoned) "dhf" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/item/device/multitool, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -84532,7 +84532,7 @@ /turf/open/floor/plating, /area/maintenance/port) "dhh" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /obj/machinery/light_switch{ pixel_x = -26 @@ -84633,11 +84633,11 @@ /area/science/research) "dhv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/energy/laser/practice{ +/obj/item/gun/energy/laser/practice{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/ears/earmuffs, /obj/effect/decal/cleanable/dirt, @@ -84712,7 +84712,7 @@ /area/science/misc_lab/range) "dhy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/paicard, /obj/machinery/airalarm{ dir = 4; @@ -84752,8 +84752,8 @@ /area/crew_quarters/heads/hor) "dhC" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) @@ -84777,8 +84777,8 @@ /area/science/research) "dhF" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/machinery/light{ dir = 8 @@ -84863,8 +84863,8 @@ /area/science/robotics/mechbay) "dhL" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -84877,7 +84877,7 @@ "dhM" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/rack, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/roller, /turf/open/floor/plasteel/blue/corner{ icon_state = "bluecorner"; @@ -84916,7 +84916,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -84955,7 +84955,7 @@ }, /area/medical/genetics/cloning) "dhU" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitepurple/corner{ dir = 1 }, @@ -84968,12 +84968,12 @@ /area/medical/genetics/cloning) "dhW" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, @@ -84990,8 +84990,8 @@ name = "Cloning Lab APC"; pixel_y = 24 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/book/manual/medical_cloning, +/obj/item/folder/white, +/obj/item/book/manual/medical_cloning, /turf/open/floor/plasteel/whiteblue/corner{ dir = 4 }, @@ -85021,7 +85021,7 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "dib" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whiteblue, /area/medical/medbay/central) "dic" = ( @@ -85033,15 +85033,15 @@ /area/medical/medbay/central) "did" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mannitol, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -85078,7 +85078,7 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/central) "dii" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault, /area/medical/surgery) "dij" = ( @@ -85154,7 +85154,7 @@ /area/maintenance/starboard/aft) "dit" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -85290,7 +85290,7 @@ "diM" = ( /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 3; pixel_y = 3 }, @@ -85514,9 +85514,9 @@ /area/science/explab) "djf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -85693,7 +85693,7 @@ "djs" = ( /obj/structure/table/reinforced, /obj/item/device/aicard, -/obj/item/weapon/circuitboard/aicore, +/obj/item/circuitboard/aicore, /obj/structure/disposalpipe/sortjunction{ dir = 4; icon_state = "pipe-j1s"; @@ -85934,8 +85934,8 @@ "djR" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/blue/corner{ dir = 4 }, @@ -86120,8 +86120,8 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -86224,7 +86224,7 @@ }, /area/crew_quarters/abandoned_gambling_den) "dkz" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ @@ -86240,11 +86240,11 @@ /area/crew_quarters/abandoned_gambling_den) "dkB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/folder/white, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) @@ -86441,7 +86441,7 @@ /area/science/explab) "dkS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/experimentor, +/obj/item/book/manual/experimentor, /obj/item/device/healthanalyzer, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -86462,7 +86462,7 @@ "dkU" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -86475,8 +86475,8 @@ "dkV" = ( /obj/structure/table/reinforced, /obj/machinery/light, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -86486,7 +86486,7 @@ /turf/open/floor/plasteel, /area/science/explab) "dkW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -87048,8 +87048,8 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) "dmc" = ( @@ -87059,7 +87059,7 @@ /area/science/research/abandoned) "dmd" = ( /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -87085,13 +87085,13 @@ /turf/open/floor/plating, /area/science/research/abandoned) "dmh" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) "dmi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/light_switch{ @@ -87245,7 +87245,7 @@ /obj/structure/cable/white, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot, -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel, /area/crew_quarters/heads/hor) "dmB" = ( @@ -87273,13 +87273,13 @@ /area/crew_quarters/heads/hor) "dmE" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = 6 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = -6 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_y = 6 }, /obj/machinery/firealarm{ @@ -87451,7 +87451,7 @@ /turf/open/floor/plasteel/whitepurple/corner, /area/medical/genetics/cloning) "dna" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/genetics/cloning) @@ -87499,10 +87499,10 @@ /area/medical/medbay/central) "dne" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whiteblue, /area/medical/medbay/central) "dnf" = ( @@ -87534,7 +87534,7 @@ /area/medical/medbay/central) "dni" = ( /obj/structure/table/glass, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /obj/item/clothing/neck/stethoscope, /obj/machinery/camera{ c_tag = "Medbay - Cryogenics"; @@ -87576,7 +87576,7 @@ /area/medical/surgery) "dnn" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/machinery/newscaster{ pixel_x = 32 @@ -87598,7 +87598,7 @@ /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -87608,8 +87608,8 @@ }, /area/medical/surgery) "dnq" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -87619,8 +87619,8 @@ }, /area/medical/surgery) "dnr" = ( -/obj/item/weapon/circular_saw, -/obj/item/weapon/surgicaldrill{ +/obj/item/circular_saw, +/obj/item/surgicaldrill{ pixel_y = 5 }, /obj/structure/table/reinforced, @@ -87630,8 +87630,8 @@ /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "dns" = ( -/obj/item/weapon/scalpel, -/obj/item/weapon/cautery, +/obj/item/scalpel, +/obj/item/cautery, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -87700,7 +87700,7 @@ /obj/machinery/status_display{ pixel_x = 32 }, -/obj/item/weapon/book/manual/wiki/engineering_hacking, +/obj/item/book/manual/wiki/engineering_hacking, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dnB" = ( @@ -87875,8 +87875,8 @@ /area/crew_quarters/heads/hor) "dnT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/stamp/rd, +/obj/item/folder/white, +/obj/item/stamp/rd, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/side{ dir = 4 @@ -88075,7 +88075,7 @@ /area/medical/surgery) "doq" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/iv_drip, /obj/machinery/camera{ c_tag = "Medbay - Recovery Room"; @@ -88294,7 +88294,7 @@ "doL" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/research/abandoned) @@ -88306,7 +88306,7 @@ /turf/open/floor/plating, /area/science/research/abandoned) "doN" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/research/abandoned) @@ -88325,9 +88325,9 @@ /area/science/research/abandoned) "doQ" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/glass/beaker/large, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -88342,8 +88342,8 @@ /area/science/research/abandoned) "doS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/micro_laser, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -88484,7 +88484,7 @@ /area/science/misc_lab/range) "dpk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/rd, /obj/machinery/requests_console{ announcementConsole = 1; @@ -88669,7 +88669,7 @@ /turf/open/floor/plasteel/purple/corner, /area/hallway/primary/aft) "dpC" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -88706,11 +88706,11 @@ /area/medical/genetics) "dpG" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 }, @@ -88726,7 +88726,7 @@ pixel_y = 26 }, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/storage/box/disks, +/obj/item/storage/box/disks, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -88752,7 +88752,7 @@ /turf/open/floor/plasteel, /area/medical/genetics) "dpL" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/firealarm{ pixel_x = -26; pixel_y = 26 @@ -88845,33 +88845,33 @@ /area/crew_quarters/heads/cmo) "dpT" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/blue, -/obj/item/weapon/cartridge/medical{ +/obj/item/folder/blue, +/obj/item/cartridge/medical{ pixel_x = -3 }, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = 3 }, -/obj/item/weapon/cartridge/chemistry{ +/obj/item/cartridge/chemistry{ pixel_y = 6 }, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dpU" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/flashlight/pen, /obj/item/clothing/neck/stethoscope, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dpV" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dpW" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/clothing/glasses/hud/health, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -89137,7 +89137,7 @@ "dqq" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/device/assembly/voice, /obj/item/clothing/head/welding, /obj/effect/spawner/lootdrop/maintenance, @@ -89194,13 +89194,13 @@ }, /area/crew_quarters/abandoned_gambling_den) "dqw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) "dqx" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/research/abandoned) @@ -89214,8 +89214,8 @@ /area/science/research/abandoned) "dqz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/research/abandoned) @@ -89339,7 +89339,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/item/device/taperecorder, /obj/machinery/newscaster{ pixel_y = -32 @@ -89421,7 +89421,7 @@ /obj/structure/table, /obj/effect/decal/cleanable/dirt, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light{ dir = 8 }, @@ -89607,7 +89607,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/geneticist, /obj/machinery/power/apc{ dir = 4; @@ -89629,9 +89629,9 @@ /area/medical/genetics) "drl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/storage/pill_bottle/mutadone, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/folder/white, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -89996,11 +89996,11 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/secondary/construction) @@ -90029,10 +90029,10 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/electronics/firealarm, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/electronics/firealarm, +/obj/item/stock_parts/console_screen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/secondary/construction) @@ -90361,8 +90361,8 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/storage/box/disks, +/obj/item/folder/white, +/obj/item/storage/box/disks, /obj/machinery/camera{ c_tag = "Medbay - Genetics Desk"; dir = 4; @@ -90611,7 +90611,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/cmo) "dsW" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -90639,7 +90639,7 @@ /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dta" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/neutral/side{ dir = 8; heat_capacity = 1e+006 @@ -90658,7 +90658,7 @@ /obj/item/clothing/mask/muzzle, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/ears/earmuffs, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /obj/item/clothing/glasses/eyepatch, /turf/open/floor/plasteel/whiteblue/corner{ dir = 8 @@ -90720,8 +90720,8 @@ /area/medical/surgery) "dtj" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -90766,8 +90766,8 @@ /area/hallway/secondary/construction) "dto" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -90803,7 +90803,7 @@ /area/crew_quarters/abandoned_gambling_den) "dtt" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, @@ -90817,11 +90817,11 @@ /area/crew_quarters/abandoned_gambling_den) "dtv" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco{ +/obj/item/storage/fancy/cigarettes/dromedaryco{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/cigarettes/dromedaryco, +/obj/item/storage/fancy/cigarettes/dromedaryco, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/black, /area/crew_quarters/abandoned_gambling_den) @@ -91055,7 +91055,7 @@ /area/crew_quarters/heads/hor) "dtW" = ( /obj/structure/dresser, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /turf/open/floor/plasteel/whitepurple/corner{ @@ -91090,7 +91090,7 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "dtY" = ( -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/item/device/assembly/prox_sensor{ pixel_x = 5; pixel_y = 7 @@ -91114,13 +91114,13 @@ /area/science/robotics/lab) "dua" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/storage/belt/utility/full, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/storage/belt/utility/full, /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/circuitboard/mecha/ripley/main, -/obj/item/weapon/circuitboard/mecha/ripley/peripherals, +/obj/item/circuitboard/mecha/ripley/main, +/obj/item/circuitboard/mecha/ripley/peripherals, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -91135,7 +91135,7 @@ /area/science/robotics/lab) "duc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/roboticist, /obj/machinery/button/door{ id = "roboticsprivacy"; @@ -91187,8 +91187,8 @@ /obj/machinery/door/window/westright{ name = "Genetics Desk" }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/genetics) @@ -91221,7 +91221,7 @@ /turf/open/floor/plasteel/neutral, /area/medical/genetics) "duj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitepurple/corner, /area/medical/genetics) "duk" = ( @@ -91236,8 +91236,8 @@ /area/medical/genetics) "dul" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/item/device/radio/headset/headset_medsci, /turf/open/floor/plasteel/vault{ dir = 8 @@ -91332,7 +91332,7 @@ /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dux" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/cable/white{ d2 = 8; icon_state = "0-8" @@ -91432,7 +91432,7 @@ /area/maintenance/solars/starboard/aft) "duE" = ( /obj/structure/frame/machine, -/obj/item/weapon/circuitboard/machine/cyborgrecharger, +/obj/item/circuitboard/machine/cyborgrecharger, /turf/open/floor/plating, /area/science/research/abandoned) "duF" = ( @@ -91631,7 +91631,7 @@ dir = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/rd, +/obj/item/bedsheet/rd, /obj/machinery/status_display{ pixel_x = 32 }, @@ -91643,7 +91643,7 @@ /obj/item/stack/sheet/plasteel{ amount = 15 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/light{ dir = 8 }, @@ -91715,8 +91715,8 @@ "dvj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "roboticsprivacy"; name = "Robotics Shutters" @@ -91803,11 +91803,11 @@ name = "Genetics Lab RC"; pixel_y = -32 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -91834,7 +91834,7 @@ /turf/open/floor/plasteel, /area/medical/genetics) "dvt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -91901,7 +91901,7 @@ /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) "dvA" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 4 @@ -91969,7 +91969,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -91987,12 +91987,12 @@ d2 = 8; icon_state = "1-8" }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -92034,11 +92034,11 @@ /area/medical/medbay/central) "dvK" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/vault, /area/medical/medbay/central) "dvL" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/flashlight/pen, /obj/item/clothing/neck/stethoscope, /obj/structure/table, @@ -92266,11 +92266,11 @@ /area/solar/starboard/aft) "dwe" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum{ +/obj/item/reagent_containers/food/drinks/bottle/rum{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 7 }, /obj/effect/decal/cleanable/dirt, @@ -92278,15 +92278,15 @@ /area/crew_quarters/abandoned_gambling_den) "dwg" = ( /obj/structure/table/wood/poker, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/crew_quarters/abandoned_gambling_den) "dwh" = ( /obj/structure/table, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/science/research/abandoned) @@ -92309,7 +92309,7 @@ /area/science/research/abandoned) "dwl" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -92590,7 +92590,7 @@ /area/medical/morgue) "dwQ" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/cmo, /obj/machinery/status_display{ pixel_x = -32 @@ -92832,7 +92832,7 @@ /turf/open/floor/plating, /area/science/research/abandoned) "dxo" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/effect/decal/cleanable/dirt, @@ -92846,7 +92846,7 @@ /turf/open/floor/plasteel, /area/science/research/abandoned) "dxq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/delivery, @@ -92854,8 +92854,8 @@ /area/science/research/abandoned) "dxr" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, +/obj/item/clipboard, +/obj/item/folder/white, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -92872,12 +92872,12 @@ "dxt" = ( /obj/structure/frame/machine, /obj/machinery/light/small, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) "dxu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/effect/decal/cleanable/dirt, @@ -92887,7 +92887,7 @@ "dxv" = ( /obj/structure/table, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/science/research/abandoned) @@ -93117,7 +93117,7 @@ dir = 8; pixel_x = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Science - Robotics Lab"; dir = 8; @@ -93141,11 +93141,11 @@ "dxR" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plating, /area/medical/morgue) "dxS" = ( @@ -93247,8 +93247,8 @@ /area/medical/morgue) "dye" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/folder/white, +/obj/item/storage/secure/briefcase, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -93334,7 +93334,7 @@ /turf/open/floor/plasteel/cmo, /area/medical/medbay/central) "dym" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -93521,8 +93521,8 @@ dir = 1 }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/structure/extinguisher_cabinet{ pixel_x = 26 @@ -93542,8 +93542,8 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/wrench, +/obj/item/clipboard, +/obj/item/wrench, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -93583,8 +93583,8 @@ /area/science/robotics/lab) "dyO" = ( /obj/structure/rack, -/obj/item/weapon/storage/firstaid, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, +/obj/item/storage/firstaid, /obj/item/device/paicard, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/bot, @@ -93719,7 +93719,7 @@ "dzi" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/duffelbag/med, /obj/item/device/flashlight/pen, /turf/open/floor/plating, /area/medical/morgue) @@ -93831,7 +93831,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre/abandoned) "dzv" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -93858,11 +93858,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/photocopier, -/obj/item/weapon/newspaper{ +/obj/item/newspaper{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/open/floor/plating, /area/security/detectives_office/private_investigators_office) "dzz" = ( @@ -93883,12 +93883,12 @@ /area/security/detectives_office/private_investigators_office) "dzC" = ( /obj/structure/table/wood, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/crowbar/red, +/obj/item/book/manual/wiki/security_space_law{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/detective, +/obj/item/book/manual/detective, /obj/item/device/camera/detective, /turf/open/floor/plasteel/vault{ dir = 5 @@ -93931,8 +93931,8 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/camera{ c_tag = "Science - Toxins Launch Site"; @@ -94025,8 +94025,8 @@ /area/science/mixing) "dzO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/effect/decal/cleanable/dirt, @@ -94270,7 +94270,7 @@ /area/science/robotics/lab) "dAj" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -94597,7 +94597,7 @@ /area/crew_quarters/theatre/abandoned) "dAM" = ( /obj/structure/table/wood, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /obj/item/clothing/head/bowler, /turf/open/floor/plasteel/vault{ dir = 5 @@ -94631,7 +94631,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/security/detectives_office/private_investigators_office) "dAR" = ( @@ -94810,7 +94810,7 @@ /area/science/mixing) "dBk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -94933,12 +94933,12 @@ /area/science/research) "dBw" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/screwdriver{ +/obj/item/storage/toolbox/electrical, +/obj/item/screwdriver{ pixel_y = 5 }, /obj/item/device/multitool, @@ -94967,11 +94967,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/item/borg/upgrade/rename, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -94987,8 +94987,8 @@ dir = 8 }, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/cautery, +/obj/item/surgical_drapes, +/obj/item/cautery, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -95006,8 +95006,8 @@ /area/science/robotics/lab) "dBD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/machinery/light{ dir = 4 }, @@ -95084,7 +95084,7 @@ "dBM" = ( /obj/structure/table, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -95136,8 +95136,8 @@ "dBS" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/pill_bottle, +/obj/item/crowbar, +/obj/item/storage/pill_bottle, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -95175,7 +95175,7 @@ /area/crew_quarters/heads/cmo) "dBX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cmo, +/obj/item/bedsheet/cmo, /obj/machinery/light{ dir = 4 }, @@ -95231,11 +95231,11 @@ /area/crew_quarters/theatre/abandoned) "dCe" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/theatre/abandoned) @@ -95676,8 +95676,8 @@ /area/science/research) "dCN" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -95744,10 +95744,10 @@ /area/science/robotics/lab) "dCU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 16 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -95804,7 +95804,7 @@ "dDc" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plating, /area/medical/morgue) "dDd" = ( @@ -95873,7 +95873,7 @@ /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "dDm" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 @@ -96237,8 +96237,8 @@ /area/science/mixing) "dDZ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -96303,7 +96303,7 @@ /turf/open/floor/circuit/green/telecomms/mainframe, /area/science/server) "dEh" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/corner{ dir = 8 @@ -96441,26 +96441,26 @@ /area/security/detectives_office/private_investigators_office) "dEt" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) "dEu" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) "dEv" = ( /obj/structure/table/wood, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/item/device/taperecorder, /obj/machinery/airalarm{ dir = 8; @@ -96671,7 +96671,7 @@ dir = 4 }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -96860,7 +96860,7 @@ icon_state = "2-4" }, /obj/structure/rack, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -96922,7 +96922,7 @@ }, /area/maintenance/aft) "dFj" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -96945,7 +96945,7 @@ }, /area/medical/medbay/central) "dFl" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/manifold4w/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/corner{ dir = 4 @@ -97016,7 +97016,7 @@ "dFt" = ( /obj/structure/table/wood, /obj/item/clothing/head/papersack/smiley, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 @@ -97026,7 +97026,7 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/crew_quarters/theatre/abandoned) "dFv" = ( @@ -97046,7 +97046,7 @@ /area/crew_quarters/theatre/abandoned) "dFx" = ( /obj/structure/frame/computer, -/obj/item/weapon/circuitboard/computer/secure_data, +/obj/item/circuitboard/computer/secure_data, /obj/machinery/light/small{ dir = 8 }, @@ -97063,13 +97063,13 @@ /area/security/detectives_office/private_investigators_office) "dFz" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift{ +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ pixel_x = 6 }, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp{ +/obj/item/storage/fancy/cigarettes/cigpack_carp{ pixel_x = -3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/grimy, /area/security/detectives_office/private_investigators_office) "dFA" = ( @@ -97079,11 +97079,11 @@ /area/security/detectives_office/private_investigators_office) "dFB" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/security/detectives_office/private_investigators_office) @@ -97219,7 +97219,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -97313,7 +97313,7 @@ }, /area/science/research) "dGg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral/side{ dir = 5 @@ -97508,7 +97508,7 @@ "dGw" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/closet, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -97857,18 +97857,18 @@ /area/crew_quarters/theatre/abandoned) "dGZ" = ( /obj/structure/table/wood, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/wrench, +/obj/item/storage/secure/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/crew_quarters/theatre/abandoned) "dHa" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/crew_quarters/theatre/abandoned) "dHb" = ( @@ -97876,7 +97876,7 @@ dir = 1; pixel_y = -22 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood{ icon_state = "wood-broken3" }, @@ -97901,15 +97901,15 @@ /area/crew_quarters/theatre/abandoned) "dHf" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/open/floor/plating, /area/crew_quarters/theatre/abandoned) "dHg" = ( @@ -98526,7 +98526,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /obj/machinery/camera{ c_tag = "Science - Break Room"; dir = 8; @@ -98559,7 +98559,7 @@ }, /area/maintenance/port/aft) "dIw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -98621,7 +98621,7 @@ name = "hallway camera" }, /obj/effect/turf_decal/bot, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -98659,14 +98659,14 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/aft) "dIF" = ( /obj/machinery/light/small, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/whitegreen/corner{ dir = 8 @@ -98806,8 +98806,8 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder, +/obj/item/clipboard, +/obj/item/folder, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -98860,7 +98860,7 @@ "dJc" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/blue/side{ dir = 6 }, @@ -98996,20 +98996,20 @@ /obj/structure/table/wood, /obj/effect/decal/cleanable/cobweb, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plating, /area/library/abandoned) "dJu" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plating, /area/library/abandoned) "dJv" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -99029,12 +99029,12 @@ /area/library/abandoned) "dJy" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/black, /area/library/abandoned) "dJz" = ( /obj/structure/table/wood, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -99056,7 +99056,7 @@ /area/library/abandoned) "dJD" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/grimy, /area/library/abandoned) "dJE" = ( @@ -99188,8 +99188,8 @@ /area/science/research) "dJR" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 6 }, @@ -99268,8 +99268,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/blue, /area/security/checkpoint/customs) "dJY" = ( @@ -99376,7 +99376,7 @@ /turf/open/floor/plating, /area/medical/virology) "dKi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 }, @@ -99387,13 +99387,13 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitegreen/side{ dir = 1 }, /area/medical/virology) "dKk" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitegreen/corner{ dir = 4 }, @@ -99406,7 +99406,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 26 @@ -99448,7 +99448,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/whitegreen/corner{ dir = 4 }, @@ -99507,7 +99507,7 @@ /area/library/abandoned) "dKy" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/carpet, /area/library/abandoned) "dKz" = ( @@ -99638,8 +99638,8 @@ pixel_x = 32; pixel_y = -32 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/blue/side{ dir = 5 }, @@ -99878,7 +99878,7 @@ /area/medical/virology) "dLg" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/virologist, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -99926,7 +99926,7 @@ icon_state = "1-2" }, /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, @@ -99991,8 +99991,8 @@ /area/library/abandoned) "dLv" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, +/obj/item/clipboard, +/obj/item/folder/red, /turf/open/floor/carpet, /area/library/abandoned) "dLw" = ( @@ -100264,7 +100264,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /turf/open/floor/plasteel/blue/side, /area/security/checkpoint/customs) "dLR" = ( @@ -100275,7 +100275,7 @@ /area/security/checkpoint/customs) "dLS" = ( /obj/structure/closet/secure_closet/contraband/heads, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/blue/side{ dir = 6 }, @@ -100326,19 +100326,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -100391,7 +100391,7 @@ }, /area/shuttle/escape) "dMa" = ( -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/structure/table/reinforced, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) @@ -100401,18 +100401,18 @@ /area/shuttle/escape) "dMc" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "dMd" = ( -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -100889,7 +100889,7 @@ /turf/open/floor/plating, /area/hallway/secondary/exit/departure_lounge) "dMZ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -100904,7 +100904,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -100916,33 +100916,33 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "dNd" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -101118,14 +101118,14 @@ /turf/open/floor/plasteel/grimy, /area/library/abandoned) "dNy" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood{ icon_state = "wood-broken7" }, /area/library/abandoned) "dNz" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood{ icon_state = "wood-broken" }, @@ -101137,8 +101137,8 @@ /area/library/abandoned) "dNB" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood{ icon_state = "wood-broken2" }, @@ -101180,7 +101180,7 @@ }, /area/chapel/office) "dNH" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ dir = 5 @@ -101278,8 +101278,8 @@ }, /area/shuttle/escape) "dNZ" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -101329,8 +101329,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/vault, /area/medical/virology) "dOg" = ( @@ -101371,7 +101371,7 @@ /area/medical/virology) "dOk" = ( /obj/structure/closet/wardrobe/virology_white, -/obj/item/weapon/storage/backpack/satchel/vir, +/obj/item/storage/backpack/satchel/vir, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -101412,11 +101412,11 @@ /area/maintenance/port/aft) "dOr" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -101436,7 +101436,7 @@ }, /area/chapel/office) "dOt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 4 }, @@ -101451,11 +101451,11 @@ /area/chapel/office) "dOu" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/black, /area/chapel/main) "dOv" = ( @@ -101475,22 +101475,22 @@ /area/chapel/main) "dOw" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, /obj/machinery/status_display{ pixel_y = 32 }, /turf/open/floor/plasteel/black, /area/chapel/main) "dOx" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -101505,7 +101505,7 @@ /turf/open/floor/plasteel/black, /area/chapel/main) "dOz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = 26 @@ -101517,15 +101517,15 @@ /area/chapel/main) "dOA" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell{ +/obj/item/reagent_containers/food/snacks/grown/harebell{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell{ +/obj/item/reagent_containers/food/snacks/grown/harebell{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /obj/machinery/status_display{ pixel_y = 32 }, @@ -101542,7 +101542,7 @@ /area/chapel/main) "dOC" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light_switch{ pixel_y = 24 }, @@ -101674,8 +101674,8 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "dOU" = ( -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -102023,8 +102023,8 @@ pixel_y = 32; receive_ore_updates = 1 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/red, +/obj/item/folder/white, +/obj/item/pen/red, /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, @@ -102055,7 +102055,7 @@ /obj/machinery/status_display{ pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/virology) @@ -102193,8 +102193,8 @@ /area/maintenance/port/aft) "dPY" = ( /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -102294,7 +102294,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -102316,8 +102316,8 @@ /area/hallway/secondary/exit/departure_lounge) "dQn" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -102504,11 +102504,11 @@ /area/library/abandoned) "dQL" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/library/abandoned) "dQM" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/library/abandoned) "dQN" = ( @@ -102570,7 +102570,7 @@ }, /area/chapel/office) "dQT" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Chapel - Port"; dir = 4; @@ -102608,7 +102608,7 @@ }, /area/chapel/main) "dQY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel{ dir = 4; icon_state = "chapel" @@ -102621,7 +102621,7 @@ icon_state = "1-2" }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -102948,8 +102948,8 @@ /area/medical/virology) "dRA" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/library/abandoned) "dRB" = ( @@ -102967,8 +102967,8 @@ /area/library/abandoned) "dRD" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, @@ -103042,7 +103042,7 @@ "dRM" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/sign/nosmoking_2{ pixel_x = -32 }, @@ -103130,7 +103130,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -103142,8 +103142,8 @@ /area/hallway/secondary/exit/departure_lounge) "dRW" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -103197,10 +103197,10 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/book/manual/wiki/infections, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/book/manual/wiki/infections, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner{ pixel_x = -3; pixel_y = 2 }, @@ -103315,7 +103315,7 @@ pixel_y = 22 }, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 26 @@ -103336,14 +103336,14 @@ "dSs" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/wood{ icon_state = "wood-broken5" }, /area/library/abandoned) "dSt" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small, /turf/open/floor/wood{ icon_state = "wood-broken3" @@ -103361,33 +103361,33 @@ "dSv" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/library/abandoned) "dSw" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/wood, /area/library/abandoned) "dSx" = ( /obj/structure/easel, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/machinery/light/small, /turf/open/floor/plating, /area/library/abandoned) "dSy" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/wood, /area/library/abandoned) "dSz" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plating, /area/library/abandoned) "dSA" = ( @@ -103564,14 +103564,14 @@ /area/shuttle/escape) "dSU" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -5 }, @@ -103588,11 +103588,11 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/effect/turf_decal/stripes/corner{ dir = 8 }, @@ -103603,7 +103603,7 @@ /obj/structure/sign/deathsposal{ pixel_y = -32 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -103625,7 +103625,7 @@ /turf/open/floor/plasteel, /area/medical/virology) "dSY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/virology) @@ -103634,7 +103634,7 @@ /obj/machinery/status_display{ pixel_y = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/virology) @@ -103811,8 +103811,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/red, +/obj/item/folder/white, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -103925,12 +103925,12 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -4; pixel_y = 3 }, @@ -103938,7 +103938,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -104068,7 +104068,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 4 }, @@ -104239,7 +104239,7 @@ /area/hallway/secondary/exit/departure_lounge) "dUa" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -104272,8 +104272,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -104282,8 +104282,8 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -104292,7 +104292,7 @@ /obj/structure/sign/nanotrasen{ pixel_y = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -104307,9 +104307,9 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, @@ -104318,11 +104318,11 @@ /area/medical/virology) "dUi" = ( /obj/structure/table, -/obj/item/weapon/storage/box/masks{ +/obj/item/storage/box/masks{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/gloves, +/obj/item/storage/box/gloves, /turf/open/floor/plasteel/whitegreen/corner, /area/medical/virology) "dUj" = ( @@ -104591,7 +104591,7 @@ /area/medical/virology) "dUM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -104632,7 +104632,7 @@ /area/medical/virology) "dUQ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; @@ -104828,7 +104828,7 @@ /area/chapel/main) "dVh" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/chapel/main) @@ -104845,7 +104845,7 @@ name = "departures camera" }, /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -104860,7 +104860,7 @@ /area/hallway/secondary/exit/departure_lounge) "dVl" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -105081,7 +105081,7 @@ "dVE" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -105102,7 +105102,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plating, /area/maintenance/port/aft) "dVI" = ( @@ -105119,8 +105119,8 @@ /area/maintenance/port/aft) "dVJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/machinery/light_switch{ pixel_x = 26 }, @@ -105134,11 +105134,11 @@ /area/maintenance/port/aft) "dVL" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -105195,7 +105195,7 @@ }, /area/chapel/main) "dVS" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light{ dir = 4 }, @@ -105264,7 +105264,7 @@ "dWa" = ( /obj/structure/rack, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/turf_decal/bot, @@ -105303,16 +105303,16 @@ /area/medical/virology) "dWf" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/virology) "dWg" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/red, +/obj/item/folder/white, +/obj/item/pen/red, /obj/effect/turf_decal/delivery, /obj/structure/cable/white{ d1 = 1; @@ -105585,9 +105585,9 @@ /area/shuttle/escape) "dWJ" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/hand_labeler_refill, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -105600,7 +105600,7 @@ "dWL" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -105643,7 +105643,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/device/radio, /obj/item/clothing/mask/breath, /obj/effect/turf_decal/bot, @@ -105914,19 +105914,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -105988,7 +105988,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/device/radio, /obj/item/clothing/mask/breath, /turf/open/floor/plating, @@ -106021,19 +106021,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -106086,10 +106086,10 @@ /area/maintenance/port/aft) "dXu" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/spellbook/oneuse/smoke/lesser, -/obj/item/weapon/nullrod, +/obj/item/spellbook/oneuse/smoke/lesser, +/obj/item/nullrod, /obj/item/organ/heart, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /turf/open/floor/plasteel/grimy, /area/chapel/office) "dXv" = ( @@ -106227,8 +106227,8 @@ /area/security/checkpoint/checkpoint2) "dXI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 5 }, @@ -106240,8 +106240,8 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 1; name = "Security Desk"; @@ -106252,7 +106252,7 @@ /area/security/checkpoint/checkpoint2) "dXK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red/side{ dir = 9 @@ -106341,7 +106341,7 @@ pixel_x = -26; pixel_y = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/red/corner{ @@ -106349,7 +106349,7 @@ }, /area/shuttle/escape) "dXY" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/corner{ @@ -106358,7 +106358,7 @@ /area/shuttle/escape) "dXZ" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/ninja, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -106392,7 +106392,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 @@ -106495,7 +106495,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -106521,7 +106521,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "dYq" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -106557,8 +106557,8 @@ pixel_x = -26; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /turf/open/floor/plasteel/red/side{ dir = 8 @@ -106769,8 +106769,8 @@ /area/shuttle/escape) "dYN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/emergency, +/obj/item/wrench, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 5 @@ -106782,7 +106782,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -106834,7 +106834,7 @@ icon_state = "1-2" }, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -106887,7 +106887,7 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "dYY" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/camera{ c_tag = "Chapel Quarters"; dir = 2; @@ -106949,8 +106949,8 @@ /area/chapel/office) "dZe" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/fourcolor, +/obj/item/folder, +/obj/item/pen/fourcolor, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment{ dir = 8; @@ -106960,7 +106960,7 @@ /area/chapel/office) "dZf" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/ai_status_display{ pixel_x = 32 }, @@ -106987,7 +106987,7 @@ }, /area/security/checkpoint/checkpoint2) "dZi" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel/red/side, /area/security/checkpoint/checkpoint2) "dZj" = ( @@ -107056,8 +107056,8 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/red/side, /area/security/checkpoint/checkpoint2) @@ -107126,7 +107126,7 @@ /area/shuttle/escape) "dZv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "dZw" = ( @@ -107192,7 +107192,7 @@ /area/chapel/office) "dZE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -107263,8 +107263,8 @@ /area/chapel/office) "dZN" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -107282,11 +107282,11 @@ /area/chapel/office) "dZP" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/machinery/light{ dir = 4 }, @@ -107349,7 +107349,7 @@ /area/shuttle/escape) "dZW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -107358,8 +107358,8 @@ /area/shuttle/escape) "dZX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/corner{ dir = 8 }, @@ -107482,26 +107482,26 @@ /area/chapel/office) "eai" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/geranium{ +/obj/item/reagent_containers/food/snacks/grown/poppy/geranium{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy/lily, +/obj/item/reagent_containers/food/snacks/grown/poppy/lily, /turf/open/floor/plasteel/grimy, /area/chapel/office) "eaj" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/grimy, /area/chapel/office) "eak" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/chapel/office) "eal" = ( @@ -107531,8 +107531,8 @@ /area/chapel/office) "eaq" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/requests_console{ department = "Chapel Office"; departmentType = 0; @@ -107573,7 +107573,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/vault{ @@ -107589,7 +107589,7 @@ /area/shuttle/escape) "eaw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -107661,13 +107661,13 @@ /area/shuttle/escape) "eaG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "eaH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "eaI" = ( @@ -107690,16 +107690,16 @@ /area/solar/port/aft) "eaL" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 4 }, /area/shuttle/escape) "eaM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault, /area/shuttle/escape) @@ -107725,13 +107725,13 @@ /area/shuttle/escape) "eaR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "eaS" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -107798,7 +107798,7 @@ /turf/open/space, /area/space) "eaZ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light_switch{ pixel_x = 24; pixel_y = -24 @@ -108070,7 +108070,7 @@ /turf/closed/wall, /area/hydroponics/garden/abandoned) "ecg" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light/small{ dir = 1 }, @@ -108507,7 +108507,7 @@ /area/shuttle/transport) "eez" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -108517,8 +108517,8 @@ /area/maintenance/starboard/fore) "eeA" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 }, @@ -108546,8 +108546,8 @@ /obj/structure/sign/barsign{ pixel_y = 32 }, -/obj/item/weapon/wirerod, -/obj/item/weapon/wrench, +/obj/item/wirerod, +/obj/item/wrench, /obj/item/clothing/under/waiter, /obj/item/clothing/accessory/waistcoat, /obj/structure/sign/poster/contraband/random{ @@ -108557,15 +108557,15 @@ /area/crew_quarters/electronic_marketing_den) "eeF" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/wood, /area/crew_quarters/electronic_marketing_den) "eeG" = ( @@ -108578,15 +108578,15 @@ /area/security/vacantoffice) "eeH" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plasteel/black, /area/crew_quarters/electronic_marketing_den) "eeI" = ( @@ -108652,11 +108652,11 @@ dir = 8; pixel_x = -12 }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/mop, -/obj/item/weapon/mop, +/obj/item/mop, +/obj/item/mop, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -108699,7 +108699,7 @@ /area/engine/atmospherics_engine) "eeX" = ( /obj/structure/table/wood, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -108709,8 +108709,8 @@ /area/crew_quarters/bar/atrium) "eeY" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/structure/sign/poster/random{ pixel_y = 32 }, @@ -108805,7 +108805,7 @@ /area/crew_quarters/abandoned_gambling_den) "efj" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/baguette, +/obj/item/reagent_containers/food/snacks/baguette, /obj/item/toy/crayon/spraycan/mimecan{ charges = 5 }, @@ -108828,7 +108828,7 @@ "efm" = ( /obj/structure/table/wood, /obj/item/clothing/mask/fakemoustache, -/obj/item/weapon/cane, +/obj/item/cane, /obj/structure/sign/poster/random{ pixel_y = -32 }, @@ -108850,7 +108850,7 @@ "efp" = ( /obj/structure/reagent_dispensers/watertank, /obj/structure/window/reinforced, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/nanotrasen_logo{ pixel_x = -32 @@ -108903,7 +108903,7 @@ /area/crew_quarters/kitchen) "efv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 @@ -108973,12 +108973,12 @@ /area/hydroponics) "efB" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/plantbgone, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 16 }, -/obj/item/weapon/watertank, -/obj/item/weapon/grenade/chem_grenade/antiweed, +/obj/item/watertank, +/obj/item/grenade/chem_grenade/antiweed, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/ian{ pixel_y = -32 @@ -109049,7 +109049,7 @@ /area/security/brig) "efH" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/detective, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -109073,7 +109073,7 @@ }, /area/hallway/primary/starboard) "efJ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, @@ -109118,13 +109118,13 @@ /obj/machinery/door/window/southright{ name = "Warden's Desk" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, -/obj/item/weapon/poster/random_official{ +/obj/item/folder/red, +/obj/item/pen, +/obj/item/poster/random_official{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/warden) @@ -109135,11 +109135,11 @@ icon_state = "1-4" }, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/sign/poster/official/enlist{ pixel_y = -32 }, @@ -109157,7 +109157,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/satchel/sec, /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 }, @@ -109181,7 +109181,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "efQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/sign/poster/official/report_crimes{ pixel_y = -32 @@ -109205,7 +109205,7 @@ /area/engine/engineering) "efS" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/structure/sign/poster/official/help_others{ pixel_x = 32 }, @@ -109236,9 +109236,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/crowbar, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -109250,8 +109250,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/random{ @@ -109274,11 +109274,11 @@ dir = 1 }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/effect/turf_decal/delivery, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 @@ -109287,8 +109287,8 @@ /area/maintenance/department/electrical) "efY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/sign/poster/official/science{ pixel_x = -32 }, @@ -109340,7 +109340,7 @@ "egb" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 }, @@ -109357,7 +109357,7 @@ /area/medical/medbay/central) "egd" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/md, /obj/machinery/light/small, /obj/structure/sign/poster/official/ian{ @@ -109369,7 +109369,7 @@ /area/medical/medbay/central) "ege" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/structure/sign/poster/official/help_others{ pixel_x = -32 }, @@ -109396,7 +109396,7 @@ }, /area/medical/medbay/central) "egh" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 @@ -109405,7 +109405,7 @@ /area/crew_quarters/abandoned_gambling_den) "egi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, /obj/structure/sign/poster/official/science{ @@ -109538,7 +109538,7 @@ /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/structure/sign/poster/official/do_not_question{ pixel_x = 32 }, @@ -109547,11 +109547,11 @@ }, /area/security/detectives_office/private_investigators_office) "egv" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -109564,7 +109564,7 @@ /area/science/mixing) "egw" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/structure/sign/poster/official/report_crimes{ pixel_y = 32 }, @@ -109584,7 +109584,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/radio, /obj/structure/sign/poster/official/do_not_question{ pixel_y = -32 @@ -109610,7 +109610,7 @@ "egA" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -109664,7 +109664,7 @@ /area/hallway/secondary/exit/departure_lounge) "egF" = ( /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel, @@ -109688,7 +109688,7 @@ "egH" = ( /obj/effect/turf_decal/delivery, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -109715,7 +109715,7 @@ /area/hallway/secondary/exit/departure_lounge) "egL" = ( /obj/effect/turf_decal/delivery, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -109761,7 +109761,7 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/chaplain, /obj/structure/sign/poster/official/bless_this_spess{ pixel_y = -32 @@ -110020,7 +110020,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/neutral/side{ @@ -110046,7 +110046,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "ehu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /obj/machinery/light{ @@ -110759,7 +110759,7 @@ /turf/open/floor/plating, /area/quartermaster/warehouse) "ejw" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/light_switch{ pixel_x = 22; @@ -110770,7 +110770,7 @@ }, /area/engine/transit_tube) "ejx" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/machinery/light_switch{ pixel_x = -26 }, @@ -110798,7 +110798,7 @@ /turf/open/floor/plasteel/brown, /area/maintenance/disposal) "ejz" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ pixel_y = 23 @@ -110912,7 +110912,7 @@ /area/space) "ejO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -110952,7 +110952,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -111000,7 +111000,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -111095,7 +111095,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -111107,11 +111107,11 @@ /area/space) "ekz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -111423,8 +111423,8 @@ /turf/closed/wall/mineral/plastitanium, /area/space) "elx" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -111689,33 +111689,33 @@ }, /area/space) "emx" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -111753,18 +111753,18 @@ /turf/closed/wall/mineral/plastitanium, /area/space) "emE" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/space) "emF" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -111776,7 +111776,7 @@ }, /area/space) "emG" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -111803,7 +111803,7 @@ }, /area/space) "emI" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -111976,9 +111976,9 @@ /area/space) "ent" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -112063,12 +112063,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -112076,12 +112076,12 @@ /turf/open/floor/plasteel/vault, /area/space) "enM" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -112114,22 +112114,22 @@ }, /area/space) "enT" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -112163,8 +112163,8 @@ /turf/closed/wall/mineral/plastitanium, /area/space) "enZ" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -112242,8 +112242,8 @@ /turf/closed/wall/mineral/plastitanium, /area/space) "eoo" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -112251,14 +112251,14 @@ /area/space) "eop" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/space) "eoq" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 diff --git a/_maps/map_files/MetaStation/MetaStation.dmm b/_maps/map_files/MetaStation/MetaStation.dmm index 65eb81a50ec..27f88af7bd5 100644 --- a/_maps/map_files/MetaStation/MetaStation.dmm +++ b/_maps/map_files/MetaStation/MetaStation.dmm @@ -216,7 +216,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03"; layer = 4.1 }, @@ -238,7 +238,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ layer = 4.1 }, /turf/open/floor/plasteel/floorgrime, @@ -301,7 +301,7 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aaJ" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -354,7 +354,7 @@ /area/engine/atmos) "aaP" = ( /obj/machinery/hydroponics/constructable, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/item/seeds/carrot, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -365,7 +365,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "aaR" = ( @@ -480,8 +480,8 @@ /turf/open/floor/plating, /area/prison/execution_room) "abh" = ( -/obj/item/weapon/soap/nanotrasen, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/soap/nanotrasen, +/obj/item/bikehorn/rubberducky, /obj/machinery/shower{ dir = 4 }, @@ -515,21 +515,21 @@ icon_state = "4-8" }, /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "abk" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/folder, +/obj/item/paper/guides/jobs/hydroponics, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/pen, -/obj/item/weapon/storage/crayons, +/obj/item/pen, +/obj/item/storage/crayons, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -704,10 +704,10 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3; pixel_y = 5 }, @@ -901,7 +901,7 @@ /area/security/prison) "abZ" = ( /obj/structure/table, -/obj/item/weapon/book/manual/chef_recipes{ +/obj/item/book/manual/chef_recipes{ pixel_x = 2; pixel_y = 6 }, @@ -922,7 +922,7 @@ /area/security/prison) "acb" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/security/prison) "acc" = ( @@ -1033,7 +1033,7 @@ /area/security/prison) "acq" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 2; pixel_y = 1 }, @@ -1216,7 +1216,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-13" }, /turf/open/floor/plasteel/floorgrime, @@ -1271,17 +1271,17 @@ /area/security/prison) "acM" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "acN" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_y = 6 }, /turf/open/floor/plasteel/whitered/side{ @@ -1293,15 +1293,15 @@ pixel_y = 32 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = -5; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whitered/side{ dir = 1 }, @@ -1316,8 +1316,8 @@ /area/crew_quarters/fitness/recreation) "acR" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_y = 6 }, /obj/machinery/camera{ @@ -1358,31 +1358,31 @@ /area/solar/port/fore) "acV" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = -4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/bottle/chloralhydrate{ +/obj/item/reagent_containers/glass/bottle/chloralhydrate{ name = "chloral hydrate bottle" }, -/obj/item/weapon/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/glass/bottle/toxin{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine{ +/obj/item/reagent_containers/glass/bottle/morphine{ pixel_x = 5; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/bottle/facid{ +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/facid{ name = "fluorosulfuric acid bottle"; pixel_x = -3; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/syringe{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/machinery/airalarm/all_access{ dir = 4; pixel_x = -24 @@ -1429,15 +1429,15 @@ /area/prison/execution_room) "acW" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, /obj/item/device/taperecorder{ pixel_x = -3 }, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/item/device/assembly/flash/handheld, -/obj/item/weapon/reagent_containers/spray/pepper, +/obj/item/reagent_containers/spray/pepper, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -1820,11 +1820,11 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ +/obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /obj/item/clothing/mask/balaclava, -/obj/item/weapon/reagent_containers/spray/cleaner{ +/obj/item/reagent_containers/spray/cleaner{ pixel_x = 5 }, /turf/open/floor/plasteel/darkred/side{ @@ -1892,8 +1892,8 @@ /area/security/prison) "adP" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 4 }, @@ -1928,8 +1928,8 @@ /area/security/prison) "adT" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/floorgrime, /area/security/prison) @@ -1942,8 +1942,8 @@ /turf/open/floor/plasteel/floorgrime, /area/security/prison) "adV" = ( -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/glass, /turf/open/floor/plasteel/whitered/side{ @@ -2163,13 +2163,13 @@ /area/ai_monitored/security/armory) "aer" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pin = /obj/item/device/firing_pin }, /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/armor/laserproof, /turf/open/floor/plasteel/vault{ dir = 4 @@ -2185,7 +2185,7 @@ name = "3maintenance loot spawner" }, /obj/effect/spawner/lootdrop/armory_contraband{ - loot = list(/obj/item/weapon/gun/ballistic/automatic/pistol = 5, /obj/item/weapon/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/weapon/gun/ballistic/revolver/mateba, /obj/item/weapon/gun/ballistic/automatic/pistol/deagle, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons = 3) + loot = list(/obj/item/gun/ballistic/automatic/pistol = 5, /obj/item/gun/ballistic/shotgun/automatic/combat = 5, /obj/item/gun/ballistic/revolver/mateba, /obj/item/gun/ballistic/automatic/pistol/deagle, /obj/item/storage/box/syndie_kit/throwing_weapons = 3) }, /turf/open/floor/plasteel/vault{ dir = 4 @@ -2196,8 +2196,8 @@ /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, /obj/machinery/keycard_auth{ pixel_x = -26; pixel_y = 23 @@ -2302,18 +2302,18 @@ /turf/open/floor/plasteel/vault, /area/prison/execution_room) "aeI" = ( -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = -4; pixel_y = -1 }, -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = 4; pixel_y = -1 }, -/obj/item/weapon/tank/internals/anesthetic{ +/obj/item/tank/internals/anesthetic{ pixel_x = 2 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/structure/closet/crate{ @@ -2321,7 +2321,7 @@ opened = 1 }, /obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/vault, /area/prison/execution_room) "aeJ" = ( @@ -2685,7 +2685,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -2711,7 +2711,7 @@ pixel_y = 30 }, /obj/machinery/computer/med_data/laptop, -/obj/item/weapon/storage/secure/safe/HoS{ +/obj/item/storage/secure/safe/HoS{ pixel_x = 36; pixel_y = 28 }, @@ -2724,7 +2724,7 @@ /area/crew_quarters/heads/hos) "aff" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ name = "armory safe A"; pixel_x = 6; pixel_y = 28 @@ -2867,20 +2867,20 @@ /area/crew_quarters/fitness/recreation) "afu" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/food/drinks/sillycup{ pixel_x = -5; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/sillycup, -/obj/item/weapon/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/food/drinks/sillycup, +/obj/item/reagent_containers/food/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/food/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/sillycup{ +/obj/item/reagent_containers/food/drinks/sillycup{ pixel_x = 5; pixel_y = 3 }, @@ -2941,7 +2941,7 @@ /turf/open/floor/plating, /area/maintenance/solars/port/fore) "afF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; layer = 4.1 }, @@ -3129,7 +3129,7 @@ /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ name = "armory safe B"; pixel_x = 6; pixel_y = 28 @@ -3151,16 +3151,16 @@ pixel_y = 24 }, /obj/structure/rack, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 6; pixel_y = -2 }, @@ -3184,12 +3184,12 @@ /area/ai_monitored/security/armory) "agb" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -3203,12 +3203,12 @@ /area/ai_monitored/security/armory) "agd" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -3235,11 +3235,11 @@ /area/crew_quarters/heads/hos) "agf" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = -2 }, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/cartridge/detective, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/cartridge/detective, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -3263,16 +3263,16 @@ /area/crew_quarters/heads/hos) "agi" = ( /obj/structure/table/wood, -/obj/item/weapon/stamp/hos, +/obj/item/stamp/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "agj" = ( -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -3295,7 +3295,7 @@ /area/crew_quarters/heads/hos) "agl" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -3492,10 +3492,10 @@ /area/maintenance/solars/port/fore) "agE" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, @@ -3503,7 +3503,7 @@ /area/security/prison) "agF" = ( /obj/structure/rack, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/structure/cable/yellow{ d1 = 1; @@ -3514,12 +3514,12 @@ /area/security/prison) "agG" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/pen, -/obj/item/weapon/storage/box/prisoner, +/obj/item/pen, +/obj/item/storage/box/prisoner, /turf/open/floor/plasteel/vault, /area/security/prison) "agH" = ( @@ -3586,7 +3586,7 @@ /area/security/prison) "agP" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -3610,9 +3610,9 @@ pixel_x = -22 }, /obj/structure/rack, -/obj/item/weapon/storage/fancy/donut_box, -/obj/item/weapon/gun/energy/e_gun/dragnet, -/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/storage/fancy/donut_box, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /turf/open/floor/plasteel/vault{ dir = 1 }, @@ -3626,29 +3626,29 @@ "agT" = ( /obj/structure/rack, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, /turf/open/floor/plasteel/vault{ dir = 1 }, /area/ai_monitored/security/armory) "agU" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -3945,10 +3945,10 @@ icon_state = "2-4" }, /obj/structure/rack, -/obj/item/weapon/storage/box/flashes{ +/obj/item/storage/box/flashes{ pixel_x = 3 }, -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = 1; pixel_y = -2 }, @@ -3999,12 +3999,12 @@ /area/ai_monitored/security/armory) "ahI" = ( /obj/structure/rack, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -4125,7 +4125,7 @@ /turf/open/floor/plating, /area/maintenance/fore) "ahR" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/fore) "ahS" = ( @@ -4136,7 +4136,7 @@ "ahU" = ( /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/structure/table, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) @@ -4269,7 +4269,7 @@ /turf/open/floor/plating, /area/maintenance/disposal) "aij" = ( -/obj/item/weapon/vending_refill/coffee, +/obj/item/vending_refill/coffee, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -4422,7 +4422,7 @@ /obj/structure/closet{ name = "Evidence Closet 1" }, -/obj/item/weapon/storage/backpack{ +/obj/item/storage/backpack{ name = "Evidence Bag 1" }, /obj/effect/spawner/lootdrop/maintenance{ @@ -4444,7 +4444,7 @@ dir = 2; network = list("SS13") }, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ name = "evidence safe"; pixel_x = 6; pixel_y = 28 @@ -4455,7 +4455,7 @@ /area/security/warden) "aiz" = ( /obj/structure/closet/secure_closet/evidence, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ name = "Secure Evidence Briefcase"; pixel_x = 3; pixel_y = -3 @@ -4621,7 +4621,7 @@ /area/maintenance/fore) "aiP" = ( /obj/structure/table, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/plating, /area/maintenance/fore) "aiQ" = ( @@ -4777,21 +4777,21 @@ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine, -/obj/item/weapon/storage/secure/safe{ +/obj/item/reagent_containers/syringe/epinephrine, +/obj/item/storage/secure/safe{ pixel_x = 6; pixel_y = 28 }, -/obj/item/weapon/restraints/handcuffs/cable/pink, +/obj/item/restraints/handcuffs/cable/pink, /turf/open/floor/plating, /area/maintenance/port/fore) "ajl" = ( -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/storage/secure/safe{ +/obj/item/soap/deluxe, +/obj/item/storage/secure/safe{ pixel_x = 6; pixel_y = 28 }, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /obj/structure/closet/crate, /obj/item/clothing/suit/xenos, /obj/item/clothing/suit/monkeysuit, @@ -4835,7 +4835,7 @@ /obj/structure/closet{ name = "Evidence Closet 2" }, -/obj/item/weapon/storage/backpack{ +/obj/item/storage/backpack{ name = "Evidence Bag 2" }, /obj/machinery/airalarm{ @@ -4869,7 +4869,7 @@ /obj/structure/closet{ name = "Evidence Closet 5" }, -/obj/item/weapon/storage/backpack{ +/obj/item/storage/backpack{ name = "Evidence Bag 5" }, /obj/effect/spawner/lootdrop/maintenance{ @@ -5078,7 +5078,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "ajT" = ( @@ -5113,8 +5113,8 @@ /area/crew_quarters/fitness/recreation) "ajX" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/holodeck/disclaimer, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/paper/fluff/holodeck/disclaimer, +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, @@ -5300,23 +5300,23 @@ layer = 2.9 }, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/mop, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/mop, +/obj/item/bikehorn/rubberducky, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" }, -/obj/item/weapon/grenade/empgrenade, +/obj/item/grenade/empgrenade, /turf/open/floor/plating, /area/maintenance/port/fore) "akq" = ( -/obj/item/weapon/vending_refill/cola, +/obj/item/vending_refill/cola, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/port/fore) "akr" = ( -/obj/item/weapon/vending_refill/snack, +/obj/item/vending_refill/snack, /turf/open/floor/plating, /area/maintenance/port/fore) "aks" = ( @@ -5333,7 +5333,7 @@ pixel_x = 5; pixel_y = -2 }, -/obj/item/weapon/dice/d8, +/obj/item/dice/d8, /obj/item/device/healthanalyzer, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -5342,7 +5342,7 @@ /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/whitered/side{ dir = 9 }, @@ -5358,10 +5358,10 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, @@ -5385,11 +5385,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/whitered/side{ dir = 5 }, @@ -5441,7 +5441,7 @@ /obj/structure/closet{ name = "Evidence Closet 4" }, -/obj/item/weapon/storage/backpack{ +/obj/item/storage/backpack{ name = "Evidence Bag 4" }, /obj/effect/spawner/lootdrop/maintenance{ @@ -5744,11 +5744,11 @@ /obj/structure/rack{ pixel_y = 2 }, -/obj/item/weapon/gun/energy/laser/practice{ +/obj/item/gun/energy/laser/practice{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/gun/energy/laser/practice{ +/obj/item/gun/energy/laser/practice{ pixel_x = -3; pixel_y = 3 }, @@ -5811,11 +5811,11 @@ /area/crew_quarters/fitness/recreation) "alh" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/neutral/corner{ dir = 4 }, @@ -6059,11 +6059,11 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, -/obj/item/weapon/bucket_sensor, +/obj/item/bucket_sensor, /turf/open/floor/plating, /area/maintenance/port/fore) "alI" = ( -/obj/item/weapon/grown/log, +/obj/item/grown/log, /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -6075,11 +6075,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/disk/data, -/obj/item/weapon/grenade/flashbang, +/obj/item/storage/secure/briefcase, +/obj/item/disk/data, +/obj/item/grenade/flashbang, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/grenade/smokebomb, +/obj/item/grenade/smokebomb, /turf/open/floor/plating, /area/maintenance/port/fore) "alK" = ( @@ -6091,10 +6091,10 @@ /area/maintenance/port/fore) "alM" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/syringe, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -6552,7 +6552,7 @@ /area/security/range) "amt" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/fore) @@ -6743,7 +6743,7 @@ /area/maintenance/disposal) "amS" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -6769,8 +6769,8 @@ /area/maintenance/port) "amW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /obj/machinery/door/window/westleft{ base_state = "right"; dir = 2; @@ -6778,7 +6778,7 @@ name = "windoor"; req_access_txt = "0" }, -/obj/item/weapon/book/manual/wiki/engineering_hacking, +/obj/item/book/manual/wiki/engineering_hacking, /obj/item/device/tape/random, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -6786,14 +6786,14 @@ "amX" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/stock_parts/cell/crap, +/obj/item/stock_parts/cell/crap, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) "amY" = ( /obj/structure/table/reinforced, /obj/structure/window/reinforced, -/obj/item/weapon/electronics/firealarm, +/obj/item/electronics/firealarm, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -6894,10 +6894,10 @@ /area/security/brig) "ank" = ( /obj/structure/table, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/storage/box/evidence, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/item/storage/box/evidence, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 6 }, @@ -6916,13 +6916,13 @@ /area/security/warden) "ann" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/storage/box/trackimp, -/obj/item/weapon/storage/lockbox/loyalty, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, +/obj/item/storage/box/trackimp, +/obj/item/storage/lockbox/loyalty, +/obj/item/reagent_containers/glass/bottle/morphine, /obj/machinery/light/small, /obj/machinery/firealarm{ dir = 8; @@ -6933,8 +6933,8 @@ /area/security/warden) "ano" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -2; pixel_y = -2 }, @@ -6954,11 +6954,11 @@ /area/security/warden) "anq" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/firingpins{ +/obj/item/storage/box/firingpins{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/security/warden) @@ -7011,10 +7011,10 @@ /area/security/main) "anx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = -2; pixel_y = 3 }, @@ -7022,7 +7022,7 @@ /area/security/main) "any" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/plasteel, /area/security/main) "anA" = ( @@ -7032,7 +7032,7 @@ /area/security/main) "anB" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -7285,7 +7285,7 @@ dir = 4 }, /obj/machinery/portable_atmospherics/canister/air, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /turf/open/floor/plating, /area/maintenance/port/fore) "aoj" = ( @@ -7391,7 +7391,7 @@ /area/security/brig) "aop" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -7413,7 +7413,7 @@ dir = 4 }, /obj/structure/rack, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/device/healthanalyzer{ pixel_y = -2 }, @@ -7536,7 +7536,7 @@ pixel_x = 28 }, /obj/structure/closet/secure_closet/warden, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "aoz" = ( @@ -7565,7 +7565,7 @@ /area/security/main) "aoC" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/radio/off, /turf/open/floor/plasteel, /area/security/main) @@ -7597,8 +7597,8 @@ /area/security/main) "aoH" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -7853,10 +7853,10 @@ /area/maintenance/starboard) "apd" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ @@ -7880,7 +7880,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/belt{ +/obj/item/storage/belt{ desc = "Can hold quite a lot of stuff."; name = "multi-belt" }, @@ -7901,7 +7901,7 @@ "apg" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/beer{ desc = "Takes you to a whole new level of thinking."; name = "Meta-Cider" }, @@ -8076,11 +8076,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = 1; pixel_y = -1 }, @@ -8096,7 +8096,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "apz" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/port) "apA" = ( @@ -8143,7 +8143,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "apD" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/flashlight{ pixel_x = 1; pixel_y = 5 @@ -8235,15 +8235,15 @@ network = list("SS13") }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/wirecutters{ +/obj/item/wirecutters{ pixel_y = 2 }, /turf/open/floor/plasteel/showroomfloor, @@ -8293,21 +8293,21 @@ /area/security/main) "apS" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/folder/red, +/obj/item/storage/fancy/cigarettes, /obj/item/clothing/mask/gas/sechailer, /turf/open/floor/plasteel, /area/security/main) "apT" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel, /area/security/main) "apU" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/folder/red, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel, /area/security/main) "apV" = ( @@ -8316,15 +8316,15 @@ /area/security/main) "apW" = ( /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel, /area/security/main) "apY" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/folder/red, +/obj/item/pen, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel, /area/security/main) "apZ" = ( @@ -8454,7 +8454,7 @@ /turf/closed/wall, /area/crew_quarters/fitness/recreation) "aqq" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard) "aqr" = ( @@ -8679,7 +8679,7 @@ "aqL" = ( /obj/structure/rack, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -8707,11 +8707,11 @@ /area/maintenance/port) "aqP" = ( /obj/structure/light_construct/small, -/obj/item/weapon/toolbox_tiles_sensor, +/obj/item/toolbox_tiles_sensor, /turf/open/floor/plating, /area/maintenance/port/fore) "aqQ" = ( -/obj/item/weapon/vending_refill/cigarette, +/obj/item/vending_refill/cigarette, /turf/open/floor/plating, /area/maintenance/port/fore) "aqR" = ( @@ -8750,12 +8750,12 @@ /area/maintenance/port/fore) "aqV" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/maintenance/port/fore) "aqW" = ( /obj/structure/closet/crate, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/bodybag, /obj/item/device/radio, /obj/effect/spawner/lootdrop/maintenance{ @@ -8766,7 +8766,7 @@ /area/maintenance/port/fore) "aqX" = ( /obj/structure/chair, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/effect/decal/remains/human, /obj/item/clothing/under/soviet, /obj/effect/decal/cleanable/blood/old, @@ -9009,12 +9009,12 @@ /turf/open/floor/plasteel/grimy, /area/security/main) "arx" = ( -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -9078,7 +9078,7 @@ /area/crew_quarters/dorms) "arG" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -9089,7 +9089,7 @@ /area/maintenance/starboard/fore) "arH" = ( /obj/structure/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -9119,12 +9119,12 @@ /area/maintenance/starboard/fore) "arM" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering_guide{ pixel_x = 3; pixel_y = 4 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/starboard/fore) "arN" = ( @@ -9475,12 +9475,12 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, -/obj/item/weapon/razor{ +/obj/item/storage/box/prisoner, +/obj/item/razor{ pixel_x = -6 }, -/obj/item/weapon/paper/guides/jobs/security/labor_camp, -/obj/item/weapon/pen, +/obj/item/paper/guides/jobs/security/labor_camp, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/security/brig) "aso" = ( @@ -9537,10 +9537,10 @@ /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -9548,11 +9548,11 @@ /area/security/warden) "ast" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, @@ -9663,8 +9663,8 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/item/clothing/head/cone{ pixel_x = -4; pixel_y = 4 @@ -9851,7 +9851,7 @@ /turf/open/floor/plasteel/grimy, /area/security/main) "asO" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -9915,7 +9915,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/wood, /area/crew_quarters/dorms) "asU" = ( @@ -9928,7 +9928,7 @@ /area/crew_quarters/dorms) "asV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "Cabin3"; name = "Cabin Bolt Control"; @@ -9996,7 +9996,7 @@ }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/carpet, /area/crew_quarters/dorms) "atb" = ( @@ -10057,10 +10057,10 @@ icon_state = "1-8" }, /obj/structure/table, -/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ +/obj/item/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/gravity_generator) @@ -10625,7 +10625,7 @@ /area/crew_quarters/dorms) "auo" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /obj/effect/landmark/blobstart, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -10665,7 +10665,7 @@ /area/maintenance/fore) "aus" = ( /obj/structure/closet, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aut" = ( @@ -10918,8 +10918,8 @@ /area/shuttle/labor) "auT" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) "auU" = ( @@ -11009,7 +11009,7 @@ name = "Brig Control Desk"; req_access_txt = "3" }, -/obj/item/weapon/paper, +/obj/item/paper, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ @@ -11171,7 +11171,7 @@ /turf/closed/wall, /area/crew_quarters/dorms) "avq" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -11917,12 +11917,12 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plating, /area/maintenance/fore) "awB" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/fore) "awC" = ( @@ -11948,7 +11948,7 @@ /area/crew_quarters/dorms) "awE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "Cabin2"; name = "Cabin Bolt Control"; @@ -11976,7 +11976,7 @@ /area/crew_quarters/dorms) "awG" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "Cabin5"; name = "Dorm Bolt Control"; @@ -11993,7 +11993,7 @@ pixel_y = 32 }, /obj/structure/table/wood, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/wood, /area/crew_quarters/dorms) "awI" = ( @@ -12083,7 +12083,7 @@ /area/maintenance/port/fore) "awS" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /turf/open/floor/plating, /area/maintenance/port/fore) "awT" = ( @@ -12418,7 +12418,7 @@ /area/security/brig) "axz" = ( /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/taperecorder, /obj/item/device/radio/intercom{ anyai = 1; @@ -12521,7 +12521,7 @@ /turf/open/floor/wood, /area/crew_quarters/dorms) "axL" = ( -/obj/item/weapon/caution, +/obj/item/caution, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -12718,8 +12718,8 @@ /area/engine/engineering) "ayc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath{ pixel_x = 4 }, @@ -12836,7 +12836,7 @@ /area/security/nuke_storage) "ays" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -13134,7 +13134,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "ayR" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/starboard/fore) "ayS" = ( @@ -13208,7 +13208,7 @@ /turf/open/space, /area/space) "aze" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/cobweb/cobweb2, @@ -13228,7 +13228,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/mining) "azj" = ( -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -13270,7 +13270,7 @@ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -13319,11 +13319,11 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/brown{ dir = 5 }, @@ -13359,7 +13359,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard/fore) "azs" = ( @@ -13582,11 +13582,11 @@ /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, /obj/item/clothing/shoes/sneakers/orange, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "azQ" = ( @@ -13632,7 +13632,7 @@ /area/security/detectives_office) "azT" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes, +/obj/item/storage/fancy/cigarettes, /obj/item/clothing/glasses/sunglasses, /obj/structure/cable/yellow{ d1 = 1; @@ -13664,14 +13664,14 @@ /area/security/detectives_office) "azV" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /obj/item/device/flashlight/lamp/green{ pixel_x = 1; pixel_y = 5 }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/machinery/button/door{ id = "detective_shutters"; name = "detective's office shutters control"; @@ -13736,7 +13736,7 @@ /area/crew_quarters/toilet/restrooms) "aAb" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aAc" = ( @@ -14148,7 +14148,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -14187,23 +14187,23 @@ }, /area/security/nuke_storage) "aAT" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -14273,7 +14273,7 @@ /area/hallway/primary/fore) "aAY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /turf/open/floor/plasteel/floorgrime, /area/security/brig) "aAZ" = ( @@ -14394,8 +14394,8 @@ /area/security/detectives_office) "aBn" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/hand_labeler, +/obj/item/folder/red, +/obj/item/hand_labeler, /turf/open/floor/carpet, /area/security/detectives_office) "aBo" = ( @@ -14579,7 +14579,7 @@ /area/maintenance/starboard/fore) "aBD" = ( /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; layer = 4.1; pixel_y = 3 @@ -14712,8 +14712,8 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "aBS" = ( -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/silver, +/obj/item/ore/silver, +/obj/item/ore/silver, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -14772,7 +14772,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aBZ" = ( @@ -14796,7 +14796,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/open/floor/plasteel/floorgrime, /area/quartermaster/warehouse) "aCc" = ( @@ -14804,8 +14804,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/stock_parts/cell{ +/obj/item/electronics/apc, +/obj/item/stock_parts/cell{ maxcharge = 2000 }, /obj/machinery/firealarm{ @@ -14859,22 +14859,22 @@ /area/security/nuke_storage) "aCh" = ( /obj/structure/safe, -/obj/item/weapon/storage/secure/briefcase{ - contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/weapon/gun/ballistic/automatic/pistol,/obj/item/weapon/suppressor,/obj/item/weapon/melee/classic_baton/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/weapon/soap/nanotrasen) +/obj/item/storage/secure/briefcase{ + contents = newlist(/obj/item/clothing/suit/armor/vest,/obj/item/gun/ballistic/automatic/pistol,/obj/item/suppressor,/obj/item/melee/classic_baton/telescopic,/obj/item/clothing/mask/balaclava,/obj/item/bodybag,/obj/item/soap/nanotrasen) }, -/obj/item/weapon/storage/backpack/duffelbag/syndie/hitman, -/obj/item/weapon/card/id/silver{ +/obj/item/storage/backpack/duffelbag/syndie/hitman, +/obj/item/card/id/silver{ access = list(12); assignment = "Reaper"; name = "Thirteen's ID Card (Reaper)"; registered_name = "Thirteen" }, -/obj/item/weapon/lazarus_injector, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/lazarus_injector, +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/ballistic/revolver/russian, /obj/item/ammo_box/a357, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/book{ +/obj/item/book{ desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes" @@ -15040,7 +15040,7 @@ /obj/item/device/taperecorder{ pixel_x = 3 }, -/obj/item/weapon/storage/box/evidence, +/obj/item/storage/box/evidence, /obj/item/device/flashlight/seclite, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -15073,11 +15073,11 @@ /area/security/detectives_office) "aCv" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/carpet, /area/security/detectives_office) "aCw" = ( @@ -15188,7 +15188,7 @@ /area/crew_quarters/dorms) "aCJ" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "Cabin6"; name = "Dorm Bolt Control"; @@ -15347,7 +15347,7 @@ /area/construction/mining/aux_base) "aDc" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -15679,7 +15679,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/camera/detective, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) @@ -15737,11 +15737,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = 2; pixel_y = -2 }, @@ -15877,12 +15877,12 @@ /area/crew_quarters/dorms) "aDZ" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aEa" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aEb" = ( @@ -16772,8 +16772,8 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/cult{ dir = 2 @@ -16781,8 +16781,8 @@ /area/library) "aFF" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/requests_console{ department = "Mining"; departmentType = 0; @@ -16794,7 +16794,7 @@ /area/quartermaster/miningoffice) "aFG" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -16806,10 +16806,10 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ pixel_x = 5 }, -/obj/item/weapon/shovel{ +/obj/item/shovel{ pixel_x = -5 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -17224,10 +17224,10 @@ /area/security/brig) "aGr" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, @@ -17238,16 +17238,16 @@ network = list("Prison"); pixel_y = -30 }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/black, /area/security/brig) "aGs" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -17481,8 +17481,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -17510,9 +17510,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/crowbar, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -17527,8 +17527,8 @@ pixel_y = -7 }, /obj/item/stack/cable_coil, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/clothing/ears/earmuffs{ pixel_x = -3; pixel_y = -2 @@ -17540,8 +17540,8 @@ /obj/effect/turf_decal/bot{ dir = 1 }, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel{ dir = 1 }, @@ -17563,9 +17563,9 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, -/obj/item/weapon/circuitboard/computer/solar_control, -/obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/circuitboard/computer/solar_control, +/obj/item/electronics/tracker, +/obj/item/paper/guides/jobs/engi/solars, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -18024,7 +18024,7 @@ specialfunctions = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/atmospherics/components/unary/vent_scrubber/on{ dir = 8 }, @@ -18042,12 +18042,12 @@ pixel_x = 29; pixel_y = 1 }, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/wood, /area/crew_quarters/dorms) "aHV" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -18085,8 +18085,8 @@ /obj/item/clothing/gloves/color/yellow, /obj/item/clothing/suit/hazardvest, /obj/item/clothing/suit/hazardvest, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/turf_decal/delivery, /obj/structure/table, /obj/effect/turf_decal/stripes/line{ @@ -18514,8 +18514,8 @@ /area/hallway/primary/fore) "aIE" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/machinery/newscaster/security_unit{ pixel_y = -30 }, @@ -18529,7 +18529,7 @@ "aIF" = ( /obj/machinery/light/small, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -18602,8 +18602,8 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /turf/open/floor/plasteel, /area/security/courtroom) "aIM" = ( @@ -18687,9 +18687,9 @@ /area/lawoffice) "aIV" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/pen/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/pen/red, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; name = "Prison Monitor"; @@ -18703,11 +18703,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = 2; pixel_y = -2 }, @@ -18724,7 +18724,7 @@ name = "Law Office APC"; pixel_y = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -18866,7 +18866,7 @@ /area/engine/engineering) "aJn" = ( /obj/structure/table, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/engine/engineering) @@ -18882,9 +18882,9 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/weapon/pipe_dispenser, -/obj/item/weapon/pipe_dispenser, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, +/obj/item/pipe_dispenser, /turf/open/floor/plasteel, /area/engine/engineering) "aJu" = ( @@ -19125,15 +19125,15 @@ /area/security/courtroom) "aKa" = ( /obj/structure/table/wood, -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, /area/security/courtroom) "aKb" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -19176,11 +19176,11 @@ /area/lawoffice) "aKg" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/law, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/stamp/law, /turf/open/floor/wood, /area/lawoffice) "aKh" = ( @@ -19270,13 +19270,13 @@ }, /area/crew_quarters/dorms) "aKp" = ( -/obj/item/weapon/reagent_containers/spray/plantbgone, -/obj/item/weapon/reagent_containers/spray/pestspray{ +/obj/item/reagent_containers/spray/plantbgone, +/obj/item/reagent_containers/spray/pestspray{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ pixel_x = 2; pixel_y = 1 }, @@ -19297,14 +19297,14 @@ /area/hydroponics/garden) "aKr" = ( /obj/structure/table, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, -/obj/item/weapon/crowbar, +/obj/item/cultivator, +/obj/item/hatchet, +/obj/item/crowbar, /obj/machinery/light{ dir = 1 }, /obj/item/device/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hydroponics/garden) @@ -19349,8 +19349,8 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/wirecutters, -/obj/item/weapon/weldingtool, +/obj/item/wirecutters, +/obj/item/weldingtool, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/fore) @@ -19496,8 +19496,8 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, -/obj/item/weapon/ore/glass, -/obj/item/weapon/ore/iron, +/obj/item/ore/glass, +/obj/item/ore/iron, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -19645,10 +19645,10 @@ pixel_x = 3; pixel_y = 5 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -19659,7 +19659,7 @@ "aLj" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -19679,7 +19679,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aLl" = ( @@ -19748,7 +19748,7 @@ c_tag = "AI Upload Chamber - Fore"; network = list("SS13","RD","AIUpload") }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-07"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -19830,9 +19830,9 @@ /area/lawoffice) "aLE" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, /obj/item/clothing/glasses/sunglasses/big, /turf/open/floor/wood, /area/lawoffice) @@ -19866,7 +19866,7 @@ /area/crew_quarters/locker) "aLJ" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -20177,7 +20177,7 @@ network = list("SS13") }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -20220,8 +20220,8 @@ /area/storage/primary) "aMG" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/freeformcore, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -20230,8 +20230,8 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/corp, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/corp, +/obj/item/aiModule/core/full/custom, /obj/machinery/flasher{ pixel_y = 24; id = "AI" @@ -20255,11 +20255,11 @@ pixel_y = 24; id = "AI" }, -/obj/item/weapon/aiModule/core/full/antimov, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/supplied/protectStation, -/obj/item/weapon/aiModule/zeroth/oneHuman, -/obj/item/weapon/aiModule/reset/purge, +/obj/item/aiModule/core/full/antimov, +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/supplied/protectStation, +/obj/item/aiModule/zeroth/oneHuman, +/obj/item/aiModule/reset/purge, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai_upload) "aMJ" = ( @@ -20293,7 +20293,7 @@ /area/security/courtroom) "aMM" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, @@ -20305,7 +20305,7 @@ /area/security/courtroom) "aMO" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -20552,9 +20552,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -20567,7 +20567,7 @@ "aNq" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -20631,7 +20631,7 @@ /obj/structure/closet{ name = "Evidence Closet 3" }, -/obj/item/weapon/storage/backpack{ +/obj/item/storage/backpack{ name = "Evidence Bag 3" }, /obj/effect/spawner/lootdrop/maintenance{ @@ -20868,7 +20868,7 @@ pixel_y = -4 }, /obj/item/device/assembly/igniter, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /turf/open/floor/plasteel/brown{ @@ -20959,7 +20959,7 @@ /area/security/courtroom) "aOh" = ( /obj/structure/table/wood, -/obj/item/weapon/paper, +/obj/item/paper, /turf/open/floor/plasteel/neutral/side{ dir = 10 }, @@ -21000,7 +21000,7 @@ /area/security/courtroom) "aOn" = ( /obj/item/device/taperecorder, -/obj/item/weapon/cartridge/lawyer, +/obj/item/cartridge/lawyer, /obj/structure/table/wood, /obj/machinery/button/door{ id = "lawyer_shutters"; @@ -21011,11 +21011,11 @@ /turf/open/floor/wood, /area/lawoffice) "aOo" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, /turf/open/floor/wood, @@ -21047,8 +21047,8 @@ pixel_x = -24 }, /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/folder, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -21424,7 +21424,7 @@ /obj/item/device/radio/intercom{ pixel_x = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -26 }, /obj/machinery/light/small{ @@ -21549,12 +21549,12 @@ /area/quartermaster/qm) "aPk" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/requests_console{ department = "Cargo Bay"; departmentType = 2; @@ -21593,8 +21593,8 @@ /area/storage/primary) "aPo" = ( /obj/structure/table, -/obj/item/weapon/weldingtool, -/obj/item/weapon/crowbar, +/obj/item/weldingtool, +/obj/item/crowbar, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, @@ -21606,7 +21606,7 @@ /area/storage/primary) "aPp" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -21620,7 +21620,7 @@ /area/storage/primary) "aPr" = ( /obj/structure/table, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/flashlight{ pixel_x = 1; pixel_y = 5 @@ -21659,7 +21659,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai_upload) "aPu" = ( @@ -21701,7 +21701,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/ai_upload) "aPy" = ( @@ -21795,11 +21795,11 @@ /area/lawoffice) "aPH" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light/small{ dir = 8 }, @@ -21812,7 +21812,7 @@ /area/crew_quarters/locker) "aPI" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel, /area/crew_quarters/locker) "aPJ" = ( @@ -21836,11 +21836,11 @@ /area/crew_quarters/locker) "aPM" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 4; pixel_y = -4 }, @@ -21989,8 +21989,8 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/engineering) "aQd" = ( @@ -22103,7 +22103,7 @@ dir = 8; network = list("SS13") }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -22136,19 +22136,19 @@ /area/quartermaster/qm) "aQt" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/status_display{ density = 0; pixel_x = 32; supply_display = 1 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster, +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, @@ -22170,7 +22170,7 @@ /area/storage/primary) "aQv" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -22181,9 +22181,9 @@ /area/storage/primary) "aQw" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/brown/corner{ dir = 1 }, @@ -22207,7 +22207,7 @@ /area/storage/primary) "aQz" = ( /obj/structure/table, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/light{ dir = 8 }, @@ -22336,7 +22336,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03"; layer = 4.1 }, @@ -22510,7 +22510,7 @@ /area/crew_quarters/locker) "aQX" = ( /obj/structure/table, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -22612,7 +22612,7 @@ icon_state = "1-2" }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard/fore) "aRj" = ( @@ -22837,10 +22837,10 @@ pixel_x = 27 }, /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/paper, -/obj/item/weapon/paper, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/paper, +/obj/item/paper, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -22880,7 +22880,7 @@ /area/quartermaster/qm) "aRN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -23046,8 +23046,8 @@ /area/crew_quarters/locker) "aSi" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase, +/obj/item/storage/briefcase{ pixel_x = 4; pixel_y = -2 }, @@ -23057,13 +23057,13 @@ /area/crew_quarters/locker) "aSj" = ( /obj/structure/table, -/obj/item/weapon/cultivator, -/obj/item/weapon/hatchet, +/obj/item/cultivator, +/obj/item/hatchet, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/paper/guides/jobs/hydroponics, -/obj/item/weapon/coin/silver, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/coin/silver, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -23071,10 +23071,10 @@ /area/hydroponics/garden) "aSk" = ( /obj/structure/table, -/obj/item/weapon/hatchet, -/obj/item/weapon/cultivator, -/obj/item/weapon/crowbar, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/hatchet, +/obj/item/cultivator, +/obj/item/crowbar, +/obj/item/reagent_containers/glass/bucket, /obj/item/device/plant_analyzer, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -23083,16 +23083,16 @@ /area/hydroponics/garden) "aSl" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/chili, -/obj/item/weapon/reagent_containers/food/snacks/grown/cherries, -/obj/item/weapon/reagent_containers/food/snacks/grown/soybeans, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/cherries, +/obj/item/reagent_containers/food/snacks/grown/soybeans, +/obj/item/reagent_containers/food/snacks/grown/citrus/lime, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -23110,7 +23110,7 @@ /turf/open/floor/plasteel, /area/hydroponics/garden) "aSn" = ( -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/structure/table, /obj/machinery/light, /obj/item/device/plant_analyzer, @@ -23120,11 +23120,11 @@ /turf/open/floor/plasteel, /area/hydroponics/garden) "aSo" = ( -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_construction{ pixel_y = 3 }, /obj/structure/closet/crate, @@ -23336,10 +23336,10 @@ /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/wallframe/camera, @@ -23369,7 +23369,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/pipe_dispenser, +/obj/item/pipe_dispenser, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -23384,7 +23384,7 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/yellow/side{ dir = 6 }, @@ -24158,7 +24158,7 @@ }, /area/security/checkpoint/supply) "aUl" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -24185,12 +24185,12 @@ /area/security/checkpoint/supply) "aUo" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/brown{ dir = 2 }, @@ -24219,7 +24219,7 @@ /area/storage/primary) "aUs" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 @@ -24427,7 +24427,7 @@ icon_state = "0-4" }, /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/black, /area/security/courtroom) "aUH" = ( @@ -24454,7 +24454,7 @@ /area/security/courtroom) "aUJ" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -24462,11 +24462,11 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -24741,7 +24741,7 @@ /turf/open/floor/plating, /area/hallway/secondary/entry) "aVt" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-13"; layer = 4.1 }, @@ -24905,7 +24905,7 @@ /area/quartermaster/storage) "aVH" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/quartermaster/storage) @@ -25069,7 +25069,7 @@ /obj/machinery/airalarm{ pixel_y = 23 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; layer = 4.1 }, @@ -25162,7 +25162,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -25635,11 +25635,11 @@ }, /area/security/checkpoint/supply) "aXo" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -25652,7 +25652,7 @@ /turf/open/floor/plasteel/red/side, /area/security/checkpoint/supply) "aXp" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -26187,7 +26187,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -26201,21 +26201,21 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/pandemic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/destructive_analyzer, -/obj/item/weapon/circuitboard/machine/protolathe, -/obj/item/weapon/circuitboard/computer/aifixer, -/obj/item/weapon/circuitboard/computer/teleporter, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, -/obj/item/weapon/circuitboard/machine/mechfab, +/obj/item/circuitboard/machine/destructive_analyzer, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/computer/aifixer, +/obj/item/circuitboard/computer/teleporter, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/mechfab, /turf/open/floor/plasteel/black, /area/storage/tech) "aYk" = ( @@ -26223,12 +26223,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/mining, -/obj/item/weapon/circuitboard/machine/autolathe{ +/obj/item/circuitboard/computer/mining, +/obj/item/circuitboard/machine/autolathe{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/computer/arcade/battle, +/obj/item/circuitboard/computer/arcade/battle, /obj/machinery/ai_status_display{ pixel_y = 31 }, @@ -26236,12 +26236,12 @@ /area/storage/tech) "aYl" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/server, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/computer/message_monitor{ +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/server, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/computer/message_monitor{ pixel_y = -5 }, /turf/open/floor/plasteel/black, @@ -26272,7 +26272,7 @@ "aYn" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /turf/open/floor/plasteel/black, /area/storage/tech) "aYo" = ( @@ -26292,7 +26292,7 @@ }, /area/crew_quarters/heads/chief) "aYq" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 6; pixel_y = 30 }, @@ -26430,7 +26430,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "aYF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1 }, @@ -26950,7 +26950,7 @@ pixel_y = 3 }, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -26994,25 +26994,25 @@ /area/crew_quarters/heads/chief) "aZE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/ce, -/obj/item/weapon/reagent_containers/pill/patch/silver_sulf, +/obj/item/folder/yellow, +/obj/item/stamp/ce, +/obj/item/reagent_containers/pill/patch/silver_sulf, /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/heads/chief) "aZF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper/monitorkey, +/obj/item/clipboard, +/obj/item/paper/monitorkey, /turf/open/floor/plasteel/neutral/side, /area/crew_quarters/heads/chief) "aZG" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel/neutral/corner{ dir = 8 }, @@ -27099,11 +27099,11 @@ /area/security/checkpoint/engineering) "aZN" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/newscaster/security_unit{ pixel_x = 30 }, @@ -27464,9 +27464,9 @@ }, /obj/structure/cable/yellow, /obj/machinery/light, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/screwdriver{ +/obj/item/hand_labeler, +/obj/item/hand_labeler, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -27525,11 +27525,11 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "baw" = ( -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -27545,7 +27545,7 @@ departmentType = 2; pixel_y = 30 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/brown{ dir = 9 }, @@ -27579,7 +27579,7 @@ supply_display = 1 }, /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /turf/open/floor/plasteel/brown{ dir = 1 }, @@ -27605,7 +27605,7 @@ pixel_y = 23 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -27952,7 +27952,7 @@ /area/maintenance/starboard/fore) "bbi" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -27977,11 +27977,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/aiupload{ +/obj/item/circuitboard/computer/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -28018,14 +28018,14 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning, -/obj/item/weapon/circuitboard/computer/med_data{ +/obj/item/circuitboard/computer/cloning, +/obj/item/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod, -/obj/item/weapon/circuitboard/computer/scan_consolenew, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/computer/scan_consolenew, /turf/open/floor/plasteel/black, /area/storage/tech) "bbo" = ( @@ -28036,15 +28036,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/powermonitor{ +/obj/item/circuitboard/computer/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/stationalert{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -28063,8 +28063,8 @@ /area/storage/tech) "bbr" = ( /obj/structure/table, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/black, /area/storage/tech) "bbs" = ( @@ -28088,19 +28088,19 @@ }, /area/crew_quarters/heads/chief) "bbt" = ( -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 3 }, /obj/structure/table/reinforced, -/obj/item/weapon/cartridge/atmos, +/obj/item/cartridge/atmos, /turf/open/floor/plasteel/neutral/side{ dir = 4 }, @@ -28123,11 +28123,11 @@ /area/crew_quarters/heads/chief) "bbw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/neutral/side{ dir = 8 }, @@ -28196,7 +28196,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "bbB" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -28219,7 +28219,7 @@ /area/security/checkpoint/engineering) "bbD" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/light{ dir = 4 }, @@ -28313,7 +28313,7 @@ /area/maintenance/port) "bbM" = ( /obj/item/stack/sheet/cardboard, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/port/fore) "bbN" = ( @@ -28402,11 +28402,11 @@ name = "Cargo Desk"; req_access_txt = "50" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel, /area/quartermaster/office) "bbW" = ( @@ -28588,15 +28588,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/card{ +/obj/item/circuitboard/computer/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = 5; pixel_y = -5 }, @@ -28663,10 +28663,10 @@ /area/storage/tech) "bcD" = ( /obj/structure/table, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/multitool, /turf/open/floor/plasteel/vault{ dir = 8 @@ -28861,7 +28861,7 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -29216,8 +29216,8 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bdJ" = ( @@ -29258,7 +29258,7 @@ pixel_x = 28 }, /obj/structure/dresser, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 6; pixel_y = 28 }, @@ -29290,7 +29290,7 @@ /area/hallway/primary/central) "bdR" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light_switch{ pixel_x = -26 }, @@ -29306,7 +29306,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/yellow/side{ dir = 2 @@ -29319,8 +29319,8 @@ /area/storage/tools) "bdU" = ( /obj/structure/rack, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plasteel/yellow/side{ @@ -29354,11 +29354,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/mecha_control{ +/obj/item/circuitboard/computer/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -29399,7 +29399,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -29429,7 +29429,7 @@ dir = 8; pixel_x = 24 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -29464,7 +29464,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/item/clothing/mask/cigarette/cigar, /obj/machinery/computer/security/telescreen{ dir = 1; @@ -29481,7 +29481,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/item/clothing/glasses/meson, /obj/machinery/button/door{ id = "ceprivacy"; @@ -29710,7 +29710,7 @@ /area/aisat) "beB" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, @@ -29781,8 +29781,8 @@ "beL" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, +/obj/item/folder/red, +/obj/item/folder/red, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -30010,15 +30010,15 @@ }, /area/hallway/primary/central) "bfj" = ( -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, /obj/structure/table, /obj/machinery/requests_console{ department = "Janitorial"; departmentType = 1; pixel_x = -29 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/machinery/camera{ c_tag = "Custodial Closet"; dir = 4; @@ -30259,7 +30259,7 @@ /area/crew_quarters/heads/captain/private) "bfD" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/effect/landmark/start/captain, /obj/machinery/camera{ c_tag = "Captain's Quarters"; @@ -30534,7 +30534,7 @@ /area/aisat) "bgh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -30571,11 +30571,11 @@ /area/ai_monitored/turret_protected/ai) "bgm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -30645,7 +30645,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/flash/handheld, /obj/item/device/radio, /turf/open/floor/plasteel/red/side{ @@ -30656,11 +30656,11 @@ /turf/open/floor/plasteel/red/side, /area/security/checkpoint/customs) "bgy" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table/reinforced, /obj/structure/cable/yellow{ d1 = 1; @@ -30670,7 +30670,7 @@ /turf/open/floor/plasteel/red/side, /area/security/checkpoint/customs) "bgz" = ( -/obj/item/weapon/paper, +/obj/item/paper, /obj/structure/table/reinforced, /obj/machinery/door/window/brigdoor{ dir = 2; @@ -31030,8 +31030,8 @@ }, /obj/structure/table, /obj/item/clothing/gloves/color/orange, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/structure/cable/yellow{ d2 = 4; icon_state = "0-4" @@ -31066,8 +31066,8 @@ dir = 4; pixel_x = 11 }, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /obj/structure/disposalpipe/segment, /obj/machinery/firealarm{ dir = 4; @@ -31130,7 +31130,7 @@ layer = 4; pixel_y = 32 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = 4 }, /obj/machinery/camera{ @@ -31172,7 +31172,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -1; pixel_y = 4 }, @@ -31221,7 +31221,7 @@ /area/bridge) "bht" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album{ +/obj/item/storage/photo_album{ pixel_y = -4 }, /obj/item/device/camera{ @@ -31243,12 +31243,12 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_x = -4; pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/weapon/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bhv" = ( @@ -31499,11 +31499,11 @@ /turf/closed/wall/r_wall, /area/engine/break_room) "bhU" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -31515,14 +31515,14 @@ }, /area/engine/break_room) "bhV" = ( -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/book/manual/wiki/engineering_construction{ +/obj/item/book/manual/wiki/engineering_construction{ pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide{ +/obj/item/book/manual/wiki/engineering_guide{ pixel_x = -4 }, /obj/structure/table/glass, @@ -31531,8 +31531,8 @@ }, /area/engine/break_room) "bhW" = ( -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/light{ dir = 1 }, @@ -31540,7 +31540,7 @@ pixel_y = 32 }, /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_y = 8 }, /turf/open/floor/plasteel/yellow/side{ @@ -31652,7 +31652,7 @@ /obj/item/device/radio/intercom{ pixel_y = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -31697,10 +31697,10 @@ /area/aisat) "bim" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_y = 2 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light/small{ dir = 8 }, @@ -31755,10 +31755,10 @@ /area/ai_monitored/turret_protected/ai) "bis" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_y = 2 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light/small{ dir = 4 }, @@ -31902,11 +31902,11 @@ /area/quartermaster/sorting) "biK" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/multitool, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/brown{ dir = 8 }, @@ -31973,11 +31973,11 @@ /area/hallway/primary/port) "biS" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/open/floor/plasteel/floorgrime, /area/janitor) "biT" = ( @@ -32006,7 +32006,7 @@ /turf/open/floor/plasteel/floorgrime, /area/janitor) "biW" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/central) @@ -32029,7 +32029,7 @@ /turf/open/floor/plating, /area/bridge) "biZ" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -32084,7 +32084,7 @@ /turf/open/floor/plasteel/black, /area/bridge) "bjf" = ( -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, /obj/structure/cable/yellow{ @@ -32096,7 +32096,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_y = 3 }, /turf/open/floor/plasteel/darkred/side{ @@ -32118,11 +32118,11 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bji" = ( @@ -32696,8 +32696,8 @@ /area/quartermaster/sorting) "bkh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen{ +/obj/item/folder/yellow, +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -32778,7 +32778,7 @@ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/cable/yellow{ d1 = 1; d2 = 4; @@ -32789,15 +32789,15 @@ }, /area/quartermaster/sorting) "bkm" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/power/apc{ cell_type = 2500; dir = 4; @@ -32907,9 +32907,9 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /obj/item/stack/packageWrap{ pixel_x = 2; pixel_y = -3 @@ -32922,7 +32922,7 @@ pixel_x = 2; pixel_y = -3 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/brown{ dir = 2 }, @@ -32959,11 +32959,11 @@ /area/crew_quarters/heads/hop) "bkA" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /turf/open/floor/plating, /area/maintenance/central) "bkB" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/maintenance/central) "bkC" = ( @@ -32993,7 +32993,7 @@ }, /area/bridge) "bkE" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, @@ -33025,7 +33025,7 @@ /obj/machinery/recharger{ pixel_y = 3 }, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ pixel_y = 3 }, /obj/structure/table/glass, @@ -33069,7 +33069,7 @@ /area/bridge) "bkJ" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 }, @@ -33909,7 +33909,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /obj/machinery/computer/security/telescreen{ desc = "Used for watching Prison Wing holding areas."; @@ -33921,7 +33921,7 @@ /area/crew_quarters/heads/hop) "bmq" = ( /obj/machinery/recharger, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 34 }, /obj/structure/table/wood, @@ -34361,11 +34361,11 @@ /obj/item/device/lightreplacer{ pixel_y = 7 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /turf/open/floor/plasteel, /area/engine/break_room) "bne" = ( -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko{ +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko{ pixel_y = 4 }, /obj/structure/table/glass, @@ -34396,7 +34396,7 @@ /area/engine/break_room) "bnh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -34781,7 +34781,7 @@ /area/hallway/primary/port) "bnQ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/grimy, /area/hallway/primary/port) "bnR" = ( @@ -35011,7 +35011,7 @@ /turf/open/floor/plating, /area/crew_quarters/heads/hop) "bom" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; @@ -35079,7 +35079,7 @@ dir = 8 }, /obj/machinery/recharger, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/structure/table/glass, /turf/open/floor/plasteel/black, /area/bridge) @@ -35100,10 +35100,10 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_y = 2 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_y = 2 }, /turf/open/floor/plasteel/black, @@ -35147,7 +35147,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/table/glass, /turf/open/floor/plasteel/black, /area/bridge) @@ -35202,8 +35202,8 @@ /area/crew_quarters/heads/captain/private) "boI" = ( /obj/structure/rack, -/obj/item/weapon/cane, -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom, +/obj/item/cane, +/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom, /turf/open/floor/plating, /area/crew_quarters/heads/captain/private) "boJ" = ( @@ -35242,7 +35242,7 @@ /area/storage/art) "boM" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -35287,7 +35287,7 @@ /obj/structure/table/wood, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/gun/ballistic/revolver/doublebarrel, /obj/machinery/camera{ c_tag = "Bar - Backroom"; dir = 2; @@ -35333,7 +35333,7 @@ }, /area/crew_quarters/bar) "boV" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) @@ -36257,11 +36257,11 @@ }, /area/hallway/primary/central) "bqB" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/window/reinforced, /obj/structure/table/wood, /turf/open/floor/wood, @@ -36335,7 +36335,7 @@ pixel_y = -24 }, /obj/structure/rack, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/item/clothing/mask/cigarette/cigar, /turf/open/floor/plasteel/darkblue/side{ dir = 1 @@ -36363,7 +36363,7 @@ pixel_y = 4 }, /obj/structure/table/glass, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -36382,7 +36382,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -36407,12 +36407,12 @@ "bqQ" = ( /obj/machinery/light, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ pixel_x = -2; pixel_y = -3 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/multitool, /obj/machinery/newscaster{ pixel_y = -30 @@ -36450,11 +36450,11 @@ /obj/structure/fireaxecabinet{ pixel_y = -32 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 7 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_y = 3 }, /obj/machinery/light_switch{ @@ -36465,7 +36465,7 @@ /area/bridge) "bqV" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/power/apc{ dir = 8; name = "Captain's Quarters APC"; @@ -36478,9 +36478,9 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/paper/fluff/gateway, -/obj/item/weapon/coin/plasma, -/obj/item/weapon/melee/chainofcommand, +/obj/item/paper/fluff/gateway, +/obj/item/coin/plasma, +/obj/item/melee/chainofcommand, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "bqW" = ( @@ -36493,7 +36493,7 @@ /area/crew_quarters/heads/captain/private) "bqX" = ( /obj/structure/table/wood, -/obj/item/weapon/stamp/captain, +/obj/item/stamp/captain, /obj/machinery/computer/security/wooden_tv, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -36577,7 +36577,7 @@ /area/storage/art) "brf" = ( /obj/structure/table, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -36588,7 +36588,7 @@ /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/vending_refill/cigarette, +/obj/item/vending_refill/cigarette, /turf/open/floor/wood, /area/crew_quarters/bar) "brh" = ( @@ -36741,7 +36741,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plating, /area/maintenance/starboard) @@ -36856,7 +36856,7 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/structure/table/glass, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -36991,11 +36991,11 @@ icon_state = "4-8" }, /obj/structure/table/glass, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -37265,11 +37265,11 @@ dir = 9 }, /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/multitool, /turf/open/floor/plasteel/black, /area/ai_monitored/storage/satellite) @@ -37724,11 +37724,11 @@ /obj/machinery/light_switch{ pixel_x = -28 }, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "btd" = ( @@ -37745,17 +37745,17 @@ /area/crew_quarters/heads/captain/private) "bte" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/window/reinforced, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "btf" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/door/window{ base_state = "right"; icon_state = "right"; @@ -37764,12 +37764,12 @@ }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/disposalpipe/segment, -/obj/item/weapon/stamp/captain, +/obj/item/stamp/captain, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "btg" = ( /obj/structure/table/wood, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/structure/window/reinforced, /obj/item/device/radio/intercom{ dir = 0; @@ -37851,15 +37851,15 @@ /area/hallway/primary/central) "btl" = ( /obj/structure/table, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/nineteenXnineteen, -/obj/item/weapon/canvas/nineteenXnineteen, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel, /area/storage/art) "btm" = ( @@ -37895,7 +37895,7 @@ icon_state = "pipe-c" }, /obj/structure/closet/gmcloset, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -37928,7 +37928,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "btt" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -37937,14 +37937,14 @@ }, /area/maintenance/starboard) "btu" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) "btv" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard) "btw" = ( @@ -38049,11 +38049,11 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_y = 3 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/computer/security/telescreen{ dir = 1; name = "MiniSat Monitor"; @@ -38138,7 +38138,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "btR" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1 }, @@ -38168,7 +38168,7 @@ /turf/open/floor/plasteel, /area/hallway/secondary/entry) "btU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-08"; layer = 4.1 }, @@ -38181,7 +38181,7 @@ /turf/open/floor/plasteel/grimy, /area/hallway/primary/port) "btW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03"; layer = 4.1 }, @@ -38858,8 +38858,8 @@ /area/engine/break_room) "bvo" = ( /obj/structure/table/glass, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/device/flashlight{ pixel_x = 1; pixel_y = 5 @@ -38887,7 +38887,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/item/clothing/mask/breath{ @@ -38920,7 +38920,7 @@ /obj/item/device/radio/off{ pixel_y = 4 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /turf/open/floor/plasteel/grimy, @@ -38991,18 +38991,18 @@ pixel_y = 30 }, /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bvB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; layer = 4.1 }, @@ -39269,8 +39269,8 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /turf/open/floor/plasteel/cult{ dir = 2 }, @@ -39292,7 +39292,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "bwj" = ( -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /obj/structure/cable/yellow{ d1 = 1; @@ -39361,11 +39361,11 @@ /area/crew_quarters/heads/hop) "bwp" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/stamp/hop{ +/obj/item/stamp/hop{ pixel_x = -4; pixel_y = 4 }, @@ -39400,7 +39400,7 @@ /area/bridge) "bwt" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_y = 3 }, /obj/item/device/radio/intercom{ @@ -39439,7 +39439,7 @@ /area/bridge) "bww" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/machinery/firealarm{ pixel_y = 28 }, @@ -39447,11 +39447,11 @@ /area/bridge) "bwx" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light_switch{ pixel_x = 28 }, @@ -39486,7 +39486,7 @@ "bwA" = ( /obj/machinery/vending/cigarette{ pixel_y = 2; - products = list(/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/lighter/greyscale = 4, /obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) }, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) @@ -39520,7 +39520,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bwE" = ( @@ -39644,11 +39644,11 @@ receive_ore_updates = 1 }, /obj/structure/table, -/obj/item/weapon/book/manual/barman_recipes{ +/obj/item/book/manual/barman_recipes{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag{ +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag{ pixel_y = 5 }, /turf/open/floor/plasteel/bar, @@ -40225,7 +40225,7 @@ /turf/open/floor/plating, /area/crew_quarters/toilet/auxiliary) "bxS" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/power/apc{ cell_type = 5000; dir = 2; @@ -40454,7 +40454,7 @@ /area/crew_quarters/heads/captain/private) "byr" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "bys" = ( @@ -40689,15 +40689,15 @@ name = "Station Intercom (General)"; pixel_x = -30 }, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/machinery/airalarm{ pixel_y = 23 }, /obj/structure/table, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, /turf/open/floor/plasteel/caution{ dir = 9 }, @@ -40712,11 +40712,11 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/caution{ dir = 1 }, @@ -40751,11 +40751,11 @@ /obj/structure/sign/atmosplaque{ pixel_y = 32 }, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -41239,11 +41239,11 @@ /area/hallway/secondary/command) "bzQ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/secondary/command) @@ -41291,7 +41291,7 @@ /area/bridge) "bzV" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -41299,13 +41299,13 @@ /area/bridge) "bzW" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/lighter, +/obj/item/folder/blue, +/obj/item/lighter, /turf/open/floor/carpet, /area/bridge) "bzX" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/carpet, /area/bridge) "bzY" = ( @@ -41400,7 +41400,7 @@ /area/maintenance/central) "bAi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -31 }, @@ -41419,7 +41419,7 @@ /area/crew_quarters/bar) "bAl" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_y = 5 }, /turf/open/floor/plasteel/bar, @@ -41431,10 +41431,10 @@ /area/crew_quarters/bar) "bAn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plasteel/bar, @@ -41460,7 +41460,7 @@ "bAq" = ( /obj/structure/table/wood/poker, /obj/effect/spawner/lootdrop{ - loot = list(/obj/item/weapon/gun/ballistic/revolver/russian = 5, /obj/item/weapon/storage/box/syndie_kit/throwing_weapons, /obj/item/toy/cards/deck/syndicate = 2); + loot = list(/obj/item/gun/ballistic/revolver/russian = 5, /obj/item/storage/box/syndie_kit/throwing_weapons, /obj/item/toy/cards/deck/syndicate = 2); name = "gambling valuables spawner" }, /turf/open/floor/wood, @@ -41565,7 +41565,7 @@ /obj/item/clothing/mask/breath{ pixel_x = 4 }, -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -8 }, /obj/structure/table, @@ -41615,8 +41615,8 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /turf/open/floor/plasteel/caution{ dir = 8 }, @@ -41723,20 +41723,20 @@ /area/tcommsat/computer) "bAV" = ( /obj/machinery/light/small, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/structure/table/wood, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bAW" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/machinery/status_display{ density = 0; layer = 4; pixel_y = 31 }, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bAX" = ( @@ -41761,12 +41761,12 @@ network = list("SS13") }, /obj/structure/table/wood, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/storage/box/PDAs{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/silver_ids, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/silver_ids, +/obj/item/storage/box/ids, /obj/machinery/light, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -41782,7 +41782,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -41824,7 +41824,7 @@ pixel_x = -28 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/folder, +/obj/item/folder, /turf/open/floor/wood, /area/security/vacantoffice) "bBg" = ( @@ -41948,7 +41948,7 @@ /turf/open/floor/wood, /area/library) "bBx" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/wood, @@ -42325,7 +42325,7 @@ pixel_x = 24 }, /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, /turf/open/floor/wood, /area/crew_quarters/theatre) "bCe" = ( @@ -42361,9 +42361,9 @@ name = "Atmospherics Desk"; req_access_txt = "24" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/firedoor, /obj/machinery/door/poddoor{ density = 0; @@ -42438,7 +42438,7 @@ /area/engine/atmos) "bCn" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/t_scanner, /obj/item/device/t_scanner, /obj/item/device/t_scanner, @@ -42621,7 +42621,7 @@ /turf/open/floor/plating, /area/maintenance/port) "bCJ" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -42700,8 +42700,8 @@ /area/library) "bCU" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/blue{ +/obj/item/folder, +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -43387,7 +43387,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/port) "bEp" = ( @@ -43408,7 +43408,7 @@ /turf/open/floor/wood, /area/security/vacantoffice) "bEs" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -44176,7 +44176,7 @@ dir = 10 }, /obj/structure/table/wood/poker, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/wood, /area/crew_quarters/bar) "bFt" = ( @@ -44601,7 +44601,7 @@ req_access_txt = "0"; specialfunctions = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/floorgrime, /area/crew_quarters/toilet/auxiliary) "bGm" = ( @@ -45042,8 +45042,8 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bHm" = ( -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/caution/corner{ @@ -45259,7 +45259,7 @@ }, /area/maintenance/port) "bHK" = ( -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -3; pixel_y = 5 }, @@ -45273,7 +45273,7 @@ /turf/open/floor/carpet, /area/security/vacantoffice) "bHM" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -45349,7 +45349,7 @@ /area/library) "bHV" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -45422,7 +45422,7 @@ /area/ai_monitored/storage/eva) "bIe" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/item/device/radio/beacon, /obj/machinery/airalarm{ dir = 4; @@ -45435,7 +45435,7 @@ "bIf" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -45469,8 +45469,8 @@ opened = 0 }, /obj/item/stack/cable_coil, -/obj/item/weapon/crowbar, -/obj/item/weapon/screwdriver{ +/obj/item/crowbar, +/obj/item/screwdriver{ pixel_y = 16 }, /obj/machinery/power/apc{ @@ -45598,7 +45598,7 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight, /obj/machinery/power/apc{ cell_type = 5000; @@ -45754,7 +45754,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/yellow/side{ @@ -45962,7 +45962,7 @@ /turf/open/floor/circuit/telecomms/mainframe, /area/tcommsat/server) "bJh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -45970,15 +45970,15 @@ /area/tcommsat/computer) "bJi" = ( /obj/machinery/light/small, -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /obj/machinery/camera{ c_tag = "Telecomms - Control Room"; dir = 1; network = list("SS13","tcomm") }, /obj/structure/table/wood, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/tcommsat/computer) "bJj" = ( @@ -46092,7 +46092,7 @@ /turf/open/floor/wood, /area/security/vacantoffice) "bJv" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/table/wood, /turf/open/floor/carpet, /area/security/vacantoffice) @@ -46169,8 +46169,8 @@ /area/ai_monitored/storage/eva) "bJF" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/off, @@ -46207,7 +46207,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -46248,7 +46248,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight, /obj/structure/window/reinforced, /obj/structure/cable/yellow{ @@ -46389,13 +46389,13 @@ /area/gateway) "bJW" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/structure/cable/yellow{ d1 = 4; d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, @@ -46494,7 +46494,7 @@ name = "Serving Hatch" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -46510,10 +46510,10 @@ id = "kitchen"; name = "Serving Hatch" }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /turf/open/floor/plasteel/cafeteria{ @@ -46527,7 +46527,7 @@ id = "kitchen"; name = "Serving Hatch" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -46744,13 +46744,13 @@ /area/tcommsat/server) "bKM" = ( /obj/structure/table/glass, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_y = 2 }, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_y = 2 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/circuit/green/telecomms/mainframe, /area/tcommsat/server) "bKN" = ( @@ -46797,7 +46797,7 @@ /turf/open/floor/plasteel/black, /area/aisat) "bKS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-06"; level = 4.1 }, @@ -46957,8 +46957,8 @@ /area/library) "bLl" = ( /obj/structure/table/wood, -/obj/item/weapon/pen/red, -/obj/item/weapon/pen/blue{ +/obj/item/pen/red, +/obj/item/pen/blue{ pixel_x = 5; pixel_y = 5 }, @@ -46978,11 +46978,11 @@ amount = 50 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -47167,7 +47167,7 @@ /area/gateway) "bLB" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /obj/effect/turf_decal/bot{ dir = 1 }, @@ -47207,7 +47207,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/landmark/blobstart, /turf/open/floor/plating, /area/maintenance/central) @@ -47346,8 +47346,8 @@ /area/bridge) "bLU" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 1 }, @@ -47370,9 +47370,9 @@ /area/storage/tcom) "bLW" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /obj/machinery/light_switch{ pixel_y = 26 }, @@ -47678,7 +47678,7 @@ icon_state = "map-right-MS"; pixel_y = -32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03"; layer = 4.1 }, @@ -47692,7 +47692,7 @@ /area/security/vacantoffice) "bMD" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, @@ -47702,12 +47702,12 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade{ +/obj/item/lipstick/black, +/obj/item/lipstick/jade{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lipstick/purple{ +/obj/item/lipstick/purple{ pixel_x = -2; pixel_y = -2 }, @@ -47727,7 +47727,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/rack_parts, +/obj/item/rack_parts, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) @@ -47780,8 +47780,8 @@ /turf/open/floor/wood, /area/library) "bMM" = ( -/obj/item/weapon/folder, -/obj/item/weapon/folder, +/obj/item/folder, +/obj/item/folder, /obj/machinery/camera/autoname{ dir = 1; network = list("SS13") @@ -47810,8 +47810,8 @@ /area/crew_quarters/bar) "bMQ" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /turf/open/floor/wood, /area/library) "bMR" = ( @@ -47961,8 +47961,8 @@ /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bNd" = ( -/obj/item/weapon/tank/internals/air, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/machinery/light/small{ @@ -47972,12 +47972,12 @@ /area/maintenance/port) "bNe" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -48020,8 +48020,8 @@ /area/bridge/showroom/corporate) "bNh" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /obj/machinery/newscaster{ pixel_x = 30; pixel_y = 2 @@ -48195,7 +48195,7 @@ /area/crew_quarters/kitchen) "bNw" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/chef_recipes{ +/obj/item/book/manual/chef_recipes{ pixel_x = 2; pixel_y = 6 }, @@ -48203,7 +48203,7 @@ dir = 4 }, /obj/item/stack/packageWrap, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -48298,7 +48298,7 @@ /turf/open/floor/wood, /area/crew_quarters/theatre) "bNK" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -48311,11 +48311,11 @@ /area/security/vacantoffice) "bNL" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, /obj/machinery/light/small{ dir = 8 }, @@ -48343,9 +48343,9 @@ /area/storage/tcom) "bNN" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, /obj/machinery/light/small{ dir = 4 }, @@ -48407,7 +48407,7 @@ name = "Port Mix to East Ports"; on = 0 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel, /area/engine/atmos) "bNV" = ( @@ -48505,7 +48505,7 @@ /area/maintenance/port) "bOg" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -48585,9 +48585,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = -1 }, @@ -48634,12 +48634,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 4; pixel_y = -1 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 }, @@ -48787,7 +48787,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/light/small{ dir = 4 }, @@ -48800,8 +48800,8 @@ }, /obj/item/stack/medical/ointment, /obj/item/stack/medical/bruise_pack, -/obj/item/weapon/reagent_containers/syringe/charcoal, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/charcoal, +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -1; pixel_y = 2 }, @@ -48902,7 +48902,7 @@ "bOT" = ( /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -48964,12 +48964,12 @@ /obj/structure/mirror{ pixel_x = -28 }, -/obj/item/weapon/lipstick/black, -/obj/item/weapon/lipstick/jade{ +/obj/item/lipstick/black, +/obj/item/lipstick/jade{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lipstick/purple{ +/obj/item/lipstick/purple{ pixel_x = -2; pixel_y = -2 }, @@ -49035,26 +49035,26 @@ /area/maintenance/starboard) "bPh" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /turf/open/floor/plasteel/black, /area/storage/tcom) "bPi" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, -/obj/item/weapon/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, +/obj/item/stock_parts/micro_laser/high, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -49063,11 +49063,11 @@ /area/storage/tcom) "bPj" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, /turf/open/floor/plasteel/black, /area/storage/tcom) "bPk" = ( @@ -49238,7 +49238,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating{ icon_state = "platingdmg2" }, @@ -49291,7 +49291,7 @@ /area/maintenance/port) "bPL" = ( /obj/structure/rack, -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/maintenance/port) "bPM" = ( @@ -49312,11 +49312,11 @@ /area/maintenance/port) "bPO" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/wood, /area/library) @@ -49361,8 +49361,8 @@ /area/library) "bPU" = ( /obj/structure/table/wood, -/obj/item/weapon/dice/d20, -/obj/item/weapon/dice, +/obj/item/dice/d20, +/obj/item/dice, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/wood, /area/library) @@ -49373,7 +49373,7 @@ }, /obj/item/clothing/under/suit_jacket/red, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /turf/open/floor/engine/cult, /area/library) "bPW" = ( @@ -49404,11 +49404,11 @@ "bPZ" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -49506,7 +49506,7 @@ /area/bridge/showroom/corporate) "bQj" = ( /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/crap, +/obj/item/stock_parts/cell/crap, /obj/structure/table/wood, /turf/open/floor/carpet, /area/bridge/showroom/corporate) @@ -49832,7 +49832,7 @@ /area/crew_quarters/toilet/auxiliary) "bQQ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/starboard) "bQR" = ( @@ -49975,11 +49975,11 @@ /area/library) "bRl" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen/invisible, +/obj/item/pen/invisible, /turf/open/floor/engine/cult, /area/library) "bRm" = ( @@ -50060,7 +50060,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/item/clothing/head/collectable/HoP{ name = "novelty HoP hat" }, @@ -50071,7 +50071,7 @@ /area/bridge/showroom/corporate) "bRx" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ desc = "A large briefcase with a digital locking system, and the Nanotrasen logo emblazoned on the sides."; name = "Nanotrasen-brand secure briefcase exhibit"; pixel_y = 2 @@ -50142,7 +50142,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -2; pixel_y = 3 }, @@ -50199,16 +50199,16 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/disk/data{ +/obj/item/disk/data{ pixel_x = 9; pixel_y = -1 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ name = "technology disk"; pixel_x = -2; pixel_y = -3 }, -/obj/item/weapon/disk/design_disk{ +/obj/item/disk/design_disk{ name = "component design disk"; pixel_y = 6 }, @@ -50220,7 +50220,7 @@ /turf/open/floor/carpet, /area/bridge/showroom/corporate) "bRG" = ( -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ name = "space law"; pixel_y = 2 }, @@ -50232,7 +50232,7 @@ /obj/item/toy/gun{ name = "cap gun" }, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ name = "handcuffs" }, /obj/structure/table/wood, @@ -50250,7 +50250,7 @@ /area/bridge/showroom/corporate) "bRH" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -50275,7 +50275,7 @@ "bRJ" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -50287,7 +50287,7 @@ }, /area/gateway) "bRK" = ( -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/off, @@ -50351,7 +50351,7 @@ /area/hallway/primary/central) "bRP" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/snacks/mint, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -50368,10 +50368,10 @@ /area/crew_quarters/kitchen) "bRQ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, /turf/open/floor/plasteel/cafeteria{ @@ -50381,7 +50381,7 @@ "bRR" = ( /obj/structure/table, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/button/door{ id = "kitchenhydro"; name = "Service Shutter Control"; @@ -50394,16 +50394,16 @@ /area/crew_quarters/kitchen) "bRS" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3 }, /obj/item/device/radio/intercom{ pixel_y = -25 }, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /obj/machinery/camera{ c_tag = "Kitchen"; dir = 1; @@ -50569,7 +50569,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bSf" = ( -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -50611,7 +50611,7 @@ dir = 4 }, /obj/machinery/meter, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/engine/atmos) "bSj" = ( @@ -50791,14 +50791,14 @@ /area/library) "bSz" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/wood, /area/library) "bSA" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/wood, /area/library) "bSB" = ( @@ -50969,7 +50969,7 @@ }, /obj/machinery/door/firedoor, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/paper, +/obj/item/paper, /obj/machinery/door/window/eastleft{ dir = 2; name = "Hydroponics Window"; @@ -51220,7 +51220,7 @@ /turf/closed/wall, /area/maintenance/aft) "bTt" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/maintenance/port) "bTu" = ( @@ -51236,7 +51236,7 @@ /area/maintenance/port) "bTv" = ( /obj/structure/rack, -/obj/item/weapon/paper, +/obj/item/paper, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) @@ -51268,7 +51268,7 @@ dir = 1; network = list("SS13") }, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/structure/table/wood, /turf/open/floor/wood, /area/library) @@ -51625,11 +51625,11 @@ /area/hallway/primary/central) "bUd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/green, /area/hallway/primary/central) "bUe" = ( @@ -51662,8 +51662,8 @@ /turf/open/floor/plasteel, /area/hydroponics) "bUi" = ( -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -51701,7 +51701,7 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "bUn" = ( @@ -51710,16 +51710,16 @@ }, /obj/effect/turf_decal/stripes/line, /obj/structure/reagent_dispensers/watertank/high, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "bUo" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/cultivator, -/obj/item/weapon/wirecutters, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/cultivator, +/obj/item/wirecutters, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/hydroponics) @@ -51730,9 +51730,9 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/rack_parts, -/obj/item/weapon/rack_parts, -/obj/item/weapon/wrench, +/obj/item/rack_parts, +/obj/item/rack_parts, +/obj/item/wrench, /obj/structure/window/reinforced{ dir = 4 }, @@ -51911,7 +51911,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bUE" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, @@ -52015,7 +52015,7 @@ /turf/open/floor/plating, /area/maintenance/solars/port/aft) "bUQ" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -52026,7 +52026,7 @@ /area/maintenance/port) "bUR" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -52048,8 +52048,8 @@ /area/maintenance/port/aft) "bUT" = ( /obj/structure/rack, -/obj/item/weapon/weldingtool, -/obj/item/weapon/screwdriver{ +/obj/item/weldingtool, +/obj/item/screwdriver{ pixel_y = 16 }, /obj/effect/spawner/lootdrop/maintenance, @@ -52078,7 +52078,7 @@ pixel_y = -3 }, /obj/item/stack/cable_coil, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -52394,10 +52394,10 @@ /area/maintenance/starboard) "bVB" = ( /obj/structure/rack, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/belt/utility, +/obj/item/extinguisher, +/obj/item/storage/belt/utility, /obj/item/clothing/mask/gas, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard) @@ -52407,7 +52407,7 @@ /area/maintenance/starboard) "bVE" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil/random, /turf/open/floor/plating, /area/maintenance/starboard) @@ -53029,11 +53029,11 @@ req_access_txt = "0"; req_one_access_txt = "30;35" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -53487,7 +53487,7 @@ /area/maintenance/port) "bXH" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/item/device/flashlight, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -53495,12 +53495,12 @@ "bXI" = ( /obj/structure/closet, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) "bXJ" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -53515,7 +53515,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; layer = 4.1 }, @@ -53617,7 +53617,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -53665,8 +53665,8 @@ dir = 4; network = list("SS13") }, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, /obj/machinery/requests_console{ department = "Hydroponics"; departmentType = 2; @@ -53682,7 +53682,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table/glass, /turf/open/floor/plasteel/green, /area/hydroponics) @@ -53717,10 +53717,10 @@ /obj/item/seeds/sugarcane, /obj/item/seeds/potato, /obj/item/seeds/apple, -/obj/item/weapon/grown/corncob, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin{ +/obj/item/grown/corncob, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/pumpkin{ pixel_y = 5 }, /obj/structure/extinguisher_cabinet{ @@ -53792,8 +53792,8 @@ /area/maintenance/starboard) "bYq" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/oxygen, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/intercom{ @@ -53834,7 +53834,7 @@ /turf/open/floor/plating, /area/maintenance/starboard) "bYu" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ d1 = 1; @@ -53932,15 +53932,15 @@ /area/maintenance/port/aft) "bYG" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/extinguisher_cabinet{ pixel_y = -30 }, @@ -53963,7 +53963,7 @@ "bYJ" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -53995,7 +53995,7 @@ }, /area/maintenance/port/aft) "bYO" = ( -/obj/item/weapon/vending_refill/cola, +/obj/item/vending_refill/cola, /turf/open/floor/plating, /area/maintenance/port/aft) "bYP" = ( @@ -54003,7 +54003,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -54032,29 +54032,29 @@ pixel_y = 32 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -5 }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, /area/medical/storage) "bYT" = ( /obj/structure/closet/secure_closet/medical3, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 6 }, /obj/structure/sign/nosmoking_2{ @@ -54072,7 +54072,7 @@ /obj/machinery/airalarm{ pixel_y = 24 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 6 }, /turf/open/floor/plasteel/whiteblue/side{ @@ -54142,20 +54142,20 @@ }, /area/security/checkpoint/medical) "bYZ" = ( -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 30 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law{ pixel_x = 3; pixel_y = 4 }, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -54311,10 +54311,10 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "bZq" = ( -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -54330,10 +54330,10 @@ /turf/open/floor/plasteel/hydrofloor, /area/hallway/primary/central) "bZs" = ( -/obj/item/weapon/cultivator, -/obj/item/weapon/crowbar, +/obj/item/cultivator, +/obj/item/crowbar, /obj/item/device/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/table/glass, /turf/open/floor/plasteel/hydrofloor, /area/hallway/primary/central) @@ -54484,7 +54484,7 @@ }, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/green/visible, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -54549,17 +54549,17 @@ dir = 1 }, /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plating, /area/maintenance/port/aft) "bZV" = ( -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/hand_labeler, +/obj/item/storage/toolbox/emergency, +/obj/item/hand_labeler, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "bZW" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/structure/disposalpipe/segment{ dir = 4; icon_state = "pipe-c" @@ -54692,11 +54692,11 @@ /area/security/checkpoint/medical) "cai" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 }, @@ -54706,20 +54706,20 @@ dir = 1 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -4; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -54755,7 +54755,7 @@ /area/medical/medbay/central) "cao" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 2 }, @@ -54794,7 +54794,7 @@ /area/hallway/primary/aft) "cat" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -54805,7 +54805,7 @@ /area/science/research) "cau" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/gateway, +/obj/item/paper/pamphlet/gateway, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -54844,7 +54844,7 @@ pixel_x = -4; pixel_y = -4 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /obj/item/device/gps{ @@ -54856,8 +54856,8 @@ /area/science/research) "caA" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/electronics/airlock, +/obj/item/stock_parts/console_screen, +/obj/item/electronics/airlock, /obj/item/device/assembly/timer{ pixel_x = -4; pixel_y = 2 @@ -54868,11 +54868,11 @@ /area/science/research) "caB" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/status_display{ density = 0; layer = 4; @@ -54945,11 +54945,11 @@ /area/security/checkpoint/science/research) "caE" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -55177,7 +55177,7 @@ /area/maintenance/starboard) "caV" = ( /obj/structure/rack, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -55545,7 +55545,7 @@ /obj/item/stack/sheet/metal{ amount = 34 }, -/obj/item/weapon/extinguisher/mini, +/obj/item/extinguisher/mini, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -55593,7 +55593,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cbF" = ( -/obj/item/weapon/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/morphine, /obj/item/trash/candy, /obj/structure/disposalpipe/segment{ dir = 4 @@ -55604,7 +55604,7 @@ }, /area/maintenance/port/aft) "cbG" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -55614,8 +55614,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cbH" = ( -/obj/item/weapon/tank/internals/air, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/structure/disposalpipe/segment{ @@ -55685,7 +55685,7 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/weapon/reagent_containers/glass/beaker/synthflesh, +/obj/item/reagent_containers/glass/beaker/synthflesh, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, @@ -55871,7 +55871,7 @@ /turf/open/floor/plating, /area/security/checkpoint/science/research) "ccl" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/radio/off, @@ -55892,7 +55892,7 @@ /area/security/checkpoint/science/research) "ccn" = ( /obj/machinery/computer/secure_data, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons from the safety of his office."; dir = 8; @@ -55926,9 +55926,9 @@ /area/hallway/primary/central) "ccq" = ( /obj/structure/table, -/obj/item/weapon/book/manual/hydroponics_pod_people, +/obj/item/book/manual/hydroponics_pod_people, /obj/machinery/light, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/paper/guides/jobs/hydroponics, /obj/machinery/camera{ c_tag = "Hydroponics - Foyer"; dir = 1; @@ -56020,7 +56020,7 @@ /turf/open/floor/plasteel, /area/hydroponics) "ccz" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/suit/apron, /obj/item/clothing/accessory/armband/hydro, /obj/structure/table/glass, @@ -56030,22 +56030,22 @@ /turf/open/floor/plasteel, /area/hydroponics) "ccA" = ( -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/watertank, +/obj/item/watertank, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/grenade/chem_grenade/antiweed, +/obj/item/grenade/chem_grenade/antiweed, /obj/structure/table/glass, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -56144,11 +56144,11 @@ }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/maintenance/disposal/incinerator) "ccI" = ( @@ -56440,19 +56440,19 @@ }, /area/medical/storage) "cdr" = ( -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 1; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, @@ -56481,18 +56481,18 @@ }, /area/medical/storage) "cdv" = ( -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, /obj/item/clothing/neck/stethoscope, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /obj/structure/table/glass, /turf/open/floor/plasteel/whiteblue/side{ dir = 5 @@ -56764,14 +56764,14 @@ /area/maintenance/starboard) "cdX" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard) "cdY" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, @@ -56939,10 +56939,10 @@ /area/maintenance/port/aft) "cep" = ( /obj/structure/rack, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -56952,7 +56952,7 @@ pixel_x = -1; pixel_y = -3 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/flashlight/seclite, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -56967,15 +56967,15 @@ /area/maintenance/port/aft) "ces" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/port/aft) "ceu" = ( @@ -56986,16 +56986,16 @@ /turf/closed/wall, /area/medical/sleeper) "cew" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = -3; pixel_y = -3 }, @@ -57022,16 +57022,16 @@ /turf/open/floor/plasteel/white, /area/medical/storage) "cez" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin{ pixel_x = -3; pixel_y = -3 }, @@ -57133,7 +57133,7 @@ }, /area/medical/medbay/central) "ceI" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-11" }, /turf/open/floor/plasteel/whiteyellow/side{ @@ -57180,7 +57180,7 @@ "ceN" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -57201,7 +57201,7 @@ /area/science/research) "ceP" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/potato, +/obj/item/stock_parts/cell/potato, /obj/machinery/light, /turf/open/floor/plasteel/whitepurple/side{ dir = 2 @@ -57235,7 +57235,7 @@ name = "Station Intercom (General)"; pixel_y = -30 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-08"; layer = 4.1 }, @@ -57636,18 +57636,18 @@ "cfC" = ( /obj/item/trash/pistachios, /obj/structure/closet, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/extinguisher, -/obj/item/weapon/storage/belt/utility, +/obj/item/stock_parts/console_screen, +/obj/item/extinguisher, +/obj/item/storage/belt/utility, /turf/open/floor/plating, /area/maintenance/port/aft) "cfD" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/maintenance/port/aft) "cfE" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plating, /area/maintenance/port/aft) "cfF" = ( @@ -57677,15 +57677,15 @@ /area/medical/sleeper) "cfJ" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/power/apc{ dir = 1; name = "Sleeper Room APC"; @@ -57700,7 +57700,7 @@ /area/medical/sleeper) "cfK" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, @@ -57711,16 +57711,16 @@ /turf/open/floor/plasteel/vault, /area/medical/sleeper) "cfL" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/brute{ pixel_x = -3; pixel_y = -3 }, @@ -57784,16 +57784,16 @@ }, /area/medical/storage) "cfP" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/o2{ pixel_x = -3; pixel_y = -3 }, @@ -57824,7 +57824,7 @@ "cfS" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /turf/open/floor/plasteel/whitegreen, /area/medical/medbay/central) "cfT" = ( @@ -57869,7 +57869,7 @@ /area/medical/chemistry) "cfZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -57879,7 +57879,7 @@ req_access_txt = "5; 33" }, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -57928,12 +57928,12 @@ /area/science/lab) "cgf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, -/obj/item/weapon/folder/white{ +/obj/item/pen, +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -58018,7 +58018,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cgn" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating{ icon_state = "platingdmg3" }, @@ -58446,18 +58446,18 @@ }, /area/medical/chemistry) "chd" = ( -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/table/glass, /turf/open/floor/plasteel/whiteyellow{ dir = 4 @@ -58501,8 +58501,8 @@ /area/hallway/primary/aft) "chi" = ( /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/item/device/multitool{ pixel_x = 3 @@ -58586,7 +58586,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "chs" = ( -/obj/item/weapon/paper, +/obj/item/paper, /obj/structure/sign/map/left{ desc = "A framed picture of the station. Clockwise from security at the top (red), you see engineering (yellow), science (purple), escape (red and white), medbay (green), arrivals (blue and white), and finally cargo (brown)."; icon_state = "map-left-MS"; @@ -58595,7 +58595,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = -32 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/structure/table/glass, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -58672,7 +58672,7 @@ /area/maintenance/starboard) "chC" = ( /obj/structure/closet/crate, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/stack/cable_coil/random, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ @@ -58685,7 +58685,7 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/cane, +/obj/item/cane, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -58710,7 +58710,7 @@ /area/maintenance/starboard) "chG" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/radio/intercom{ name = "Station Intercom (General)"; pixel_y = -29 @@ -58719,7 +58719,7 @@ /area/maintenance/disposal/incinerator) "chH" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/light/small, /obj/structure/extinguisher_cabinet{ pixel_y = -31 @@ -59309,7 +59309,7 @@ }, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -59337,7 +59337,7 @@ }, /area/science/research) "ciQ" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -59537,19 +59537,19 @@ /turf/open/floor/plating, /area/maintenance/starboard) "cjs" = ( -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -5; pixel_y = 2 }, @@ -59560,8 +59560,8 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/wood, /area/maintenance/port/aft) "cjt" = ( @@ -59587,7 +59587,7 @@ /turf/open/floor/plasteel/black, /area/medical/surgery) "cjy" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/light/small{ dir = 1 }, @@ -59610,7 +59610,7 @@ /turf/open/floor/plasteel/black, /area/medical/surgery) "cjB" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/black, /area/medical/surgery) @@ -59795,12 +59795,12 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 7; pixel_y = 4 }, -/obj/item/weapon/storage/pill_bottle/epinephrine{ +/obj/item/storage/pill_bottle/epinephrine{ pixel_x = 3 }, /turf/open/floor/plasteel/whiteyellow/side{ @@ -59878,7 +59878,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/science/lab) @@ -59901,12 +59901,12 @@ /area/science/lab) "ckc" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -59976,13 +59976,13 @@ /turf/open/floor/plasteel, /area/science/research) "cki" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ckj" = ( /obj/machinery/light/small, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -60014,7 +60014,7 @@ pixel_x = -12; pixel_y = 2 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -60070,7 +60070,7 @@ /area/science/explab) "cku" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; name = "3maintenance loot spawner" @@ -60089,7 +60089,7 @@ "ckw" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ckx" = ( @@ -60097,7 +60097,7 @@ /obj/structure/sign/bluecross{ pixel_y = 32 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cky" = ( @@ -60112,31 +60112,31 @@ /area/maintenance/starboard/aft) "ckz" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ckA" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 6; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = -4; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /turf/open/floor/plating, /area/maintenance/starboard/aft) "ckB" = ( -/obj/item/weapon/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/glass/bottle/toxin{ pixel_x = 4; pixel_y = 2 }, @@ -60269,7 +60269,7 @@ }, /area/maintenance/port/aft) "ckR" = ( -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/reagent_containers/glass/rag, /obj/structure/table/wood, /turf/open/floor/wood{ icon_state = "wood-broken4" @@ -60344,7 +60344,7 @@ /turf/open/floor/plasteel/black, /area/medical/surgery) "clc" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 8 }, @@ -60488,18 +60488,18 @@ name = "Chemistry Desk"; req_access_txt = "5" }, -/obj/item/weapon/reagent_containers/glass/bottle/morphine, -/obj/item/weapon/reagent_containers/glass/bottle/toxin{ +/obj/item/reagent_containers/glass/bottle/morphine, +/obj/item/reagent_containers/glass/bottle/toxin{ pixel_x = 5; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine, +/obj/item/reagent_containers/syringe/epinephrine, /turf/open/floor/plasteel/white, /area/medical/chemistry) "clt" = ( @@ -60530,14 +60530,14 @@ /area/medical/chemistry) "clw" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_y = 2 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/screwdriver{ +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/screwdriver{ pixel_x = -2; pixel_y = 6 }, @@ -60617,10 +60617,10 @@ /area/science/lab) "clE" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/machinery/light{ dir = 4 }, @@ -60703,7 +60703,7 @@ icon_state = "1-2" }, /obj/structure/disposalpipe/segment, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -60902,17 +60902,17 @@ /area/engine/atmos) "cmg" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/wood, /area/maintenance/port/aft) "cmh" = ( -/obj/item/weapon/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/food/drinks/ale, /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/port/aft) @@ -61079,7 +61079,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table/glass, /turf/open/floor/plasteel/whiteyellow/side{ dir = 4 @@ -61120,7 +61120,7 @@ }, /area/science/lab) "cmG" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -61130,14 +61130,14 @@ "cmH" = ( /obj/structure/table, /obj/structure/disposalpipe/segment, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, +/obj/item/disk/design_disk, /turf/open/floor/plasteel/white, /area/science/lab) "cmI" = ( @@ -61159,11 +61159,11 @@ /obj/structure/table, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /turf/open/floor/plasteel, /area/science/lab) "cmK" = ( @@ -61238,11 +61238,11 @@ /area/science/explab) "cmR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -61250,7 +61250,7 @@ /area/science/explab) "cmS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, @@ -61270,8 +61270,8 @@ /area/science/explab) "cmU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/book/manual/experimentor, +/obj/item/clipboard, +/obj/item/book/manual/experimentor, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -61287,15 +61287,15 @@ dir = 6 }, /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 7; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/item/stack/medical/bruise_pack{ pixel_x = -2; pixel_y = 6 @@ -61407,12 +61407,12 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "cni" = ( -/obj/item/weapon/reagent_containers/food/drinks/bottle/tequila, +/obj/item/reagent_containers/food/drinks/bottle/tequila, /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/port/aft) "cnj" = ( -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /obj/structure/table/wood, /turf/open/floor/wood, /area/maintenance/port/aft) @@ -61429,7 +61429,7 @@ /area/maintenance/port/aft) "cnm" = ( /obj/structure/table, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -61437,7 +61437,7 @@ /area/medical/surgery) "cnn" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white/side{ dir = 2 @@ -61445,21 +61445,21 @@ /area/medical/surgery) "cno" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/open/floor/plasteel/white/side{ dir = 2 }, /area/medical/surgery) "cnp" = ( /obj/structure/table, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_y = 5 }, /turf/open/floor/plasteel/white/side{ @@ -61468,7 +61468,7 @@ /area/medical/surgery) "cnq" = ( /obj/structure/table, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel, /area/medical/surgery) "cnr" = ( @@ -61501,7 +61501,7 @@ }, /obj/item/clothing/suit/straight_jacket, /obj/item/clothing/mask/muzzle, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /obj/item/clothing/glasses/eyepatch, /obj/item/clothing/glasses/sunglasses/blindfold, /obj/item/clothing/ears/earmuffs, @@ -61522,31 +61522,31 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -2; pixel_y = 9 }, /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 5; pixel_y = 9 }, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 6; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -61608,7 +61608,7 @@ pixel_y = 32 }, /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -61620,16 +61620,16 @@ }, /area/crew_quarters/heads/cmo) "cnD" = ( -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/chemistry{ +/obj/item/cartridge/medical, +/obj/item/cartridge/chemistry{ pixel_y = 2 }, /obj/structure/table/glass, @@ -61638,15 +61638,15 @@ }, /area/crew_quarters/heads/cmo) "cnE" = ( -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/table/glass, -/obj/item/weapon/stamp/cmo, +/obj/item/stamp/cmo, /turf/open/floor/plasteel/barber{ dir = 8 }, /area/crew_quarters/heads/cmo) "cnF" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -61663,14 +61663,14 @@ /area/crew_quarters/heads/cmo) "cnG" = ( /obj/structure/closet/secure_closet/CMO, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 5; pixel_y = 26 }, /obj/machinery/computer/security/telescreen/entertainment{ pixel_x = 30 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 6 }, /turf/open/floor/plasteel/barber{ @@ -61745,7 +61745,7 @@ /area/medical/chemistry) "cnM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -61833,10 +61833,10 @@ /area/science/lab) "cnW" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -61964,7 +61964,7 @@ }, /area/science/research) "coj" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -61990,11 +61990,11 @@ /area/science/explab) "com" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -62022,8 +62022,8 @@ dir = 4 }, /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/glasses/science, @@ -62060,25 +62060,25 @@ /area/maintenance/starboard/aft) "cos" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 6 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cot" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, @@ -62151,7 +62151,7 @@ icon_state = "0-2" }, /obj/structure/table, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/white/side{ dir = 8 }, @@ -62178,7 +62178,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/white, /area/medical/surgery) "coG" = ( @@ -62317,7 +62317,7 @@ /obj/structure/closet/wardrobe/chemistry_white{ pixel_x = -3 }, -/obj/item/weapon/storage/backpack/satchel/chem, +/obj/item/storage/backpack/satchel/chem, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 @@ -62362,7 +62362,7 @@ /area/medical/chemistry) "coX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -62372,11 +62372,11 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistry_shutters_2"; name = "chemistry shutters" @@ -62412,16 +62412,16 @@ name = "Research and Development Desk"; req_access_txt = "7" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, /obj/machinery/door/firedoor, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters_2"; name = "research shutters" @@ -62861,7 +62861,7 @@ "cpL" = ( /obj/effect/decal/cleanable/blood/gibs/limb, /obj/structure/rack, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/bruise_pack, /obj/item/stack/medical/ointment, @@ -62891,7 +62891,7 @@ /area/aisat) "cpP" = ( /obj/structure/lattice/catwalk, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/space, /area/space) "cpQ" = ( @@ -63284,7 +63284,7 @@ /area/medical/chemistry) "cqv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -63301,7 +63301,7 @@ /area/science/lab) "cqx" = ( /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -63325,11 +63325,11 @@ /turf/open/floor/plasteel, /area/science/lab) "cqy" = ( -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -63348,7 +63348,7 @@ "cqz" = ( /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -63725,7 +63725,7 @@ /area/medical/surgery) "crq" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/light_switch{ pixel_x = 26 }, @@ -63749,17 +63749,17 @@ pixel_y = -24 }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/camera{ c_tag = "Medbay Cryo"; dir = 1; network = list("SS13","Medbay") }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 6 }, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -63855,7 +63855,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/barber{ dir = 8 }, @@ -64106,7 +64106,7 @@ /area/science/explab) "crY" = ( /obj/structure/rack, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -64122,13 +64122,13 @@ /area/maintenance/starboard/aft) "csa" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs/cable/white, -/obj/item/weapon/gun/syringe, +/obj/item/restraints/handcuffs/cable/white, +/obj/item/gun/syringe, /turf/open/floor/plating, /area/maintenance/starboard/aft) "csb" = ( /obj/structure/rack, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/plating, /area/maintenance/starboard/aft) "csc" = ( @@ -64140,7 +64140,7 @@ /area/maintenance/starboard/aft) "csd" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/anesthetic, +/obj/item/tank/internals/anesthetic, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -64275,7 +64275,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -64418,9 +64418,9 @@ icon_state = "4-8" }, /obj/structure/table/glass, -/obj/item/weapon/folder/blue, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/barber{ dir = 8 }, @@ -64783,7 +64783,7 @@ /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hor) "cte" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, /obj/machinery/ai_status_display{ @@ -64901,7 +64901,7 @@ /area/maintenance/aft) "ctr" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /obj/machinery/airalarm{ dir = 4; @@ -64997,7 +64997,7 @@ /area/crew_quarters/heads/cmo) "ctz" = ( /obj/structure/table/glass, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/clothing/neck/stethoscope, /obj/structure/extinguisher_cabinet{ pixel_x = 6; @@ -65054,7 +65054,7 @@ /turf/closed/wall, /area/maintenance/aft) "ctJ" = ( -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/structure/closet/firecloset, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -65266,7 +65266,7 @@ /area/maintenance/starboard/aft) "cud" = ( /obj/structure/closet, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -65283,7 +65283,7 @@ /area/solar/port/aft) "cuf" = ( /obj/structure/closet, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/effect/decal/cleanable/cobweb, /obj/item/device/flashlight, /obj/effect/spawner/lootdrop/maintenance, @@ -65291,18 +65291,18 @@ /area/maintenance/port/aft) "cug" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) "cuh" = ( /obj/structure/closet/crate, /obj/item/stack/cable_coil, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /obj/item/device/flashlight, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; @@ -65312,9 +65312,9 @@ /area/maintenance/port/aft) "cui" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, -/obj/item/weapon/reagent_containers/spray/weedspray, -/obj/item/weapon/paper, +/obj/item/coin/silver, +/obj/item/reagent_containers/spray/weedspray, +/obj/item/paper, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -65336,7 +65336,7 @@ /area/maintenance/port/aft) "cuk" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -65426,11 +65426,11 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/central) "cur" = ( -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; @@ -65443,7 +65443,7 @@ "cus" = ( /obj/item/clothing/gloves/color/latex, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/storage/box/disks{ +/obj/item/storage/box/disks{ pixel_x = 2; pixel_y = 2 }, @@ -65460,7 +65460,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/item/device/radio/headset/headset_medsci, /obj/item/device/flashlight/pen{ pixel_x = 4; @@ -65489,22 +65489,22 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/storage/pill_bottle/mutadone, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mutadone, +/obj/item/storage/pill_bottle/mannitol, /obj/structure/table/glass, /turf/open/floor/plasteel/vault, /area/medical/genetics) "cuv" = ( -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, @@ -65547,7 +65547,7 @@ /area/medical/genetics) "cuz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 6 }, @@ -65573,12 +65573,12 @@ dir = 8 }, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/aft) "cuD" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/aft) @@ -65671,7 +65671,7 @@ "cuP" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/circuitboard/aicore{ +/obj/item/circuitboard/aicore{ pixel_x = -2; pixel_y = 4 }, @@ -65692,7 +65692,7 @@ /obj/item/device/paicard{ pixel_x = 4 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -65893,8 +65893,8 @@ /area/maintenance/port/aft) "cvk" = ( /obj/structure/closet/crate, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/pen, +/obj/item/crowbar/red, +/obj/item/pen, /obj/item/device/flashlight/pen{ pixel_x = 4; pixel_y = 3 @@ -66062,8 +66062,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/syringes, +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, @@ -66084,11 +66084,11 @@ /area/medical/genetics) "cvE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/firedoor, /obj/machinery/door/window/eastright{ dir = 8; @@ -66338,7 +66338,7 @@ /area/maintenance/aft) "cwd" = ( /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/item/device/flashlight/seclite, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -66391,7 +66391,7 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "cwj" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/port/aft) "cwm" = ( @@ -66413,7 +66413,7 @@ /area/maintenance/port/aft) "cwo" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -66581,7 +66581,7 @@ /turf/open/floor/plasteel/whiteblue, /area/medical/genetics) "cwD" = ( -/obj/item/weapon/storage/box/disks{ +/obj/item/storage/box/disks{ pixel_x = 2; pixel_y = 2 }, @@ -66724,40 +66724,40 @@ /obj/machinery/light_switch{ pixel_x = -23 }, -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, /area/crew_quarters/heads/hor) "cwQ" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 7 }, /obj/structure/table, /obj/machinery/newscaster{ pixel_y = -30 }, -/obj/item/weapon/stamp/rd{ +/obj/item/stamp/rd{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 9; pixel_y = -1 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, /area/crew_quarters/heads/hor) "cwR" = ( /obj/structure/table, -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = 4; pixel_y = 6 }, @@ -66812,7 +66812,7 @@ /turf/open/floor/plasteel, /area/science/storage) "cwW" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/light_switch{ pixel_y = -23 }, @@ -66855,8 +66855,8 @@ /area/solar/port/aft) "cxb" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/air, -/obj/item/weapon/wrench, +/obj/item/tank/internals/air, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "platingdmg2" @@ -66873,7 +66873,7 @@ /area/maintenance/port/aft) "cxe" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -67053,13 +67053,13 @@ /turf/open/floor/plating, /area/medical/genetics) "cxw" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, /obj/item/stack/packageWrap, -/obj/item/weapon/pen, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/pen, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /turf/open/floor/plasteel/blue/side{ dir = 8 @@ -67728,7 +67728,7 @@ /obj/machinery/airalarm{ pixel_y = 24 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, @@ -67984,11 +67984,11 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/paper/guides/jobs/security/range{ +/obj/item/paper/guides/jobs/security/range{ pixel_x = 2; pixel_y = 2 }, @@ -68149,18 +68149,18 @@ /area/science/mixing) "czE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/pen, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/syringe, +/obj/item/pen, /turf/open/floor/plasteel/whitegreen, /area/medical/medbay/central) "czF" = ( @@ -68284,7 +68284,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/cafeteria{ dir = 5 }, @@ -68353,10 +68353,10 @@ /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "czX" = ( -/obj/item/weapon/book/manual/medical_cloning{ +/obj/item/book/manual/medical_cloning{ pixel_y = 6 }, -/obj/item/weapon/paper, +/obj/item/paper, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -68365,12 +68365,12 @@ /turf/open/floor/plasteel/vault, /area/medical/genetics/cloning) "czY" = ( -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/table/glass, /turf/open/floor/plasteel/vault, @@ -68788,7 +68788,7 @@ "cAG" = ( /obj/structure/window/reinforced, /obj/machinery/portable_atmospherics/scrubber, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -68905,7 +68905,7 @@ }, /area/medical/medbay/aft) "cAU" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/holopad, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -69061,7 +69061,7 @@ /turf/open/floor/plasteel, /area/science/misc_lab/range) "cBl" = ( -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/machinery/power/apc{ dir = 2; name = "Research Firing Range APC"; @@ -69172,8 +69172,8 @@ /area/science/mixing) "cBv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/effect/turf_decal/stripes/line{ @@ -69368,7 +69368,7 @@ /turf/open/floor/plating, /area/medical/virology) "cBT" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/aft) @@ -69379,7 +69379,7 @@ /obj/machinery/newscaster{ pixel_y = -30 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 5 }, @@ -69392,7 +69392,7 @@ /obj/machinery/computer/security/telescreen/entertainment{ pixel_y = -30 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /turf/open/floor/plasteel/cafeteria{ dir = 5 @@ -69500,11 +69500,11 @@ pixel_y = 32 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 6; pixel_y = 4 }, -/obj/item/weapon/paper/guides/jobs/medical/morgue{ +/obj/item/paper/guides/jobs/medical/morgue{ pixel_x = -4 }, /obj/effect/landmark/revenantspawn, @@ -69920,8 +69920,8 @@ /area/medical/morgue) "cCY" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; @@ -69989,12 +69989,12 @@ pixel_y = 32 }, /obj/structure/rack, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/glass/beaker/large, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -70021,7 +70021,7 @@ icon_state = "0-2" }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 4 }, @@ -70087,9 +70087,9 @@ /area/science/mixing) "cDo" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -70222,11 +70222,11 @@ /turf/open/floor/plating, /area/medical/virology) "cDF" = ( -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/machinery/power/apc{ cell_type = 5000; dir = 1; @@ -70248,12 +70248,12 @@ }, /area/medical/virology) "cDG" = ( -/obj/item/weapon/book/manual/wiki/infections{ +/obj/item/book/manual/wiki/infections{ pixel_y = 7 }, -/obj/item/weapon/reagent_containers/syringe/antiviral, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/syringe/antiviral, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -70550,7 +70550,7 @@ d2 = 8; icon_state = "0-8" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -70598,17 +70598,17 @@ /area/science/robotics/lab) "cEj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/window/eastright{ dir = 4; name = "Robotics Desk"; req_access_txt = "29" }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -70894,7 +70894,7 @@ /turf/open/floor/plating, /area/medical/virology) "cEI" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -70944,15 +70944,15 @@ }, /area/medical/virology) "cEM" = ( -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/requests_console{ department = "Virology"; name = "Virology Requests Console"; @@ -71155,8 +71155,8 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/multitool{ @@ -71301,7 +71301,7 @@ pixel_x = -28 }, /obj/structure/table/glass, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/radio/headset/headset_med, /obj/machinery/airalarm{ pixel_y = 23 @@ -71351,12 +71351,12 @@ /area/medical/virology) "cFC" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/machinery/light_switch{ pixel_y = 26 }, -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, @@ -71518,7 +71518,7 @@ }, /area/medical/medbay/aft) "cFQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -71763,15 +71763,15 @@ /area/science/test_area) "cGq" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/cable/yellow{ icon_state = "4-8"; @@ -72148,7 +72148,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/storage/backpack/duffelbag/med, +/obj/item/storage/backpack/duffelbag/med, /obj/item/device/flashlight/pen{ pixel_x = 4; pixel_y = 3 @@ -72157,11 +72157,11 @@ /area/maintenance/aft) "cGS" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/item/device/healthanalyzer, /obj/item/clothing/glasses/eyepatch, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = 3; pixel_y = 2 }, @@ -72228,15 +72228,15 @@ icon_state = "4-8" }, /obj/structure/rack, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -72375,7 +72375,7 @@ /area/solar/port/aft) "cHl" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -72560,11 +72560,11 @@ /obj/structure/sign/biohazard{ pixel_x = -32 }, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/structure/table/glass, /turf/open/floor/plasteel/whitegreen/corner{ dir = 1 @@ -72574,11 +72574,11 @@ /obj/structure/sign/nosmoking_2{ pixel_y = -30 }, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/table/glass, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) @@ -72587,23 +72587,23 @@ dir = 1; pixel_y = -24 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, /obj/machinery/light, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/pen, -/obj/item/weapon/pen, +/obj/item/hand_labeler, +/obj/item/pen, +/obj/item/pen, /obj/structure/table/glass, /turf/open/floor/plasteel/white, /area/medical/medbay/aft) "cHE" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -72626,14 +72626,14 @@ /area/maintenance/aft) "cHH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/dropper, /obj/structure/sign/biohazard{ pixel_x = 32 }, @@ -72925,7 +72925,7 @@ /area/science/server) "cIh" = ( /obj/structure/closet, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/flashlight, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, @@ -73074,7 +73074,7 @@ /area/medical/virology) "cIt" = ( /obj/structure/closet/wardrobe/virology_white, -/obj/item/weapon/storage/backpack/satchel/vir, +/obj/item/storage/backpack/satchel/vir, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -73087,28 +73087,28 @@ /area/medical/virology) "cIu" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/vault, /area/medical/virology) "cIv" = ( @@ -73223,15 +73223,15 @@ /area/hallway/primary/aft) "cII" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_y = 5 }, /turf/open/floor/plasteel/white/side{ @@ -73254,7 +73254,7 @@ "cIL" = ( /obj/structure/table, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/structure/window/reinforced{ dir = 4 }, @@ -73275,7 +73275,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, @@ -73285,11 +73285,11 @@ /area/science/robotics/lab) "cIO" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -1; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = -1 }, @@ -73467,7 +73467,7 @@ /area/space) "cJg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -73485,7 +73485,7 @@ "cJi" = ( /obj/structure/bed, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /turf/open/floor/plasteel/freezer, /area/medical/virology) "cJj" = ( @@ -73580,7 +73580,7 @@ }, /obj/structure/closet/crate, /obj/item/clothing/gloves/color/fyellow, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -73604,18 +73604,18 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 6 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/pill_bottle, +/obj/item/crowbar, +/obj/item/storage/pill_bottle, /turf/open/floor/plating, /area/maintenance/aft) "cJu" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -73728,8 +73728,8 @@ /area/hallway/secondary/exit/departure_lounge) "cJH" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/item/device/radio/intercom{ freerange = 0; frequency = 1459; @@ -73742,8 +73742,8 @@ /area/science/robotics/lab) "cJI" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/surgical_drapes, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -73795,19 +73795,19 @@ "cJN" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 @@ -73841,7 +73841,7 @@ }, /area/science/research) "cJQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -73869,11 +73869,11 @@ /area/science/server) "cJT" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/science/server) "cJU" = ( @@ -73997,16 +73997,16 @@ /obj/machinery/newscaster{ pixel_x = -30 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, -/obj/item/weapon/paper, -/obj/item/weapon/pen/red, +/obj/item/paper, +/obj/item/pen/red, /obj/structure/extinguisher_cabinet{ pixel_y = 30 }, @@ -74041,7 +74041,7 @@ /area/medical/virology) "cKl" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -74333,7 +74333,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cKN" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -74373,17 +74373,17 @@ /area/maintenance/solars/starboard/aft) "cKS" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/freezer, /area/medical/virology) "cKT" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -74400,7 +74400,7 @@ /area/medical/virology) "cKV" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 9 }, @@ -74894,7 +74894,7 @@ "cLJ" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/structure/closet, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -75057,15 +75057,15 @@ /area/chapel/office) "cMa" = ( /obj/structure/table/wood, -/obj/item/weapon/spellbook/oneuse/smoke/lesser{ +/obj/item/spellbook/oneuse/smoke/lesser{ name = "mysterious old book of " }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/food/drinks/bottle/holywater{ name = "flask of holy water"; pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/nullrod{ +/obj/item/nullrod{ pixel_x = 4 }, /obj/item/organ/heart, @@ -75139,7 +75139,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -75199,7 +75199,7 @@ /area/maintenance/port/aft) "cMp" = ( /obj/structure/chair, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cMq" = ( @@ -75310,7 +75310,7 @@ /turf/open/floor/plasteel/vault, /area/medical/virology) "cMA" = ( -/obj/item/weapon/reagent_containers/food/snacks/sosjerky, +/obj/item/reagent_containers/food/snacks/sosjerky, /obj/structure/table/glass, /turf/open/floor/plasteel/vault, /area/medical/virology) @@ -75355,11 +75355,11 @@ /turf/open/floor/plasteel/grimy, /area/chapel/office) "cMG" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/yellow{ d1 = 1; @@ -75391,7 +75391,7 @@ /turf/open/floor/plasteel/vault, /area/chapel/main) "cMK" = ( -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/machinery/light/small{ dir = 1 }, @@ -75408,19 +75408,19 @@ /area/chapel/main) "cML" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, /turf/open/floor/plasteel/vault, @@ -75436,15 +75436,15 @@ /area/chapel/main) "cMN" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /turf/open/floor/plasteel/vault, /area/chapel/main) "cMO" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -75560,8 +75560,8 @@ name = "Security Desk"; req_access_txt = "1" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -75672,15 +75672,15 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNj" = ( -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/cocoapod, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/cocoapod, /obj/structure/rack{ layer = 2.8 }, @@ -75693,11 +75693,11 @@ /turf/open/floor/plating, /area/maintenance/starboard/aft) "cNk" = ( -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/item/device/plant_analyzer, -/obj/item/weapon/cultivator, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/cultivator, +/obj/item/reagent_containers/glass/bucket, /obj/structure/rack{ layer = 2.8 }, @@ -75705,7 +75705,7 @@ /obj/item/seeds/cabbage, /obj/item/seeds/ambrosia, /obj/item/seeds/grass, -/obj/item/weapon/reagent_containers/food/snacks/grown/mushroom/glowshroom, +/obj/item/reagent_containers/food/snacks/grown/mushroom/glowshroom, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plating, /area/maintenance/starboard/aft) @@ -75811,7 +75811,7 @@ /turf/open/floor/plasteel/black, /area/chapel/office) "cNv" = ( -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/light/small{ dir = 8 }, @@ -75838,7 +75838,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_y = 5 }, /obj/structure/table/wood, @@ -76016,14 +76016,14 @@ /area/hallway/secondary/exit/departure_lounge) "cNS" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/machinery/light{ dir = 4 }, @@ -76328,11 +76328,11 @@ /area/hallway/secondary/exit/departure_lounge) "cOy" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/red/side, /area/hallway/secondary/exit/departure_lounge) "cOz" = ( @@ -76346,7 +76346,7 @@ dir = 1; network = list("SS13") }, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -4; pixel_y = 4 }, @@ -76390,7 +76390,7 @@ /area/maintenance/starboard/aft) "cOE" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plating, /area/maintenance/starboard/aft) "cOF" = ( @@ -76614,7 +76614,7 @@ /obj/machinery/hydroponics/soil{ pixel_y = 8 }, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -76780,8 +76780,8 @@ name = "memorial board"; pixel_y = 32 }, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box{ pixel_x = -2; pixel_y = 2 }, @@ -76796,19 +76796,19 @@ name = "Remembrance Plaque"; pixel_y = 32 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_y = 2 }, /obj/machinery/light/small{ @@ -76823,7 +76823,7 @@ name = "memorial board"; pixel_y = 32 }, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/structure/table/wood, /turf/open/floor/carpet, /area/chapel/main) @@ -76842,7 +76842,7 @@ /obj/machinery/light_switch{ pixel_y = 28 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -76907,7 +76907,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-04"; layer = 4.1 }, @@ -76977,7 +76977,7 @@ name = "Station Intercom (General)"; pixel_x = 29 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -77324,7 +77324,7 @@ /turf/open/floor/plasteel/black, /area/chapel/main) "cQG" = ( -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/structure/table/wood, /turf/open/floor/plasteel/black, /area/chapel/main) @@ -77717,10 +77717,10 @@ /obj/machinery/hydroponics/soil{ pixel_y = 8 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /obj/machinery/light/small{ dir = 1 }, @@ -77763,11 +77763,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, +/obj/item/reagent_containers/food/snacks/grown/harebell, /obj/machinery/button/massdriver{ id = "chapelgun"; name = "Chapel Mass Driver"; @@ -78481,7 +78481,7 @@ "cSY" = ( /obj/structure/disposalpipe/segment, /obj/structure/table/wood, -/obj/item/weapon/folder{ +/obj/item/folder{ pixel_y = 2 }, /turf/open/floor/plasteel/grimy, @@ -78545,7 +78545,7 @@ /obj/item/device/radio/intercom{ pixel_x = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -26 }, /obj/machinery/light/small{ @@ -78575,7 +78575,7 @@ dir = 4; pixel_x = -22 }, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 2; pixel_y = 2 }, @@ -78626,8 +78626,8 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/pod_4) "cTj" = ( -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -78793,7 +78793,7 @@ /obj/item/device/radio/intercom{ pixel_y = 25 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = 6; pixel_y = -32 }, @@ -78811,7 +78811,7 @@ /area/shuttle/syndicate) "cTw" = ( /obj/machinery/atmospherics/components/unary/portables_connector/visible, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/starboard) "cTy" = ( @@ -78855,7 +78855,7 @@ /area/science/xenobiology) "cTE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -78877,7 +78877,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -78940,18 +78940,18 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, /area/shuttle/syndicate) "cTQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -79034,33 +79034,33 @@ }, /area/shuttle/syndicate) "cUc" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -79148,7 +79148,7 @@ }, /area/shuttle/syndicate) "cUn" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -79160,11 +79160,11 @@ }, /area/shuttle/syndicate) "cUo" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -79187,7 +79187,7 @@ }, /area/shuttle/syndicate) "cUq" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -79198,7 +79198,7 @@ }, /area/shuttle/syndicate) "cUr" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -79220,8 +79220,8 @@ /area/shuttle/syndicate) "cUu" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "cUv" = ( @@ -79271,12 +79271,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -79290,22 +79290,22 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "cUC" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -79321,12 +79321,12 @@ }, /area/shuttle/syndicate) "cUE" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -79334,8 +79334,8 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "cUF" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -79820,7 +79820,7 @@ /area/shuttle/abandoned) "cVS" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice{ +/obj/item/storage/pill_bottle/dice{ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt{ @@ -79850,7 +79850,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_y = 2 @@ -79915,7 +79915,7 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -79934,15 +79934,15 @@ /turf/open/floor/plasteel, /area/shuttle/abandoned) "cWb" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/cigbutt, +/obj/item/storage/box/lights/mixed, +/obj/item/cigbutt, /obj/structure/closet/crate{ icon_state = "crateopen"; name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/tank/internals/oxygen/red, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/air, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -79960,8 +79960,8 @@ /obj/structure/closet/crate{ name = "spare equipment crate" }, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/relic, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/relic, /obj/item/device/t_scanner, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -79978,8 +79978,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -79988,11 +79988,11 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -80046,7 +80046,7 @@ /area/shuttle/abandoned) "cWj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/centcom, +/obj/item/bedsheet/centcom, /obj/effect/decal/remains/human, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt{ @@ -80071,13 +80071,13 @@ icon_state = "remains"; name = "remains" }, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "cWl" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/off, @@ -80192,7 +80192,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/decal/cleanable/ash{ desc = "They look like human remains, and have clearly been gnawed at."; icon = 'icons/effects/blood.dmi'; @@ -80218,7 +80218,7 @@ /area/shuttle/abandoned) "cWw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/centcom, +/obj/item/bedsheet/centcom, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -80252,7 +80252,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cWz" = ( @@ -80261,11 +80261,11 @@ layer = 2.9; pixel_y = 2 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -80473,7 +80473,7 @@ /area/shuttle/abandoned) "cWV" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -80489,7 +80489,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cWX" = ( @@ -80555,7 +80555,7 @@ /area/shuttle/abandoned) "cXf" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -80579,7 +80579,7 @@ /area/shuttle/abandoned) "cXh" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -80598,7 +80598,7 @@ /area/shuttle/abandoned) "cXj" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -80607,11 +80607,11 @@ /area/shuttle/abandoned) "cXk" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3; pixel_y = 4 }, @@ -80670,7 +80670,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) @@ -80699,12 +80699,12 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cXr" = ( -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -3 }, @@ -80809,11 +80809,11 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cXC" = ( -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -80957,16 +80957,16 @@ }, /area/construction/mining/aux_base) "cXS" = ( -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ pixel_x = -2; pixel_y = 3 }, @@ -81014,7 +81014,7 @@ pixel_x = -3; pixel_y = 6 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81060,12 +81060,12 @@ /area/shuttle/abandoned) "cYb" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/random, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81091,18 +81091,18 @@ /area/science/robotics/lab) "cYd" = ( /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/clothing/suit/apron, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/cultivator, +/obj/item/shovel/spade, +/obj/item/cultivator, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/light_construct/small{ dir = 8 }, @@ -81139,8 +81139,8 @@ /area/shuttle/abandoned) "cYh" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81260,10 +81260,10 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ pixel_y = 4 }, -/obj/item/weapon/storage/fancy/egg_box{ +/obj/item/storage/fancy/egg_box{ pixel_y = 5 }, /turf/open/floor/mineral/titanium, @@ -81281,18 +81281,18 @@ /area/shuttle/abandoned) "cYv" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/soymilk, -/obj/item/weapon/reagent_containers/food/condiment/soymilk, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81301,13 +81301,13 @@ /area/shuttle/abandoned) "cYw" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81316,13 +81316,13 @@ /area/shuttle/abandoned) "cYx" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81331,7 +81331,7 @@ /area/shuttle/abandoned) "cYy" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81340,7 +81340,7 @@ /area/shuttle/abandoned) "cYz" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -81352,7 +81352,7 @@ /area/shuttle/abandoned) "cYA" = ( /obj/structure/table, -/obj/item/weapon/defibrillator, +/obj/item/defibrillator, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81372,13 +81372,13 @@ /area/shuttle/abandoned) "cYC" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -81387,7 +81387,7 @@ /area/shuttle/abandoned) "cYD" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/duffelbag/med/surgery{ +/obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, /turf/open/floor/mineral/titanium, @@ -81500,19 +81500,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -81611,9 +81611,9 @@ /area/science/xenobiology) "cYU" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/hand_labeler_refill, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -81625,12 +81625,12 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -4; pixel_y = 3 }, @@ -81638,7 +81638,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -81648,7 +81648,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "cYX" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/floorgrime, /area/shuttle/escape) "cYY" = ( @@ -81675,8 +81675,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -81685,8 +81685,8 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -81808,8 +81808,8 @@ /area/shuttle/escape) "cZs" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -81817,8 +81817,8 @@ /area/shuttle/escape) "cZt" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -81840,33 +81840,33 @@ /area/science/xenobiology) "cZw" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -81874,12 +81874,12 @@ /area/shuttle/escape) "cZx" = ( /obj/structure/table, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "cZy" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -81892,7 +81892,7 @@ /area/shuttle/escape) "cZz" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/machinery/light{ dir = 8 }, @@ -81900,7 +81900,7 @@ /area/shuttle/escape) "cZA" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_y = -27 @@ -81931,7 +81931,7 @@ /area/shuttle/escape) "cZE" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 2; pixel_y = 2 }, @@ -81962,7 +81962,7 @@ /area/shuttle/escape) "cZJ" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ pixel_y = 3 }, /turf/open/floor/mineral/plastitanium/brig, @@ -81989,10 +81989,10 @@ /area/shuttle/escape) "cZO" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, -/obj/item/weapon/weldingtool, -/obj/item/weapon/wirecutters, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/wirecutters, /obj/item/stack/cable_coil, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -82028,7 +82028,7 @@ /area/security/main) "cZS" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ pixel_y = 3 }, /obj/machinery/light{ @@ -82038,7 +82038,7 @@ /area/shuttle/escape) "cZT" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "cZU" = ( @@ -82088,14 +82088,14 @@ /area/shuttle/escape) "dac" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -5 }, @@ -82130,16 +82130,16 @@ /area/shuttle/escape) "dai" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "daj" = ( /obj/structure/table, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -82155,7 +82155,7 @@ /area/shuttle/escape) "dam" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_y = 3 }, /turf/open/floor/mineral/titanium/blue, @@ -82186,10 +82186,10 @@ /area/security/main) "daq" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, @@ -82198,7 +82198,7 @@ name = "Station Intercom (General)"; pixel_y = -31 }, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -4; pixel_y = 4 }, @@ -82210,14 +82210,14 @@ /area/shuttle/escape) "das" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -82245,7 +82245,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, @@ -82348,7 +82348,7 @@ }, /obj/item/stack/cable_coil, /obj/item/device/multitool, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -82637,22 +82637,22 @@ /area/science/xenobiology) "dbx" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "dby" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "dbz" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -82991,15 +82991,15 @@ /obj/item/stack/sheet/mineral/plasma{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 8; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/machinery/power/apc{ cell_type = 10000; dir = 1; @@ -83016,14 +83016,14 @@ /area/science/xenobiology) "dcd" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_y = 4 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = -4 }, /obj/machinery/requests_console{ @@ -83042,18 +83042,18 @@ /area/science/xenobiology) "dce" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 7 }, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_y = 5 }, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -83379,11 +83379,11 @@ /area/science/xenobiology) "dcJ" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -83850,7 +83850,7 @@ dir = 4 }, /obj/structure/chair, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold/cyan/visible{ dir = 1 }, @@ -84790,7 +84790,7 @@ /turf/open/floor/plasteel/black, /area/engine/engineering) "dfW" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/black, /area/engine/engineering) "dfX" = ( @@ -85089,7 +85089,7 @@ /area/shuttle/syndicate) "dhn" = ( /obj/structure/table, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/fore) @@ -85099,14 +85099,14 @@ dir = 1 }, /obj/structure/closet/crate, -/obj/item/weapon/coin/silver, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/watertank, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, +/obj/item/coin/silver, +/obj/item/grenade/chem_grenade, +/obj/item/storage/box/lights/mixed, +/obj/item/watertank, +/obj/item/storage/box/donkpockets, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -85132,12 +85132,12 @@ /obj/structure/light_construct/small{ dir = 8 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, /obj/structure/window/reinforced, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -85170,7 +85170,7 @@ /turf/open/floor/plasteel/vault, /area/crew_quarters/fitness/recreation) "dht" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -85202,18 +85202,18 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/folder/red, -/obj/item/weapon/poster/random_official, +/obj/item/folder/red, +/obj/item/folder/red, +/obj/item/poster/random_official, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) "dhw" = ( /obj/structure/closet, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -85271,7 +85271,7 @@ "dhB" = ( /obj/item/clothing/glasses/meson, /obj/structure/closet/crate, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -85292,8 +85292,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/paper, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/paper, +/obj/item/storage/box/lights/mixed, /obj/structure/sign/poster/official/random{ pixel_y = -32 }, @@ -85376,7 +85376,7 @@ /area/crew_quarters/locker) "dhK" = ( /obj/structure/closet, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port/fore) @@ -85389,7 +85389,7 @@ pixel_y = -27 }, /obj/structure/cable/yellow, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, @@ -85469,7 +85469,7 @@ "dhR" = ( /obj/structure/closet, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) @@ -85505,8 +85505,8 @@ /area/crew_quarters/theatre) "dhW" = ( /obj/structure/table/wood, -/obj/item/weapon/staff/broom, -/obj/item/weapon/wrench, +/obj/item/staff/broom, +/obj/item/wrench, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -85538,7 +85538,7 @@ /area/crew_quarters/toilet/auxiliary) "dib" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick{ +/obj/item/lipstick{ pixel_y = 5 }, /obj/machinery/camera{ @@ -85573,14 +85573,14 @@ /area/hallway/secondary/entry) "did" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/structure/sign/poster/official/random{ pixel_x = -32 }, /turf/open/floor/wood, /area/security/vacantoffice) "dif" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/light/small{ dir = 4 }, @@ -85639,7 +85639,7 @@ dir = 8 }, /obj/item/clothing/mask/pig, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/structure/table/wood, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 @@ -85660,7 +85660,7 @@ /area/crew_quarters/theatre) "din" = ( /obj/structure/table/wood, -/obj/item/weapon/paper, +/obj/item/paper, /obj/structure/sign/poster/official/random{ pixel_y = -32 }, @@ -85671,7 +85671,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, /turf/open/floor/plating, /area/maintenance/port) "dip" = ( @@ -85682,11 +85682,11 @@ pixel_x = 28; req_access_txt = "19" }, -/obj/item/weapon/poster/random_official, -/obj/item/weapon/poster/random_official, -/obj/item/weapon/poster/random_official, -/obj/item/weapon/poster/random_official, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, +/obj/item/poster/random_official, /obj/item/device/paicard{ desc = "A real Nanotrasen success, these personal AIs provide all of the companionship of an AI without any law related red-tape."; name = "Nanotrasen-brand personal AI device exhibit" @@ -85753,7 +85753,7 @@ /area/maintenance/port) "diu" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -85789,17 +85789,17 @@ /area/hydroponics) "dix" = ( /obj/structure/rack, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/port) "diy" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/port/aft) "diz" = ( @@ -85872,15 +85872,15 @@ /area/science/research) "diE" = ( /obj/structure/rack, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka{ +/obj/item/reagent_containers/food/drinks/bottle/vodka{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth{ +/obj/item/reagent_containers/food/drinks/bottle/vermouth{ pixel_x = -4; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/structure/sign/poster/contraband/random{ pixel_y = 32 }, @@ -85913,16 +85913,16 @@ /turf/open/floor/plating, /area/science/research) "diI" = ( -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/poster/random_contraband, +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/drinks/ale, +/obj/item/reagent_containers/food/drinks/ale, /obj/structure/table/wood, /obj/item/device/instrument/eguitar, /obj/effect/turf_decal/stripes/line{ @@ -85943,8 +85943,8 @@ /turf/open/floor/wood, /area/maintenance/port/aft) "diK" = ( -/obj/item/weapon/dice/d20, -/obj/item/weapon/dice, +/obj/item/dice/d20, +/obj/item/dice, /obj/structure/table/wood, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -85958,8 +85958,8 @@ /turf/open/floor/plating, /area/maintenance/port/aft) "diL" = ( -/obj/item/weapon/tank/internals/air, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, +/obj/item/tank/internals/air, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/machinery/space_heater, @@ -86036,7 +86036,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/ore/slag, +/obj/item/ore/slag, /turf/open/floor/plating, /area/maintenance/aft) "diS" = ( @@ -86048,7 +86048,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/aft) "diT" = ( @@ -86067,7 +86067,7 @@ /area/maintenance/starboard/aft) "diU" = ( /obj/structure/closet/crate, -/obj/item/weapon/poster/random_official, +/obj/item/poster/random_official, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/landmark/blobstart, /obj/effect/turf_decal/stripes/line{ @@ -86084,7 +86084,7 @@ dir = 4; network = list("SS13") }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-24"; layer = 4.1 }, @@ -86213,7 +86213,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/door/poddoor/shutters/preopen{ id = "engsm"; name = "Radiation Chamber Shutters" @@ -86399,8 +86399,8 @@ /area/hallway/secondary/entry) "djW" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/paper, +/obj/item/clipboard, +/obj/item/paper, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -86445,7 +86445,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -86550,8 +86550,8 @@ }, /area/shuttle/syndicate) "dkt" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -86709,9 +86709,9 @@ /area/shuttle/syndicate) "dkV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -87422,7 +87422,7 @@ /turf/open/floor/plating, /area/maintenance/port/fore) "dod" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/port/fore) "doe" = ( @@ -87487,7 +87487,7 @@ /turf/closed/wall, /area/maintenance/port/fore) "dow" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/port/fore) "dox" = ( @@ -87653,7 +87653,7 @@ /turf/closed/wall, /area/maintenance/starboard/fore) "dpk" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/starboard/fore) "dpl" = ( @@ -88512,7 +88512,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/fore) "dtS" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/power/apc{ dir = 2; name = "Starboard Bow Maintenance APC"; @@ -89823,7 +89823,7 @@ /turf/closed/wall, /area/maintenance/starboard/aft) "dAh" = ( -/obj/item/weapon/storage/box, +/obj/item/storage/box, /turf/open/floor/plating, /area/maintenance/starboard/aft) "dAi" = ( diff --git a/_maps/map_files/Mining/Lavaland.dmm b/_maps/map_files/Mining/Lavaland.dmm index 9b97eef1d53..d40fc99996e 100644 --- a/_maps/map_files/Mining/Lavaland.dmm +++ b/_maps/map_files/Mining/Lavaland.dmm @@ -93,12 +93,12 @@ /area/mine/laborcamp) "as" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/white, /area/mine/laborcamp) "at" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/camera{ c_tag = "Labor Camp Medical"; dir = 8; @@ -110,8 +110,8 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, /obj/item/device/flashlight, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, @@ -120,9 +120,9 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, /obj/item/device/flashlight, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, /area/mine/laborcamp) @@ -158,10 +158,10 @@ /area/mine/laborcamp) "aC" = ( /obj/structure/closet/crate/internals, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/breath, @@ -190,7 +190,7 @@ "aG" = ( /obj/structure/table, /obj/item/trash/plate, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel, /area/mine/laborcamp) "aH" = ( @@ -385,7 +385,7 @@ /area/mine/laborcamp) "bn" = ( /obj/structure/table, -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /obj/item/device/gps/mining, /obj/item/device/gps/mining, /obj/item/device/gps/mining, @@ -427,7 +427,7 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -518,7 +518,7 @@ /area/mine/production) "bD" = ( /obj/structure/closet/crate, -/obj/item/weapon/dice/d4, +/obj/item/dice/d4, /turf/open/floor/plasteel/brown{ dir = 1 }, @@ -536,7 +536,7 @@ /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/purple/corner{ dir = 8 }, @@ -730,11 +730,11 @@ /area/mine/laborcamp/security) "cd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1; pixel_y = 9 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/power/apc{ dir = 4; name = "Labor Camp Security APC"; @@ -856,7 +856,7 @@ }, /area/mine/eva) "cu" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid/basalt/lava_land_surface, /area/lavaland/surface/outdoors) "cv" = ( @@ -1099,7 +1099,7 @@ pixel_y = 30 }, /obj/structure/table, -/obj/item/weapon/paper/fluff/stations/lavaland/orm_notice, +/obj/item/paper/fluff/stations/lavaland/orm_notice, /turf/open/floor/plasteel, /area/mine/production) "de" = ( @@ -1167,7 +1167,7 @@ /area/mine/living_quarters) "dn" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, @@ -1274,28 +1274,28 @@ /area/mine/maintenance) "dB" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, /obj/machinery/camera{ c_tag = "Sleeper Room"; dir = 1; @@ -1312,7 +1312,7 @@ /area/mine/living_quarters) "dE" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, @@ -1984,7 +1984,7 @@ /area/mine/living_quarters) "fe" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /obj/machinery/airalarm{ frequency = 1439; pixel_y = 23 @@ -2138,18 +2138,18 @@ /area/mine/living_quarters) "fD" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = 7; pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 5 }, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = -1; pixel_y = 9 }, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = -8 }, /turf/open/floor/plasteel/bar, @@ -2171,7 +2171,7 @@ /area/mine/living_quarters) "fG" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/bar, /area/mine/living_quarters) "fH" = ( diff --git a/_maps/map_files/OmegaStation/OmegaStation.dmm b/_maps/map_files/OmegaStation/OmegaStation.dmm index e409649ab84..9dead5548ce 100644 --- a/_maps/map_files/OmegaStation/OmegaStation.dmm +++ b/_maps/map_files/OmegaStation/OmegaStation.dmm @@ -164,8 +164,8 @@ }, /area/bridge) "aas" = ( -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/wrench, +/obj/item/storage/toolbox/mechanical, +/obj/item/wrench, /obj/item/device/multitool, /obj/structure/cable/white{ d1 = 1; @@ -189,8 +189,8 @@ }, /area/bridge) "aau" = ( -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/cable/white{ d1 = 1; d2 = 2; @@ -285,11 +285,11 @@ /area/bridge) "aaC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -303,8 +303,8 @@ }, /area/bridge) "aaE" = ( -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /obj/structure/cable/white{ d1 = 1; @@ -331,9 +331,9 @@ }, /area/bridge) "aaG" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/pen, /obj/structure/cable/white{ d1 = 1; d2 = 2; @@ -355,8 +355,8 @@ "aaI" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -400,7 +400,7 @@ "aaM" = ( /obj/structure/table/reinforced, /obj/machinery/recharger, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -451,7 +451,7 @@ dir = 4 }, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -480,7 +480,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault, @@ -499,7 +499,7 @@ "aaU" = ( /obj/structure/table/reinforced, /obj/item/device/aicard, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 28 @@ -523,7 +523,7 @@ name = "Asteroid" }) "aaW" = ( -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/asteroid, /area/ruin/unpowered{ name = "Asteroid" @@ -891,8 +891,8 @@ /area/bridge) "abB" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -906,7 +906,7 @@ /area/bridge) "abC" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/structure/cable/white{ d1 = 2; d2 = 4; @@ -946,7 +946,7 @@ /area/bridge) "abF" = ( /obj/structure/table/wood, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/structure/cable/white{ d1 = 2; d2 = 8; @@ -963,11 +963,11 @@ /area/bridge) "abG" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -1022,7 +1022,7 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/hop) @@ -1082,7 +1082,7 @@ }) "abS" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/glass, +/obj/item/ore/glass, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ name = "Asteroid" @@ -1112,7 +1112,7 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/security/detectives_office) @@ -1138,7 +1138,7 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/crew_quarters/heads/captain/private) @@ -1181,7 +1181,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /obj/effect/landmark/start/captain, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain/private) @@ -1201,13 +1201,13 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/briefcase, +/obj/item/storage/secure/safe{ pixel_x = 32; pixel_y = 24 }, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, @@ -1271,7 +1271,7 @@ /area/bridge) "acj" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -1346,7 +1346,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/bedsheet/hop, +/obj/item/bedsheet/hop, /obj/effect/landmark/start/head_of_personnel, /turf/open/floor/wood, /area/crew_quarters/heads/hop) @@ -1371,7 +1371,7 @@ pixel_y = 32 }, /obj/machinery/atmospherics/components/unary/vent_pump/on, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32; pixel_y = 24 }, @@ -1483,7 +1483,7 @@ /turf/open/floor/plasteel, /area/shuttle/supply) "acD" = ( -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid, /area/ruin/unpowered{ name = "Asteroid" @@ -1536,7 +1536,7 @@ /obj/structure/bed, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/landmark/start/detective, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/wood, /area/security/detectives_office) "acK" = ( @@ -2125,7 +2125,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ @@ -2473,8 +2473,8 @@ }) "aeo" = ( /obj/structure/table, -/obj/item/weapon/extinguisher/mini, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/extinguisher/mini, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/breath, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -2582,12 +2582,12 @@ name = "Core Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/core/full/paladin{ +/obj/item/aiModule/core/full/paladin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/full/corp{ +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/full/corp{ pixel_x = -3; pixel_y = -3 }, @@ -2715,12 +2715,12 @@ name = "Core Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/core/full/antimov{ +/obj/item/aiModule/core/full/antimov{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/supplied/protectStation{ +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/supplied/protectStation{ pixel_x = -3; pixel_y = -3 }, @@ -2798,18 +2798,18 @@ /area/crew_quarters/heads/hop) "aeM" = ( /obj/structure/filingcabinet/security, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/crew_quarters/heads/hop) "aeN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/silver_ids{ +/obj/item/storage/box/silver_ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/ids, /obj/structure/cable/white{ d2 = 2; icon_state = "0-2" @@ -2956,7 +2956,7 @@ "afd" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -3038,7 +3038,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/heads/captain/private) "afl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-15"; pixel_x = -6; pixel_y = 12 @@ -3064,7 +3064,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "afo" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -3109,11 +3109,11 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/freeformcore{ +/obj/item/aiModule/core/freeformcore{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/custom, /obj/machinery/camera{ c_tag = "AI Core - Port"; dir = 4; @@ -3141,12 +3141,12 @@ req_access_txt = "20" }, /obj/structure/window/reinforced, -/obj/item/weapon/aiModule/core/full/tyrant{ +/obj/item/aiModule/core/full/tyrant{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/zeroth/oneHuman, -/obj/item/weapon/aiModule/reset/purge{ +/obj/item/aiModule/zeroth/oneHuman, +/obj/item/aiModule/reset/purge{ pixel_x = -3; pixel_y = -3 }, @@ -3411,7 +3411,7 @@ }) "afM" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /obj/structure/barricade/wooden, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ @@ -3435,7 +3435,7 @@ }) "afP" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/camera/detective, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -3555,7 +3555,7 @@ "aga" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /obj/item/toy/figure/captain, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) @@ -3629,14 +3629,14 @@ /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c500, /obj/item/stack/spacecash/c500, -/obj/item/weapon/book{ +/obj/item/book{ desc = "An undeniably handy book."; icon_state = "bookknock"; name = "A Simpleton's Guide to Safe-cracking with Stethoscopes" }, /obj/item/clothing/neck/stethoscope, /obj/item/stack/sheet/mineral/diamond, -/obj/item/weapon/gun/ballistic/automatic/pistol/deagle, +/obj/item/gun/ballistic/automatic/pistol/deagle, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -3712,10 +3712,10 @@ pixel_x = -26; pixel_y = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/stack/packageWrap, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/hand_labeler, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -3740,9 +3740,9 @@ /area/crew_quarters/heads/hop) "agr" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, -/obj/item/weapon/stamp/hop, +/obj/item/paper_bin, +/obj/item/pen, +/obj/item/stamp/hop, /obj/structure/cable/white{ d1 = 1; d2 = 2; @@ -3887,8 +3887,8 @@ /area/shuttle/supply) "agE" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/silver, -/obj/item/weapon/ore/iron, +/obj/item/ore/silver, +/obj/item/ore/iron, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ name = "Asteroid" @@ -3913,11 +3913,11 @@ }) "agI" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/machinery/airalarm{ dir = 4; locked = 0; @@ -3942,8 +3942,8 @@ /area/security/detectives_office) "agK" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/hand_labeler, +/obj/item/folder/red, +/obj/item/hand_labeler, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 8 }, @@ -4039,13 +4039,13 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, +/obj/item/clipboard, +/obj/item/folder/blue, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/stamp/captain, +/obj/item/melee/chainofcommand, +/obj/item/stamp/captain, /turf/open/floor/carpet, /area/crew_quarters/heads/captain/private) "agS" = ( @@ -4133,7 +4133,7 @@ /area/bridge) "agX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -4206,7 +4206,7 @@ /area/ai_monitored/turret_protected/ai) "ahd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /obj/item/device/radio/intercom{ broadcasting = 1; frequency = 1447; @@ -4264,8 +4264,8 @@ "ahi" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/door/window/brigdoor/eastleft{ dir = 1; name = "Access Desk"; @@ -4543,8 +4543,8 @@ /area/security/detectives_office) "ahD" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/structure/cable/white{ d1 = 2; @@ -4584,10 +4584,10 @@ "ahF" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32 }, -/obj/item/weapon/reagent_containers/food/drinks/flask/det, +/obj/item/reagent_containers/food/drinks/flask/det, /obj/structure/extinguisher_cabinet{ pixel_x = 24; pixel_y = -26 @@ -4663,8 +4663,8 @@ pixel_y = -24 }, /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, -/obj/item/weapon/lighter, +/obj/item/storage/fancy/donut_box, +/obj/item/lighter, /turf/open/floor/wood, /area/crew_quarters/heads/captain/private) "ahN" = ( @@ -4689,7 +4689,7 @@ /area/bridge) "ahP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4728,12 +4728,12 @@ /area/ai_monitored/turret_protected/ai) "ahV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/aiModule/core/full/drone{ +/obj/item/aiModule/core/full/drone{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/aiModule/core/full/reporter, -/obj/item/weapon/aiModule/core/full/liveandletlive{ +/obj/item/aiModule/core/full/reporter, +/obj/item/aiModule/core/full/liveandletlive{ pixel_x = -3; pixel_y = -3 }, @@ -4790,8 +4790,8 @@ }) "aic" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/newscaster{ pixel_x = 32 }, @@ -4878,17 +4878,17 @@ }) "aim" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -5204,7 +5204,7 @@ }, /area/quartermaster/storage) "aiK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/brown{ @@ -5237,11 +5237,11 @@ /area/quartermaster/storage) "aiN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/multitool{ pixel_x = 6 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -5253,7 +5253,7 @@ /obj/machinery/newscaster{ pixel_y = 32 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 5 @@ -5270,11 +5270,11 @@ /area/shuttle/supply) "aiR" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser, /obj/machinery/light{ dir = 8 }, @@ -5294,9 +5294,9 @@ /area/security/brig) "aiT" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/gun/energy/ionrifle, /obj/item/clothing/suit/armor/laserproof, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/temperature/security, /obj/machinery/atmospherics/components/unary/vent_scrubber/on, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5313,8 +5313,8 @@ /area/security/brig) "aiV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -5421,7 +5421,7 @@ /turf/open/floor/plating, /area/security/brig) "ajd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -5801,7 +5801,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 10 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -5903,19 +5903,19 @@ }) "ajQ" = ( /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/ore/iron, +/obj/item/ore/iron, /turf/open/floor/plating/astplate, /area/ruin/unpowered{ name = "Asteroid" }) "ajR" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -5959,12 +5959,12 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -5990,8 +5990,8 @@ /area/security/brig) "ajV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/item/device/assembly/flash/handheld, /obj/item/key/security, @@ -7012,7 +7012,7 @@ name = "Primary Hallway" }) "alm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -7079,7 +7079,7 @@ name = "Primary Hallway" }) "als" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light{ @@ -7191,14 +7191,14 @@ dir = 4; pixel_x = -32 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, +/obj/item/stamp/denied{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/machinery/camera{ c_tag = "Cargo Bay Entrance"; dir = 4; @@ -7263,16 +7263,16 @@ name = "Asteroid" }) "alH" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = 3; pixel_y = -1 }, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 6; pixel_y = -2 }, @@ -7435,7 +7435,7 @@ "alT" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -7670,8 +7670,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/cable/white{ d1 = 4; d2 = 8; @@ -7722,11 +7722,11 @@ }) "ams" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/stack/cable_coil/white, /obj/item/device/multitool, /obj/effect/decal/cleanable/dirt, @@ -7795,7 +7795,7 @@ pixel_y = -24 }, /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -7826,7 +7826,7 @@ }, /obj/item/stack/packageWrap, /obj/item/stack/cable_coil/white, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/brown{ icon_state = "brown"; dir = 6 @@ -7867,13 +7867,13 @@ name = "Asteroid" }) "amH" = ( -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 6 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = -3 }, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /obj/structure/table/reinforced, /obj/machinery/airalarm{ dir = 4; @@ -8021,7 +8021,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -8044,7 +8044,7 @@ /area/teleporter) "amV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio, /obj/item/device/radio, /obj/item/device/gps, @@ -8162,7 +8162,7 @@ }) "anh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio, /obj/item/device/radio, /obj/item/device/flashlight/flare, @@ -8224,8 +8224,8 @@ "anm" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 1; name = "Cargo Desk"; @@ -8308,7 +8308,7 @@ /area/quartermaster/miningdock) "anu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -8328,9 +8328,9 @@ "anw" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/stripes/line{ dir = 5 @@ -8345,8 +8345,8 @@ /turf/closed/wall/r_wall, /area/engine/atmos) "any" = ( -/obj/item/weapon/storage/box/firingpins, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -8357,8 +8357,8 @@ name = "Security RC"; pixel_x = -32 }, -/obj/item/weapon/gun/energy/e_gun/dragnet, -/obj/item/weapon/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, +/obj/item/gun/energy/e_gun/dragnet, /turf/open/floor/plasteel/red/corner{ dir = 8 }, @@ -8412,8 +8412,8 @@ "anB" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 8; name = "Security Desk"; @@ -8449,7 +8449,7 @@ }, /area/security/brig) "anF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8538,7 +8538,7 @@ pixel_y = 1 }, /obj/structure/closet/crate/engineering, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -8904,12 +8904,12 @@ /turf/open/floor/engine/vacuum, /area/engine/atmos) "aos" = ( -/obj/item/weapon/storage/box/teargas{ +/obj/item/storage/box/teargas{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/handcuffs, +/obj/item/storage/box/flashbangs{ pixel_x = -3; pixel_y = -3 }, @@ -9076,8 +9076,8 @@ }) "aoF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/machinery/airalarm{ dir = 4; @@ -9142,9 +9142,9 @@ /area/maintenance/port/central) "aoL" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -9905,7 +9905,7 @@ dir = 4 }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plasteel/yellow/side{ dir = 5 }, @@ -10048,12 +10048,12 @@ /area/maintenance/starboard/central) "aqc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/wrench, +/obj/item/tank/jetpack/carbondioxide, +/obj/item/wrench, /obj/effect/decal/cleanable/dirt, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -10194,8 +10194,8 @@ /obj/machinery/newscaster{ pixel_y = -32 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hallway/primary/central{ @@ -10242,13 +10242,13 @@ }) "aqq" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/shovel, +/obj/item/pickaxe, +/obj/item/storage/toolbox/emergency, +/obj/item/shovel, /obj/machinery/camera{ c_tag = "Mining Dock"; dir = 4; @@ -10297,8 +10297,8 @@ /obj/item/device/flashlight, /obj/item/device/flashlight/flare, /obj/item/device/flashlight/flare, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/crowbar/red, +/obj/item/stock_parts/cell/high, +/obj/item/crowbar/red, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) @@ -10475,7 +10475,7 @@ }, /area/security/brig) "aqP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10498,8 +10498,8 @@ "aqQ" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, +/obj/item/clipboard, +/obj/item/folder/red, /obj/item/toy/figure/hos, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/red, @@ -10507,8 +10507,8 @@ "aqR" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red, /area/security/brig) "aqS" = ( @@ -10529,8 +10529,8 @@ }) "aqT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/weldingtool, +/obj/item/storage/belt/utility, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, /obj/machinery/power/apc{ @@ -10560,8 +10560,8 @@ /area/storage/primary) "aqV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/gps, /obj/machinery/light{ dir = 1 @@ -10728,8 +10728,8 @@ dir = 8; pixel_x = -24 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/quartermaster/miningdock) @@ -10742,7 +10742,7 @@ name = "Mining Dock RC"; pixel_y = -32 }, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/toy/figure/miner, /turf/open/floor/plasteel/brown{ icon_state = "brown"; @@ -10783,19 +10783,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -10840,8 +10840,8 @@ }, /obj/structure/closet/crate/internals, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/pickaxe/emergency, -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, +/obj/item/pickaxe/emergency, /obj/effect/turf_decal/delivery, /obj/machinery/light/small{ dir = 8 @@ -11224,8 +11224,8 @@ "arO" = ( /obj/machinery/door/firedoor, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 8; name = "Security Desk"; @@ -11425,7 +11425,7 @@ name = "Atrium" }) "ase" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -11456,7 +11456,7 @@ name = "Atrium" }) "asi" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/redyellow, @@ -11717,7 +11717,7 @@ /obj/item/clothing/under/rank/security/grey, /obj/item/clothing/under/rank/security/grey, /obj/item/clothing/under/rank/security/grey, -/obj/item/weapon/storage/backpack/satchel/sec, +/obj/item/storage/backpack/satchel/sec, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -11798,7 +11798,7 @@ /area/security/brig) "asO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/firealarm{ dir = 1; @@ -11831,7 +11831,7 @@ /area/security/brig) "asQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /obj/machinery/status_display{ pixel_y = -32 @@ -11942,7 +11942,7 @@ "asW" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -11956,7 +11956,7 @@ /area/storage/primary) "asX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/machinery/atmospherics/pipe/manifold/supply/hidden, /obj/structure/cable/white{ @@ -12434,7 +12434,7 @@ /area/storage/primary) "atQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -12444,7 +12444,7 @@ "atR" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, @@ -12479,19 +12479,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -12609,7 +12609,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -12630,15 +12630,15 @@ name = "Atrium" }) "auc" = ( -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar{ name = "Atrium" @@ -12658,11 +12658,11 @@ }) "auf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -12719,7 +12719,7 @@ /area/crew_quarters/bar) "aul" = ( /obj/structure/closet/gmcloset, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -13167,7 +13167,7 @@ /area/storage/primary) "auX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -13211,7 +13211,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ @@ -13317,8 +13317,8 @@ /area/crew_quarters/bar) "avo" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/beanbag, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/storage/box/beanbag, +/obj/item/gun/ballistic/revolver/doublebarrel, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -13600,8 +13600,8 @@ "avO" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -13622,7 +13622,7 @@ }, /obj/item/clothing/shoes/jackboots, /obj/item/device/radio, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance{ @@ -13640,7 +13640,7 @@ "avQ" = ( /obj/structure/table, /obj/item/clothing/under/rank/security, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -13728,7 +13728,7 @@ dir = 4; pixel_x = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -13738,8 +13738,8 @@ }) "avY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -13866,7 +13866,7 @@ }) "awl" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/bag/tray, +/obj/item/storage/bag/tray, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar{ name = "Atrium" @@ -13899,7 +13899,7 @@ }) "awp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, @@ -14225,7 +14225,7 @@ /area/crew_quarters/dorms) "awR" = ( /obj/structure/table/wood, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -14265,7 +14265,7 @@ }) "awV" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -14300,9 +14300,9 @@ /area/crew_quarters/bar) "awZ" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/vault{ dir = 8 @@ -14328,7 +14328,7 @@ /area/crew_quarters/bar) "axc" = ( /obj/structure/closet/gmcloset, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/sheet/glass{ amount = 30 }, @@ -14372,9 +14372,9 @@ }) "axg" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -14470,7 +14470,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -14545,7 +14545,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "axy" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/clothing/head/welding, /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, @@ -14583,8 +14583,8 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/newscaster{ pixel_y = 32 }, @@ -14627,8 +14627,8 @@ }) "axD" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = -26 @@ -14713,15 +14713,15 @@ /area/maintenance/port/central) "axM" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -14804,7 +14804,7 @@ /area/crew_quarters/bar) "axT" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/bartender, /obj/machinery/light{ dir = 4 @@ -15029,15 +15029,15 @@ "ayq" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/caution{ dir = 8 }, /area/engine/atmos) "ayr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/t_scanner, /obj/structure/cable/white{ d1 = 2; @@ -15117,7 +15117,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/bedsheet/blue, +/obj/item/bedsheet/blue, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "ayB" = ( @@ -15128,7 +15128,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/bedsheet/red, +/obj/item/bedsheet/red, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayD" = ( @@ -15177,7 +15177,7 @@ /area/crew_quarters/theatre) "ayI" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -15227,13 +15227,13 @@ name = "Atrium" }) "ayN" = ( -/obj/item/weapon/storage/fancy/cigarettes/cigars{ +/obj/item/storage/fancy/cigarettes/cigars{ pixel_y = 6 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba{ +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ pixel_y = 3 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigars/havana, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -15326,8 +15326,8 @@ pixel_x = -26; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/machinery/airalarm{ pixel_y = 23 @@ -15344,7 +15344,7 @@ }) "ayX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/status_display{ pixel_y = 32 @@ -15464,7 +15464,7 @@ /area/shuttle/escape) "azi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -15672,7 +15672,7 @@ /area/crew_quarters/dorms) "azE" = ( /obj/structure/table/wood, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /obj/item/clothing/head/witchwig, /turf/open/floor/plasteel/vault{ dir = 5 @@ -15680,8 +15680,8 @@ /area/crew_quarters/theatre) "azF" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -15741,7 +15741,7 @@ }) "azK" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -15939,7 +15939,7 @@ /area/shuttle/escape) "aAf" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -16327,15 +16327,15 @@ name = "Atrium" }) "aAP" = ( -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/effect/landmark/lightsout, /obj/structure/cable/white{ d1 = 4; @@ -16593,7 +16593,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aBl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -16752,7 +16752,7 @@ /turf/open/floor/plating, /area/engine/atmos) "aBD" = ( -/obj/item/weapon/tank/internals/emergency_oxygen{ +/obj/item/tank/internals/emergency_oxygen{ pixel_x = -6 }, /obj/item/clothing/mask/breath, @@ -16959,7 +16959,7 @@ /area/maintenance/port/central) "aBV" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/clown{ pixel_x = 3; pixel_y = 3 @@ -17019,7 +17019,7 @@ }) "aBZ" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers, +/obj/item/reagent_containers/food/snacks/cheesiehonkers, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar{ name = "Atrium" @@ -17028,7 +17028,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/redyellow, @@ -17122,7 +17122,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/radio, /obj/effect/turf_decal/stripes/line{ dir = 2 @@ -17447,8 +17447,8 @@ /area/engine/atmos) "aCK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/poddoor/preopen{ id = "atmoslock"; name = "Atmospherics Lockdown Blast door" @@ -17503,16 +17503,16 @@ }) "aCN" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) "aCO" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/neutral, /area/crew_quarters/dorms) @@ -17580,7 +17580,7 @@ }) "aCV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/chef, /obj/machinery/firealarm{ dir = 8; @@ -17659,8 +17659,8 @@ }) "aDd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -17751,7 +17751,7 @@ }, /area/shuttle/escape) "aDm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -17881,7 +17881,7 @@ name = "Primary Hallway" }) "aDB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -17893,7 +17893,7 @@ }) "aDC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/central{ @@ -17931,7 +17931,7 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/bedsheet/brown, +/obj/item/bedsheet/brown, /turf/open/floor/wood, /area/crew_quarters/dorms) "aDI" = ( @@ -17939,20 +17939,20 @@ /obj/machinery/newscaster{ pixel_x = 32 }, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "aDJ" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /obj/structure/mirror{ pixel_x = -28 }, @@ -18061,14 +18061,14 @@ id = "kitchencounter"; name = "Kitchen Counter Shutters" }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -18139,14 +18139,14 @@ }) "aEa" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/central{ name = "Primary Hallway" }) "aEb" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/bot, @@ -18234,19 +18234,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -18573,7 +18573,7 @@ }, /area/crew_quarters/dorms) "aEL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -18652,7 +18652,7 @@ /area/crew_quarters/dorms) "aES" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/baguette, +/obj/item/reagent_containers/food/snacks/baguette, /obj/structure/sign/poster/contraband/random{ pixel_x = -32 }, @@ -18665,7 +18665,7 @@ /area/crew_quarters/theatre) "aET" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /obj/item/device/flashlight/lamp/bananalamp{ pixel_y = 5 }, @@ -18716,7 +18716,7 @@ }) "aEX" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar{ name = "Atrium" @@ -18728,8 +18728,8 @@ id = "kitchencounter"; name = "Kitchen Counter Shutters" }, -/obj/item/weapon/storage/bag/tray, -/obj/item/weapon/kitchen/fork, +/obj/item/storage/bag/tray, +/obj/item/kitchen/fork, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/crew_quarters/kitchen) @@ -18740,7 +18740,7 @@ "aFa" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/apron/chef, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -18748,8 +18748,8 @@ /area/crew_quarters/kitchen) "aFb" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/condiment/enzyme{ pixel_y = 5 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -18765,14 +18765,14 @@ /area/crew_quarters/kitchen) "aFc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -18958,7 +18958,7 @@ "aFv" = ( /obj/structure/closet/crate, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/item/stack/sheet/mineral/plasma{ amount = 20 }, @@ -19254,7 +19254,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/camera{ @@ -19268,7 +19268,7 @@ }) "aFO" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -19292,7 +19292,7 @@ id = "kitchencounter"; name = "Kitchen Counter Shutters" }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/disposalpipe/segment, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -19582,7 +19582,7 @@ name = "Primary Hallway" }) "aGu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/yellow/corner, @@ -19591,8 +19591,8 @@ }) "aGv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -19641,7 +19641,7 @@ name = "old sink"; pixel_y = 28 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -19649,7 +19649,7 @@ "aGB" = ( /obj/structure/mopbucket, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/mop, +/obj/item/mop, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -19832,15 +19832,15 @@ name = "Atrium" }) "aGO" = ( -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -19916,8 +19916,8 @@ pixel_y = -26; req_access_txt = "28" }, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/item/clothing/head/chefhat, /obj/machinery/light, /turf/open/floor/plasteel/vault{ @@ -20011,7 +20011,7 @@ pixel_y = 24; req_access_txt = "10" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -20223,7 +20223,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, @@ -20304,8 +20304,8 @@ /area/engine/engineering) "aHz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/poddoor/preopen{ id = "ceblast"; name = "Engineering Lockdown Shutters" @@ -20593,13 +20593,13 @@ }) "aHT" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/coffee, +/obj/item/reagent_containers/food/drinks/coffee, /turf/open/floor/plasteel/redyellow, /area/crew_quarters/bar{ name = "Atrium" }) "aHU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -20643,15 +20643,15 @@ /area/maintenance/starboard/central) "aHY" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/central{ name = "Primary Hallway" }) "aHZ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -20886,8 +20886,8 @@ /obj/item/stack/rods{ amount = 50 }, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/wrench, +/obj/item/storage/box/lights/mixed, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -20922,8 +20922,8 @@ "aIv" = ( /obj/structure/table/reinforced, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, @@ -21046,16 +21046,16 @@ /turf/open/floor/plasteel, /area/maintenance/port/central) "aIG" = ( -/obj/item/weapon/crowbar/red, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/hatchet, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 12; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/closet/crate/hydroponics, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, @@ -21156,8 +21156,8 @@ id = "hydrodesk"; name = "Hydroponics Counter Shutters" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -21284,7 +21284,7 @@ }) "aJa" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/firealarm{ dir = 8; pixel_x = -24 @@ -21322,7 +21322,7 @@ /turf/open/floor/plasteel/neutral/side, /area/shuttle/escape) "aJg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -21470,7 +21470,7 @@ /turf/open/floor/plasteel, /area/engine/engineering) "aJr" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/machinery/atmospherics/pipe/simple/scrubbers/visible{ dir = 6 }, @@ -21573,9 +21573,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/grenade/chem_grenade/metalfoam, +/obj/item/crowbar, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/grenade/chem_grenade/metalfoam, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -21638,18 +21638,18 @@ /area/engine/engineering) "aJI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/mousetraps{ +/obj/item/storage/box/mousetraps{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/mousetraps, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/storage/box/mousetraps, +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, -/obj/item/weapon/restraints/legcuffs/beartrap{ +/obj/item/restraints/legcuffs/beartrap{ icon_state = "beartrap0" }, /obj/effect/decal/cleanable/cobweb, @@ -21672,7 +21672,7 @@ "aJJ" = ( /obj/vehicle/janicart, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/bag/trash, +/obj/item/storage/bag/trash, /obj/item/key/janitor, /obj/machinery/power/apc{ cell_type = 5000; @@ -21795,9 +21795,9 @@ id = "hydrodesk"; name = "Hydroponics Counter Shutters" }, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/pumpkin, +/obj/item/reagent_containers/food/snacks/grown/grapes, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -21936,8 +21936,8 @@ "aKi" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 2; name = "Cargo Desk"; @@ -22286,7 +22286,7 @@ icon_state = "4-8" }, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko, +/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, @@ -22299,8 +22299,8 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ d1 = 4; @@ -22311,13 +22311,13 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/rcl/pre_loaded, -/obj/item/weapon/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, +/obj/item/twohanded/rcl/pre_loaded, /turf/open/floor/plasteel/neutral, /area/engine/engineering) "aKM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, +/obj/item/folder/yellow, /obj/item/device/lightreplacer, /obj/structure/cable/white{ d1 = 1; @@ -22366,10 +22366,10 @@ "aKP" = ( /obj/structure/table/reinforced, /obj/item/clothing/gloves/color/orange, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/reagent_containers/spray/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /obj/machinery/light/small{ dir = 8 }, @@ -22452,16 +22452,16 @@ /area/hydroponics) "aKX" = ( /obj/structure/table/glass, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/hatchet, -/obj/item/weapon/storage/bag/plants/portaseeder, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/crowbar/red, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/hatchet, +/obj/item/storage/bag/plants/portaseeder, +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 12; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -22471,20 +22471,20 @@ desc = "Used to grind things up into raw materials and liquids."; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) "aKZ" = ( /obj/structure/table/glass, -/obj/item/weapon/watertank, -/obj/item/weapon/reagent_containers/spray/pestspray, -/obj/item/weapon/grenade/chem_grenade/antiweed, -/obj/item/weapon/grenade/chem_grenade/antiweed, +/obj/item/watertank, +/obj/item/reagent_containers/spray/pestspray, +/obj/item/grenade/chem_grenade/antiweed, +/obj/item/grenade/chem_grenade/antiweed, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hydroponics) @@ -22508,15 +22508,15 @@ /area/hydroponics) "aLc" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/spray/pestspray, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/pestspray, +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 16; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/reagent_containers/food/snacks/grown/wheat, /obj/item/seeds/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/hydroponics) @@ -22669,12 +22669,12 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -4; pixel_y = 3 }, @@ -22682,7 +22682,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ @@ -22746,7 +22746,7 @@ /obj/item/stack/sheet/plasteel{ amount = 20 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/decal/cleanable/dirt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 @@ -22958,7 +22958,7 @@ d2 = 4; icon_state = "1-4" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -22968,11 +22968,11 @@ /area/engine/engineering) "aMe" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/lightreplacer, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, @@ -23008,9 +23008,9 @@ dir = 4; pixel_x = 12 }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/mop, +/obj/item/mop, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -23126,7 +23126,7 @@ /turf/open/floor/grass, /area/hydroponics) "aMt" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light{ @@ -23197,7 +23197,7 @@ /turf/open/floor/plating, /area/maintenance/starboard/central) "aMy" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/bot, @@ -23206,7 +23206,7 @@ name = "Primary Hallway" }) "aMz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -23271,8 +23271,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -23281,8 +23281,8 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -23297,8 +23297,8 @@ /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "aMI" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -23624,7 +23624,7 @@ }) "aNj" = ( /obj/structure/reagent_dispensers/watertank, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/firealarm{ @@ -23663,8 +23663,8 @@ "aNn" = ( /obj/structure/rack, /obj/item/clothing/gloves/color/black, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/machinery/light/small, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line{ @@ -23691,9 +23691,9 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/paper/guides/jobs/hydroponics, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/storage/box/syringes, +/obj/item/paper/guides/jobs/hydroponics, /obj/item/toy/figure/botanist, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/bot, @@ -23876,14 +23876,14 @@ }) "aNG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, +/obj/item/stamp/denied{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/machinery/airalarm{ dir = 4; pixel_x = -23 @@ -23942,9 +23942,9 @@ }) "aNL" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/hand_labeler_refill, /obj/structure/sign/nosmoking_2{ pixel_x = -32 @@ -23965,14 +23965,14 @@ /area/shuttle/escape) "aNN" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -5 }, @@ -23982,7 +23982,7 @@ "aNO" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, @@ -23991,14 +23991,14 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aNP" = ( -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -24011,17 +24011,17 @@ /area/shuttle/escape) "aNQ" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "aNR" = ( -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/structure/table/reinforced, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "aNS" = ( -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -24244,7 +24244,7 @@ /turf/closed/wall, /area/hallway/primary/central) "aOm" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -24279,7 +24279,7 @@ }, /area/hallway/primary/central) "aOq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/redyellow/side{ @@ -24335,7 +24335,7 @@ /obj/machinery/newscaster{ pixel_x = -32 }, -/obj/item/weapon/paper/monitorkey, +/obj/item/paper/monitorkey, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -25177,7 +25177,7 @@ }) "aPy" = ( /obj/structure/table, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/hallway/primary/central{ @@ -25191,9 +25191,9 @@ "aPA" = ( /obj/effect/decal/cleanable/dirt, /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase, -/obj/item/weapon/restraints/handcuffs, -/obj/item/weapon/grenade/smokebomb, +/obj/item/storage/secure/briefcase, +/obj/item/restraints/handcuffs, +/obj/item/grenade/smokebomb, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/starboard) @@ -25385,7 +25385,7 @@ /area/maintenance/port) "aPT" = ( /obj/structure/rack, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small, @@ -25431,7 +25431,7 @@ name = "Primary Hallway" }) "aPX" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -25734,7 +25734,7 @@ name = "Primary Hallway" }) "aQA" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -25752,12 +25752,12 @@ }) "aQB" = ( /obj/structure/table/wood, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/crowbar/red, +/obj/item/book/manual/wiki/security_space_law{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/detective, +/obj/item/book/manual/detective, /obj/item/device/camera/detective, /turf/open/floor/plasteel/vault{ dir = 5 @@ -26052,8 +26052,8 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/medical/chemistry) @@ -26126,8 +26126,8 @@ "aRt" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/door/window/southleft{ name = "Research Lab Desk"; req_access_txt = "7" @@ -26425,8 +26425,8 @@ /area/library) "aRU" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -26459,11 +26459,11 @@ /area/library) "aRY" = ( /obj/structure/table/wood, -/obj/item/weapon/dice/d20{ +/obj/item/dice/d20{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/dice/d10{ +/obj/item/dice/d10{ pixel_x = -3 }, /obj/machinery/firealarm{ @@ -26573,7 +26573,7 @@ d2 = 2; icon_state = "0-2" }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -26666,13 +26666,13 @@ icon_state = "1-2" }, /obj/structure/table, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = -6 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_x = 6 }, -/obj/item/weapon/disk/tech_disk{ +/obj/item/disk/tech_disk{ pixel_y = 6 }, /obj/item/toy/figure/scientist, @@ -26805,11 +26805,11 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/photocopier, -/obj/item/weapon/newspaper{ +/obj/item/newspaper{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /turf/open/floor/plating, /area/maintenance/starboard) "aSJ" = ( @@ -26821,13 +26821,13 @@ /area/maintenance/starboard) "aSK" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift{ +/obj/item/storage/fancy/cigarettes/cigpack_uplift{ pixel_x = 6 }, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_carp{ +/obj/item/storage/fancy/cigarettes/cigpack_carp{ pixel_x = -3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plating, /area/maintenance/starboard) "aSL" = ( @@ -26880,7 +26880,7 @@ /area/engine/engineering) "aSR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -26896,7 +26896,7 @@ /area/engine/engineering) "aST" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/flashlight, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -26950,10 +26950,10 @@ /area/engine/engineering) "aSY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/tank/internals/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = -5 }, -/obj/item/weapon/tank/internals/emergency_oxygen/engi{ +/obj/item/tank/internals/emergency_oxygen/engi{ pixel_x = 5 }, /obj/item/device/geiger_counter, @@ -27007,7 +27007,7 @@ /area/library) "aTf" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -27041,11 +27041,11 @@ /area/library) "aTj" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/effect/decal/cleanable/dirt, /obj/machinery/airalarm{ dir = 4; @@ -27156,8 +27156,8 @@ "aTv" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "chemistbot"; name = "Chemistry Privacy Shutters" @@ -27196,7 +27196,7 @@ /turf/open/floor/plasteel/grimy, /area/hallway/primary/central) "aTA" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18" }, /obj/machinery/camera{ @@ -27212,7 +27212,7 @@ /area/hallway/primary/central) "aTC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/grimy, /area/hallway/primary/central) "aTD" = ( @@ -27229,8 +27229,8 @@ "aTF" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/door/window/southleft{ dir = 4; name = "Research Lab Desk"; @@ -27268,12 +27268,12 @@ /area/science/lab) "aTK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/stock_parts/matter_bin{ +/obj/item/stock_parts/matter_bin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, /obj/effect/turf_decal/stripes/line{ dir = 9 }, @@ -27410,15 +27410,15 @@ /area/maintenance/starboard) "aTU" = ( /obj/structure/table/wood, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/poster/random_contraband{ +/obj/item/poster/random_contraband{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/poster/random_contraband, +/obj/item/poster/random_contraband, /turf/open/floor/plating, /area/maintenance/starboard) "aTV" = ( @@ -27716,13 +27716,13 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/scanning_module{ +/obj/item/stock_parts/scanning_module{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_x = 28 @@ -27798,8 +27798,8 @@ /area/maintenance/starboard) "aUL" = ( /obj/structure/table/wood, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/firelock, +/obj/item/electronics/airlock, /obj/machinery/light/small{ dir = 8 }, @@ -27933,8 +27933,8 @@ /area/library) "aVb" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/light{ dir = 4 }, @@ -28021,11 +28021,11 @@ /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, /obj/item/stack/sheet/mineral/plasma, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/chemistry) @@ -28126,7 +28126,7 @@ /area/science/lab) "aVv" = ( /obj/machinery/r_n_d/circuit_imprinter, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/effect/turf_decal/stripes/line{ dir = 6 @@ -28138,11 +28138,11 @@ /area/science/lab) "aVx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, +/obj/item/folder/white, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -28281,7 +28281,7 @@ /area/maintenance/port) "aVN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/bag/books, +/obj/item/storage/bag/books, /obj/item/device/taperecorder, /obj/machinery/status_display{ pixel_x = -32 @@ -28344,9 +28344,9 @@ /area/library) "aVX" = ( /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/twentythreeXtwentythree, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, @@ -28421,12 +28421,12 @@ /area/medical/medbay/zone3) "aWe" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/firealarm{ dir = 4; pixel_x = 24 @@ -28438,14 +28438,14 @@ /area/medical/medbay/zone3) "aWf" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/glass/beaker/large{ +/obj/item/folder/white, +/obj/item/reagent_containers/glass/beaker/large{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 3 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/chemistry) @@ -28486,10 +28486,10 @@ pixel_y = 3 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/chemistry) @@ -28505,7 +28505,7 @@ /area/medical/chemistry) "aWj" = ( /obj/structure/table/glass, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/chemist, /obj/machinery/light_switch{ pixel_x = 24; @@ -28523,7 +28523,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/whitepurple/corner{ dir = 4 @@ -28628,9 +28628,9 @@ /area/maintenance/starboard) "aWw" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/airlock, +/obj/item/clipboard, +/obj/item/electronics/airalarm, +/obj/item/electronics/airlock, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/starboard) @@ -28638,15 +28638,15 @@ /obj/structure/table/wood, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/circuitboard/machine/microwave, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/circuitboard/machine/microwave, /obj/effect/decal/cleanable/dirt, /turf/open/floor/wood, /area/maintenance/starboard) "aWy" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/item/device/taperecorder, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -28802,7 +28802,7 @@ /area/medical/chemistry) "aWP" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/chips, +/obj/item/reagent_containers/food/snacks/chips, /turf/open/floor/plasteel/grimy, /area/hallway/primary/central) "aWQ" = ( @@ -28818,7 +28818,7 @@ /turf/open/floor/plasteel/grimy, /area/hallway/primary/central) "aWR" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -28843,8 +28843,8 @@ /area/hallway/primary/central) "aWT" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/grimy, /area/hallway/primary/central) "aWU" = ( @@ -28973,12 +28973,12 @@ /area/library) "aXf" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/blue{ +/obj/item/folder, +/obj/item/pen/blue{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/black, /area/library) @@ -29012,8 +29012,8 @@ /area/library) "aXl" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Library 1"; dir = 8 @@ -29022,11 +29022,11 @@ /area/library) "aXm" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -29093,7 +29093,7 @@ }, /area/medical/medbay/zone3) "aXu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -29288,8 +29288,8 @@ /area/science/research) "aXI" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/wrench, +/obj/item/clipboard, +/obj/item/wrench, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -29352,16 +29352,16 @@ /area/library) "aXO" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ pixel_x = -3; pixel_y = -3 }, @@ -29385,7 +29385,7 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/storage/backpack/satchel/med, +/obj/item/storage/backpack/satchel/med, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/medical/medbay/zone3) @@ -29442,15 +29442,15 @@ /area/medical/medbay/zone3) "aXW" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = -6; pixel_y = 6 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone{ +/obj/item/reagent_containers/glass/beaker/cryoxadone{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/pill_bottle/mannitol, +/obj/item/storage/pill_bottle/mannitol, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -29619,7 +29619,7 @@ /turf/open/floor/plasteel/whitepurple/corner, /area/science/research) "aYp" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -29732,7 +29732,7 @@ /area/maintenance/starboard) "aYw" = ( /obj/structure/destructible/cult/tome, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /obj/machinery/light/small{ dir = 1 }, @@ -29858,16 +29858,16 @@ /area/maintenance/port) "aYG" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/fire{ pixel_x = -3; pixel_y = -3 }, @@ -30117,7 +30117,7 @@ /area/maintenance/port) "aZp" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted, +/obj/item/gun/ballistic/automatic/toy/pistol/unrestricted, /turf/open/floor/plating, /area/maintenance/port) "aZq" = ( @@ -30136,11 +30136,11 @@ /area/maintenance/port) "aZr" = ( /obj/structure/rack, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/cobweb/cobweb2, /turf/open/floor/plasteel/vault{ @@ -30167,8 +30167,8 @@ /area/maintenance/port) "aZu" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/status_display{ pixel_y = -32 }, @@ -30179,7 +30179,7 @@ /area/library) "aZv" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, +/obj/item/folder, /obj/item/device/laser_pointer{ pixel_x = 3 }, @@ -30252,16 +30252,16 @@ /area/maintenance/port) "aZC" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute{ pixel_x = -3; pixel_y = -3 }, @@ -30572,12 +30572,12 @@ /area/science/robotics/lab) "bab" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/screwdriver{ +/obj/item/storage/toolbox/electrical, +/obj/item/screwdriver{ pixel_y = 5 }, /obj/item/device/multitool, @@ -30605,10 +30605,10 @@ /area/science/robotics/lab) "bad" = ( /obj/structure/rack, -/obj/item/weapon/book/manual/robotics_cyborgs, -/obj/item/weapon/storage/belt/utility/full, -/obj/item/weapon/circuitboard/mecha/ripley/main, -/obj/item/weapon/circuitboard/mecha/ripley/peripherals, +/obj/item/book/manual/robotics_cyborgs, +/obj/item/storage/belt/utility/full, +/obj/item/circuitboard/mecha/ripley/main, +/obj/item/circuitboard/mecha/ripley/peripherals, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/machinery/light{ @@ -30653,7 +30653,7 @@ /turf/open/floor/plasteel, /area/science/robotics/lab) "bag" = ( -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /obj/item/device/assembly/prox_sensor{ pixel_x = 5; pixel_y = 7 @@ -30773,16 +30773,16 @@ /area/maintenance/port) "bat" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 6; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = -3; pixel_y = -3 }, @@ -30797,12 +30797,12 @@ /area/medical/medbay/zone3) "bau" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/gun/syringe, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe, /obj/machinery/light, /obj/structure/noticeboard{ dir = 1; @@ -30947,15 +30947,15 @@ icon_state = "1-2" }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar, -/obj/item/weapon/restraints/handcuffs, +/obj/item/crowbar, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/red/side{ dir = 1 }, /area/hallway/primary/central) "baK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/radio, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 @@ -31154,7 +31154,7 @@ /obj/item/stack/sheet/plasteel{ amount = 15 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/glasses/welding, /obj/structure/table/reinforced, /obj/machinery/airalarm{ @@ -31182,8 +31182,8 @@ /area/maintenance/port) "bbd" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/maintenance/port) "bbe" = ( @@ -31272,7 +31272,7 @@ /area/maintenance/port) "bbl" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/syndicateballoon, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ @@ -31328,13 +31328,13 @@ /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/zone3) "bbr" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/whiteblue/corner, /area/medical/medbay/zone3) "bbs" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -31718,8 +31718,8 @@ /turf/open/floor/plasteel, /area/maintenance/port) "bcd" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; @@ -31748,7 +31748,7 @@ /obj/item/clothing/gloves/color/latex, /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -31774,8 +31774,8 @@ "bcj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, -/obj/item/weapon/reagent_containers/hypospray/medipen, +/obj/item/folder/white, +/obj/item/reagent_containers/hypospray/medipen, /obj/machinery/door/window/westleft{ dir = 2; name = "Medbay Desk"; @@ -31823,8 +31823,8 @@ /area/hallway/primary/central) "bcn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/side{ dir = 8 }, @@ -31946,7 +31946,7 @@ "bcD" = ( /obj/structure/rack, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/item/device/assembly/voice, /obj/item/clothing/head/welding, /obj/effect/spawner/lootdrop/maintenance, @@ -32058,7 +32058,7 @@ /area/maintenance/port) "bcT" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/head/welding, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ @@ -32079,8 +32079,8 @@ /turf/open/floor/plasteel, /area/maintenance/port) "bcU" = ( -/obj/item/weapon/circular_saw, -/obj/item/weapon/surgicaldrill{ +/obj/item/circular_saw, +/obj/item/surgicaldrill{ pixel_y = 5 }, /obj/structure/table/reinforced, @@ -32102,8 +32102,8 @@ /turf/open/floor/plasteel/blue, /area/medical/medbay/zone3) "bcX" = ( -/obj/item/weapon/scalpel, -/obj/item/weapon/cautery, +/obj/item/scalpel, +/obj/item/cautery, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 @@ -32192,8 +32192,8 @@ icon_state = "4-8" }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/machinery/door/window/brigdoor/southright{ dir = 8; name = "Security Desk"; @@ -32393,8 +32393,8 @@ dir = 8 }, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/cautery, +/obj/item/surgical_drapes, +/obj/item/cautery, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/science/robotics/lab) @@ -32412,8 +32412,8 @@ /area/science/robotics/lab) "bdy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/machinery/ai_status_display{ pixel_x = 32 }, @@ -32460,7 +32460,7 @@ /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -32468,7 +32468,7 @@ /area/maintenance/starboard) "bdD" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plating, /area/maintenance/port) "bdE" = ( @@ -32504,12 +32504,12 @@ /area/maintenance/port) "bdI" = ( /obj/structure/table/wood, -/obj/item/weapon/wrench, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/wrench, +/obj/item/storage/secure/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /obj/effect/decal/cleanable/dirt, /obj/machinery/light/small{ dir = 8 @@ -32716,11 +32716,11 @@ "bea" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/syringe, /obj/machinery/door/window/westleft{ name = "Medbay Desk"; req_access_txt = "5" @@ -32826,8 +32826,8 @@ /area/science/research) "bem" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/cell/high, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/cell_charger, /obj/item/device/radio/intercom{ name = "Station Intercom"; @@ -32885,10 +32885,10 @@ /area/science/robotics/lab) "ber" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 16 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/structure/sign/nosmoking_2{ pixel_y = -32 }, @@ -32900,9 +32900,9 @@ /area/science/robotics/lab) "bes" = ( /obj/structure/rack, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/decal/cleanable/dirt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, @@ -32924,7 +32924,7 @@ /area/maintenance/starboard) "beu" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle, +/obj/item/storage/pill_bottle, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, /area/maintenance/port) @@ -32942,17 +32942,17 @@ "bew" = ( /obj/structure/table/wood, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_x = 6 }, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_x = -6 }, -/obj/item/weapon/coin/iron{ +/obj/item/coin/iron{ icon_state = "coin_bananium_heads"; name = "arcade coin"; pixel_y = 6 @@ -32961,11 +32961,11 @@ /area/maintenance/port) "bex" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/syringe{ pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plasteel/vault{ dir = 8 @@ -32973,7 +32973,7 @@ /area/maintenance/port) "bey" = ( /obj/structure/table/wood, -/obj/item/weapon/newspaper, +/obj/item/newspaper, /obj/item/clothing/head/bowler, /obj/effect/decal/cleanable/dirt, /turf/open/floor/plating, @@ -33005,15 +33005,15 @@ /area/maintenance/port) "beC" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -33611,17 +33611,17 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/chapel/main) "bfw" = ( /obj/structure/bonfire, -/obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice{ +/obj/item/reagent_containers/food/drinks/bottle/orangejuice{ desc = "For the weary spacemen on their quest to rekindle the first plasma fire."; name = "Carton of Estus" }, -/obj/item/weapon/nullrod/claymore/glowing{ +/obj/item/nullrod/claymore/glowing{ desc = "Don't tell anyone you put any points into dex, though."; force = 10; name = "moonlight greatsword" @@ -34191,18 +34191,18 @@ /obj/machinery/hydroponics/soil, /obj/item/seeds/tea, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, /obj/effect/decal/cleanable/cobweb, /turf/open/floor/plating, /area/maintenance/starboard) "bgv" = ( /obj/machinery/biogenerator, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) "bgw" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/decal/cleanable/dirt, @@ -34216,7 +34216,7 @@ /turf/open/floor/plasteel, /area/maintenance/starboard) "bgy" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -34227,7 +34227,7 @@ /area/maintenance/starboard) "bgz" = ( /obj/machinery/seed_extractor, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -34235,8 +34235,8 @@ /obj/machinery/hydroponics/soil, /obj/item/seeds/poppy, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/food/snacks/grown/cherries, -/obj/item/weapon/shovel/spade, +/obj/item/reagent_containers/food/snacks/grown/cherries, +/obj/item/shovel/spade, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -34253,10 +34253,10 @@ /area/chapel/main) "bgC" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/spellbook/oneuse/smoke, -/obj/item/weapon/nullrod, +/obj/item/spellbook/oneuse/smoke, +/obj/item/nullrod, /obj/item/organ/heart, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater, +/obj/item/reagent_containers/food/drinks/bottle/holywater, /obj/machinery/light/small{ dir = 1 }, @@ -34374,15 +34374,15 @@ /area/chapel/main) "bgM" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy{ +/obj/item/reagent_containers/food/snacks/grown/poppy{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, /obj/structure/extinguisher_cabinet{ pixel_x = 24 }, @@ -34707,7 +34707,7 @@ /area/chapel/main) "bht" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/grimy, /area/chapel/main) @@ -34886,7 +34886,7 @@ /turf/open/floor/plasteel/arrival, /area/hallway/secondary/entry) "bhL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -34969,13 +34969,13 @@ "bhT" = ( /obj/machinery/hydroponics/soil, /obj/item/seeds/harebell, -/obj/item/weapon/reagent_containers/food/snacks/grown/watermelon, -/obj/item/weapon/cultivator, +/obj/item/reagent_containers/food/snacks/grown/watermelon, +/obj/item/cultivator, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) "bhU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -34987,8 +34987,8 @@ /area/maintenance/starboard) "bhV" = ( /obj/machinery/hydroponics/soil, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -35000,8 +35000,8 @@ /area/maintenance/starboard) "bhX" = ( /obj/machinery/hydroponics/soil, -/obj/item/weapon/reagent_containers/food/snacks/grown/tea, -/obj/item/weapon/hatchet, +/obj/item/reagent_containers/food/snacks/grown/tea, +/obj/item/hatchet, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -35009,7 +35009,7 @@ /obj/machinery/hydroponics/soil, /obj/item/seeds/tower, /obj/effect/decal/cleanable/dirt, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh, +/obj/item/reagent_containers/glass/bottle/nutrient/rh, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/maintenance/starboard) @@ -35165,11 +35165,11 @@ /area/chapel/main) "bin" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -35375,7 +35375,7 @@ /area/science/xenobiology) "biF" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /obj/machinery/light/small{ dir = 8 }, @@ -35704,13 +35704,13 @@ /area/chapel/main) "bjj" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/fourcolor, +/obj/item/folder, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/grimy, /area/chapel/main) "bjk" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/ai_status_display{ pixel_x = 32 }, @@ -35858,11 +35858,11 @@ /area/chapel/main) "bjA" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/candle_box{ +/obj/item/storage/fancy/candle_box{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/machinery/light{ dir = 4 }, @@ -35937,8 +35937,8 @@ /area/chapel/main) "bjK" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/structure/noticeboard{ desc = "A board for remembering the fallen of the station."; dir = 1; @@ -35949,8 +35949,8 @@ /area/chapel/main) "bjL" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/requests_console{ department = "Chapel Office"; departmentType = 0; @@ -35987,12 +35987,12 @@ /area/shuttle/arrival) "bjP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/extinguisher/mini, +/obj/item/storage/box/syringes, +/obj/item/extinguisher/mini, /obj/machinery/airalarm{ dir = 4; locked = 0; @@ -36012,8 +36012,8 @@ /area/science/xenobiology) "bjQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/machinery/status_display{ pixel_y = -32 }, @@ -36041,13 +36041,13 @@ /area/science/xenobiology) "bjS" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/stack/sheet/mineral/plasma{ amount = 5 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /obj/machinery/status_display{ pixel_y = -32 }, @@ -36174,19 +36174,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -36239,7 +36239,7 @@ /area/shuttle/arrival) "bke" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/camera{ c_tag = "Arrivals Suttle 1"; network = list("Labor") @@ -36252,11 +36252,11 @@ /obj/structure/extinguisher_cabinet{ pixel_y = 32 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -36335,7 +36335,7 @@ }, /area/shuttle/arrival) "bkq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -36356,7 +36356,7 @@ /turf/open/floor/plasteel, /area/shuttle/arrival) "bks" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -36370,7 +36370,7 @@ }, /area/shuttle/arrival) "bkt" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light{ @@ -36446,7 +36446,7 @@ /turf/open/floor/grass, /area/shuttle/arrival) "bkE" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -36468,7 +36468,7 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/arrival) "bkH" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -36481,20 +36481,20 @@ /area/shuttle/arrival) "bkI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/assistant, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) "bkJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/folder, +/obj/item/storage/pill_bottle/dice, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/shuttle/arrival) "bkK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -36512,8 +36512,8 @@ /area/shuttle/arrival) "bkM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -36538,11 +36538,11 @@ /area/shuttle/arrival) "bkR" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/arrival) @@ -37012,7 +37012,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -37034,7 +37034,7 @@ /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -37078,7 +37078,7 @@ name = "\improper Departure Lounge" }) "bmw" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -37113,7 +37113,7 @@ /turf/closed/wall, /area/space) "bmG" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel, @@ -37223,7 +37223,7 @@ /area/shuttle/syndicate) "bmZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -37261,7 +37261,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -37389,7 +37389,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -37399,11 +37399,11 @@ /area/shuttle/syndicate) "bnK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -37890,33 +37890,33 @@ }, /area/shuttle/syndicate) "bpM" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -37950,18 +37950,18 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "bpT" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "bpU" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -37973,7 +37973,7 @@ }, /area/shuttle/syndicate) "bpV" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -38000,7 +38000,7 @@ }, /area/shuttle/syndicate) "bpX" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -38067,8 +38067,8 @@ /area/shuttle/syndicate) "bqo" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /turf/open/floor/mineral/plastitanium, /area/shuttle/syndicate) "bqp" = ( @@ -38236,12 +38236,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38249,12 +38249,12 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "brd" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38287,22 +38287,22 @@ }, /area/shuttle/syndicate) "brk" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -38327,8 +38327,8 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "brq" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -38408,8 +38408,8 @@ /turf/closed/wall/mineral/plastitanium, /area/shuttle/syndicate) "brH" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -38417,14 +38417,14 @@ /area/shuttle/syndicate) "brI" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "brJ" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -38756,7 +38756,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -38830,7 +38830,7 @@ dir = 4 }, /obj/machinery/light, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/structure/cable/white{ @@ -39227,7 +39227,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -39332,8 +39332,8 @@ }, /area/shuttle/syndicate) "btJ" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -39491,9 +39491,9 @@ /area/shuttle/syndicate) "bul" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -39916,7 +39916,7 @@ name = "Asteroid" }) "bvI" = ( -/obj/item/weapon/pickaxe/emergency, +/obj/item/pickaxe/emergency, /turf/open/floor/plating/asteroid/airless, /area/ruin/unpowered{ name = "Asteroid" diff --git a/_maps/map_files/OmegaStation/job/job_changes.dm b/_maps/map_files/OmegaStation/job/job_changes.dm index 798b4bc91f4..a844a95305e 100644 --- a/_maps/map_files/OmegaStation/job/job_changes.dm +++ b/_maps/map_files/OmegaStation/job/job_changes.dm @@ -6,7 +6,7 @@ supervisors = "the captain and the head of personnel" /datum/outfit/job/New() - box = /obj/item/weapon/storage/box/survival/radio + box = /obj/item/storage/box/survival/radio /datum/job/assistant // Here so assistant appears on the top of the select job list. @@ -33,7 +33,7 @@ minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) /datum/outfit/job/officer/New() - box = /obj/item/weapon/storage/box/security/radio + box = /obj/item/storage/box/security/radio /datum/job/detective/New() ..() @@ -41,7 +41,7 @@ minimal_access = list(access_security, access_sec_doors, access_brig, access_armory, access_court, access_maint_tunnels, access_morgue, access_weapons, access_forensics_lockers) /datum/outfit/job/detective/New() - box = /obj/item/weapon/storage/box/security/radio + box = /obj/item/storage/box/security/radio //Medbay @@ -63,7 +63,7 @@ minimal_access = list(access_eva, access_engine, access_engine_equip, access_tech_storage, access_maint_tunnels, access_external_airlocks, access_construction, access_atmospherics, access_tcomsat) /datum/outfit/job/engineer/New() - box = /obj/item/weapon/storage/box/engineer/radio + box = /obj/item/storage/box/engineer/radio /datum/job/atmos/New() ..() @@ -96,7 +96,7 @@ minimal_access = list(access_maint_tunnels, access_mailsorting, access_cargo, access_cargo_bot, access_qm, access_mining, access_mining_station, access_mineral_storeroom) /datum/outfit/job/mining/New() - box = /obj/item/weapon/storage/box/engineer/radio + box = /obj/item/storage/box/engineer/radio //Service diff --git a/_maps/map_files/OmegaStation/job_changes.dm b/_maps/map_files/OmegaStation/job_changes.dm index f360be7f99d..7f6c24fe26e 100644 --- a/_maps/map_files/OmegaStation/job_changes.dm +++ b/_maps/map_files/OmegaStation/job_changes.dm @@ -11,7 +11,7 @@ /datum/outfit/job/New() ..() MAP_JOB_CHECK - box = /obj/item/weapon/storage/box/survival/radio + box = /obj/item/storage/box/survival/radio /datum/job/assistant // Here so assistant appears on the top of the select job list. @@ -44,7 +44,7 @@ /datum/outfit/job/officer/New() ..() MAP_JOB_CHECK - box = /obj/item/weapon/storage/box/security/radio + box = /obj/item/storage/box/security/radio /datum/job/detective/New() ..() @@ -55,7 +55,7 @@ /datum/outfit/job/detective/New() ..() MAP_JOB_CHECK - box = /obj/item/weapon/storage/box/security/radio + box = /obj/item/storage/box/security/radio //Medbay @@ -81,7 +81,7 @@ /datum/outfit/job/engineer/New() ..() MAP_JOB_CHECK - box = /obj/item/weapon/storage/box/engineer/radio + box = /obj/item/storage/box/engineer/radio /datum/job/atmos/New() ..() @@ -119,7 +119,7 @@ /datum/outfit/job/mining/New() ..() - box = /obj/item/weapon/storage/box/engineer/radio + box = /obj/item/storage/box/engineer/radio //Service diff --git a/_maps/map_files/PubbyStation/PubbyStation.dmm b/_maps/map_files/PubbyStation/PubbyStation.dmm index 62f613dbf5b..bcb7d7d150d 100644 --- a/_maps/map_files/PubbyStation/PubbyStation.dmm +++ b/_maps/map_files/PubbyStation/PubbyStation.dmm @@ -48,7 +48,7 @@ /area/shuttle/syndicate) "aah" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -82,7 +82,7 @@ /obj/machinery/status_display{ pixel_x = -32 }, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/syndie, /obj/machinery/light{ dir = 8 @@ -127,7 +127,7 @@ /obj/machinery/ai_status_display{ pixel_x = 32 }, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light{ dir = 4 }, @@ -177,7 +177,7 @@ /obj/structure/table/reinforced, /obj/item/stack/cable_coil/white, /obj/item/stack/cable_coil/white, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -189,11 +189,11 @@ /area/shuttle/syndicate) "aaA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -350,8 +350,8 @@ }, /area/shuttle/syndicate) "aaQ" = ( -/obj/item/weapon/storage/toolbox/syndicate, -/obj/item/weapon/crowbar/red, +/obj/item/storage/toolbox/syndicate, +/obj/item/crowbar/red, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -461,33 +461,33 @@ }, /area/shuttle/syndicate) "abf" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -506,18 +506,18 @@ }, /area/shuttle/syndicate) "abh" = ( -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "abi" = ( -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 9 }, /obj/item/device/assembly/voice{ @@ -529,7 +529,7 @@ }, /area/shuttle/syndicate) "abj" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/assembly/infra, /obj/structure/table/reinforced, /obj/machinery/light{ @@ -556,7 +556,7 @@ }, /area/shuttle/syndicate) "abl" = ( -/obj/item/weapon/weldingtool/largetank{ +/obj/item/weldingtool/largetank{ pixel_y = 3 }, /obj/item/device/multitool, @@ -619,9 +619,9 @@ /area/shuttle/syndicate) "abu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -674,12 +674,12 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -687,12 +687,12 @@ /turf/open/floor/plasteel/vault, /area/shuttle/syndicate) "abD" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -710,22 +710,22 @@ }, /area/shuttle/syndicate) "abF" = ( -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = 4; pixel_y = 2 }, -/obj/item/weapon/grenade/syndieminibomb{ +/obj/item/grenade/syndieminibomb{ pixel_x = -1 }, /obj/structure/table/reinforced, /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, -/obj/item/weapon/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, +/obj/item/grenade/plastic/c4, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -760,8 +760,8 @@ /turf/open/space, /area/space) "abK" = ( -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw, +/obj/item/surgicaldrill, +/obj/item/circular_saw, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -799,8 +799,8 @@ /turf/closed/wall/r_wall, /area/wreck/ai) "abP" = ( -/obj/item/weapon/cautery, -/obj/item/weapon/scalpel, +/obj/item/cautery, +/obj/item/scalpel, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -808,14 +808,14 @@ /area/shuttle/syndicate) "abQ" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/shuttle/syndicate) "abR" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -1467,13 +1467,13 @@ /area/ai_monitored/turret_protected/aisat_interior) "ado" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 }, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/plasteel/grimy, /area/ai_monitored/turret_protected/aisat_interior) "adp" = ( @@ -1781,7 +1781,7 @@ "aeg" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/porta_turret/ai{ - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /turf/open/floor/plating/airless, /area/ai_monitored/turret_protected/aisat_interior) @@ -1800,7 +1800,7 @@ "aej" = ( /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/porta_turret/ai{ - installation = /obj/item/weapon/gun/energy/e_gun + installation = /obj/item/gun/energy/e_gun }, /turf/open/floor/plating/airless, /area/ai_monitored/turret_protected/aisat_interior) @@ -1835,7 +1835,7 @@ /turf/open/floor/plasteel/black, /area/security/prison) "aep" = ( -/obj/item/weapon/cultivator, +/obj/item/cultivator, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -1861,7 +1861,7 @@ /turf/open/floor/plasteel/black, /area/security/prison) "aer" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -1876,7 +1876,7 @@ /area/security/prison) "aes" = ( /obj/structure/easel, -/obj/item/weapon/canvas/nineteenXnineteen, +/obj/item/canvas/nineteenXnineteen, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -1984,7 +1984,7 @@ /turf/open/floor/plasteel/black, /area/security/prison) "aeG" = ( -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/black, /area/security/prison) "aeH" = ( @@ -2172,7 +2172,7 @@ /turf/open/floor/plasteel/black, /area/ai_monitored/turret_protected/aisat_interior) "afe" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -2202,7 +2202,7 @@ }, /area/ai_monitored/turret_protected/aisat_interior) "afg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -2314,7 +2314,7 @@ /turf/open/floor/plasteel/black, /area/security/prison) "afp" = ( -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/structure/table, /turf/open/floor/plasteel/black, /area/security/prison) @@ -2388,7 +2388,7 @@ "afB" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/machinery/light/small{ dir = 4 }, @@ -2417,11 +2417,11 @@ /turf/open/floor/plasteel/black, /area/security/prison) "afF" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 6 @@ -2462,13 +2462,13 @@ /area/ai_monitored/turret_protected/AIsatextAP) "afL" = ( /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/wrench, +/obj/item/tank/internals/emergency_oxygen, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) "afM" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/clothing/mask/gas, /turf/open/floor/plating, /area/ai_monitored/turret_protected/AIsatextAP) @@ -2508,15 +2508,15 @@ /area/ai_monitored/turret_protected/AIsatextAS) "afT" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/multitool{ layer = 5 }, -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ layer = 4 }, /turf/open/floor/plating, @@ -2573,7 +2573,7 @@ /obj/machinery/shower{ dir = 8 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/freezer, /area/security/prison) "age" = ( @@ -2982,8 +2982,8 @@ /area/security/prison) "agY" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plasteel/floorgrime, /area/security/prison) "agZ" = ( @@ -3062,7 +3062,7 @@ pixel_x = -28 }, /obj/structure/table, -/obj/item/weapon/storage/backpack/duffelbag/sec/surgery{ +/obj/item/storage/backpack/duffelbag/sec/surgery{ pixel_y = 5 }, /obj/item/clothing/mask/balaclava, @@ -3072,7 +3072,7 @@ /area/security/transfer) "ahk" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, /obj/item/device/taperecorder{ @@ -3351,7 +3351,7 @@ /area/security/prison) "ahK" = ( /obj/structure/table, -/obj/item/weapon/melee/chainofcommand, +/obj/item/melee/chainofcommand, /turf/open/floor/plasteel/red, /area/security/prison) "ahL" = ( @@ -3433,7 +3433,7 @@ /obj/machinery/atmospherics/pipe/simple/general/visible{ dir = 9 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -3443,11 +3443,11 @@ /area/security/transfer) "ahV" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/anesthetic{ +/obj/item/tank/internals/anesthetic{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/tank/internals/oxygen/red{ +/obj/item/tank/internals/oxygen/red{ pixel_x = 3 }, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ @@ -3582,7 +3582,7 @@ /area/security/prison) "aih" = ( /obj/structure/table, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_x = -6 }, /obj/item/device/assembly/signaler{ @@ -3595,19 +3595,19 @@ /area/security/prison) "aii" = ( /obj/structure/table, -/obj/item/weapon/storage/box/chemimp{ +/obj/item/storage/box/chemimp{ pixel_x = 6 }, -/obj/item/weapon/storage/box/trackimp{ +/obj/item/storage/box/trackimp{ pixel_x = -3 }, /turf/open/floor/plasteel/black, /area/security/armory) "aij" = ( /obj/structure/closet/secure_closet/contraband/armory, -/obj/item/weapon/book/codex_gigas, -/obj/item/weapon/poster/random_contraband, -/obj/item/weapon/grenade/smokebomb, +/obj/item/book/codex_gigas, +/obj/item/poster/random_contraband, +/obj/item/grenade/smokebomb, /turf/open/floor/plasteel/black, /area/security/armory) "aik" = ( @@ -3624,11 +3624,11 @@ /turf/open/floor/plasteel/black, /area/security/armory) "aim" = ( -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier{ pixel_x = 4 }, -/obj/item/weapon/grenade/barrier, -/obj/item/weapon/grenade/barrier{ +/obj/item/grenade/barrier, +/obj/item/grenade/barrier{ pixel_x = -4 }, /obj/structure/table, @@ -3796,15 +3796,15 @@ /area/security/prison) "aiL" = ( /obj/structure/table, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/storage/box/flashbangs{ +/obj/item/storage/box/flashbangs{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/lockbox/loyalty{ +/obj/item/storage/lockbox/loyalty{ layer = 4 }, /turf/open/floor/plasteel/black, @@ -3822,8 +3822,8 @@ /area/security/armory) "aiO" = ( /obj/structure/table, -/obj/item/weapon/storage/box/firingpins, -/obj/item/weapon/storage/box/firingpins, +/obj/item/storage/box/firingpins, +/obj/item/storage/box/firingpins, /obj/item/key/security, /obj/machinery/power/apc{ cell_type = 5000; @@ -3890,7 +3890,7 @@ /obj/structure/sink/kitchen{ pixel_y = 28 }, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plating, /area/maintenance/department/security/brig) "aiY" = ( @@ -3900,8 +3900,8 @@ /area/maintenance/department/security/brig) "aiZ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -3972,8 +3972,8 @@ /area/security/prison) "ajg" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/ionrifle, -/obj/item/weapon/gun/energy/temperature/security, +/obj/item/gun/energy/ionrifle, +/obj/item/gun/energy/temperature/security, /obj/item/clothing/suit/armor/laserproof, /obj/machinery/light{ dir = 8; @@ -4005,12 +4005,12 @@ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/shield/riot, -/obj/item/weapon/shield/riot{ +/obj/item/shield/riot, +/obj/item/shield/riot{ pixel_x = 3; pixel_y = -3 }, @@ -4026,21 +4026,21 @@ /area/security/armory) "ajj" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot, +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/storage/box/rubbershot{ +/obj/item/storage/box/rubbershot{ pixel_x = 3; pixel_y = -3 }, @@ -4071,7 +4071,7 @@ /area/security/main) "ajm" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box{ +/obj/item/storage/fancy/donut_box{ pixel_y = 2 }, /obj/structure/noticeboard{ @@ -4089,7 +4089,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 1; pixel_y = 3 }, @@ -4126,7 +4126,7 @@ /turf/open/floor/plasteel/red, /area/security/main) "ajr" = ( -/obj/item/weapon/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, /turf/open/floor/plating, /area/crew_quarters/heads/hos) "ajs" = ( @@ -4148,7 +4148,7 @@ /area/maintenance/department/crew_quarters/dorms) "ajw" = ( /obj/machinery/vending/boozeomat{ - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 1, /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 1, /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 1, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic = 1, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/weapon/reagent_containers/food/drinks/ice = 3, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 6, /obj/item/weapon/reagent_containers/food/drinks/flask = 1); + products = list(/obj/item/reagent_containers/food/drinks/bottle/whiskey = 1, /obj/item/reagent_containers/food/drinks/bottle/absinthe = 1, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 1, /obj/item/reagent_containers/food/drinks/bottle/cream = 1, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 10, /obj/item/reagent_containers/food/drinks/ice = 3, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 6, /obj/item/reagent_containers/food/drinks/flask = 1); req_access_txt = "0" }, /turf/open/floor/plasteel/bar, @@ -4194,7 +4194,7 @@ /turf/open/space, /area/space) "ajB" = ( -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/maintenance/department/security/brig) "ajC" = ( @@ -4206,7 +4206,7 @@ /area/maintenance/department/security/brig) "ajE" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, @@ -4300,12 +4300,12 @@ /area/security/brig) "ajP" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun, +/obj/item/gun/energy/e_gun{ pixel_x = 3; pixel_y = -3 }, @@ -4353,12 +4353,12 @@ /area/security/armory) "ajT" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/laser, -/obj/item/weapon/gun/energy/laser{ +/obj/item/gun/energy/laser, +/obj/item/gun/energy/laser{ pixel_x = 3; pixel_y = -3 }, @@ -4447,11 +4447,11 @@ /area/crew_quarters/heads/hos) "akd" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/seccarts{ +/obj/item/storage/box/seccarts{ pixel_x = 3; pixel_y = 2 }, -/obj/item/weapon/storage/box/deputy, +/obj/item/storage/box/deputy, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, @@ -4485,7 +4485,7 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "aki" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/structure/sign/poster/contraband/random{ pixel_x = 32 }, @@ -4504,7 +4504,7 @@ brightness = 3; dir = 8 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -4636,7 +4636,7 @@ /area/maintenance/department/security/brig) "akt" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/button/door{ id = "mainthideout"; name = "Door Bolt Control"; @@ -4715,18 +4715,18 @@ "akB" = ( /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table/glass, /turf/open/floor/plasteel/whitered/side{ dir = 9 }, /area/security/brig) "akC" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table/glass, /obj/machinery/airalarm{ pixel_y = 22 @@ -4816,12 +4816,12 @@ /area/security/brig) "akL" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun/advtaser, -/obj/item/weapon/gun/energy/e_gun/advtaser{ +/obj/item/gun/energy/e_gun/advtaser, +/obj/item/gun/energy/e_gun/advtaser{ pixel_x = 3; pixel_y = -3 }, @@ -4855,12 +4855,12 @@ /area/security/armory) "akP" = ( /obj/structure/rack, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/ballistic/shotgun/riot, -/obj/item/weapon/gun/ballistic/shotgun/riot{ +/obj/item/gun/ballistic/shotgun/riot, +/obj/item/gun/ballistic/shotgun/riot{ pixel_x = 3; pixel_y = -3 }, @@ -4887,7 +4887,7 @@ }, /area/security/main) "akS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/black, @@ -4911,7 +4911,7 @@ /turf/open/floor/plasteel/darkred/corner, /area/crew_quarters/heads/hos) "akV" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -22; pixel_y = 32 }, @@ -4950,7 +4950,7 @@ /area/space) "alb" = ( /obj/structure/table, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/machinery/light/small{ dir = 8 }, @@ -4958,20 +4958,20 @@ /area/maintenance/department/crew_quarters/dorms) "alc" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/cigars, +/obj/item/storage/fancy/cigarettes/cigars, /obj/item/stack/spacecash/c20, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "ald" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin{ +/obj/item/reagent_containers/food/drinks/bottle/gin{ pixel_y = 8 }, /obj/machinery/light/small{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "ale" = ( @@ -5019,7 +5019,7 @@ /obj/machinery/atmospherics/pipe/manifold/cyan/hidden{ dir = 8 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/department/security/brig) "alk" = ( @@ -5070,7 +5070,7 @@ /turf/closed/wall/r_wall, /area/security/brig) "alq" = ( -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /obj/structure/extinguisher_cabinet{ pixel_x = -27 }, @@ -5081,11 +5081,11 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 }, -/obj/item/weapon/reagent_containers/syringe{ +/obj/item/reagent_containers/syringe{ name = "steel point" }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/glass/bottle/epinephrine, /turf/open/floor/plasteel/whitered/side{ dir = 10 }, @@ -5191,8 +5191,8 @@ pixel_x = -4; pixel_y = 12 }, -/obj/item/weapon/pen, -/obj/item/weapon/folder/red{ +/obj/item/pen, +/obj/item/folder/red{ layer = 2.9; pixel_x = 8 }, @@ -5239,8 +5239,8 @@ /area/crew_quarters/heads/hos) "alL" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/hos, +/obj/item/folder/red, +/obj/item/stamp/hos, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "alM" = ( @@ -5655,7 +5655,7 @@ /area/crew_quarters/heads/hos) "amx" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "amy" = ( @@ -5695,7 +5695,7 @@ /turf/open/space/basic, /area/space) "amE" = ( -/obj/item/weapon/cigbutt/roach, +/obj/item/cigbutt/roach, /turf/open/floor/wood, /area/maintenance/department/crew_quarters/dorms) "amF" = ( @@ -5795,8 +5795,8 @@ dir = 4; layer = 2.9 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OMinus, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -5960,7 +5960,7 @@ /area/crew_quarters/heads/hos) "anj" = ( /obj/structure/table/wood, -/obj/item/weapon/phone, +/obj/item/phone, /turf/open/floor/carpet, /area/crew_quarters/heads/hos) "ank" = ( @@ -6011,7 +6011,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "ans" = ( -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/effect/spawner/lootdrop/maintenance, /obj/structure/cable{ d1 = 4; @@ -6235,7 +6235,7 @@ }, /area/security/main) "anP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ @@ -6684,8 +6684,8 @@ /area/maintenance/department/security/brig) "aoN" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plating, /area/maintenance/department/security/brig) "aoO" = ( @@ -6700,12 +6700,12 @@ dir = 8 }, /obj/structure/table, -/obj/item/weapon/storage/box/prisoner, -/obj/item/weapon/razor{ +/obj/item/storage/box/prisoner, +/obj/item/razor{ pixel_x = -6 }, -/obj/item/weapon/paper/guides/jobs/security/labor_camp, -/obj/item/weapon/pen, +/obj/item/paper/guides/jobs/security/labor_camp, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/security/brig) "aoP" = ( @@ -6725,7 +6725,7 @@ /turf/open/floor/plating, /area/security/warden) "aoR" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/clothing/ears/earmuffs, /obj/item/clothing/glasses/sunglasses, /obj/structure/table/reinforced, @@ -6780,8 +6780,8 @@ /area/security/warden) "aoX" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/laser_pointer/red, /turf/open/floor/plasteel/showroomfloor, /area/security/warden) @@ -7134,10 +7134,10 @@ name = "Reception Desk"; req_access_txt = "63" }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, -/obj/item/weapon/pen{ +/obj/item/pen{ pixel_x = 4; pixel_y = 4 }, @@ -7256,7 +7256,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/item/weapon/storage/pod{ +/obj/item/storage/pod{ pixel_x = -24 }, /turf/open/floor/mineral/titanium/blue, @@ -7356,8 +7356,8 @@ /area/shuttle/labor) "aql" = ( /obj/structure/table, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/labor) "aqm" = ( @@ -7609,7 +7609,7 @@ /area/ai_monitored/nuke_storage) "aqP" = ( /obj/structure/filingcabinet, -/obj/item/weapon/folder/documents, +/obj/item/folder/documents, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -7752,7 +7752,7 @@ /turf/open/floor/plating, /area/maintenance/department/security/brig) "arc" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/security/brig) @@ -8010,7 +8010,7 @@ layer = 4; pixel_y = 32 }, -/obj/item/weapon/folder/yellow{ +/obj/item/folder/yellow{ pixel_y = 4 }, /obj/structure/table/glass, @@ -8018,7 +8018,7 @@ dir = 1; light_color = "#e8eaff" }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/darkblue/side{ dir = 1 }, @@ -8132,7 +8132,7 @@ pixel_x = -32 }, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/paper/pamphlet, +/obj/item/paper/pamphlet, /turf/open/floor/plasteel, /area/teleporter) "arY" = ( @@ -8298,7 +8298,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -8499,7 +8499,7 @@ /area/security/brig) "asJ" = ( /obj/structure/table, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /obj/item/device/taperecorder, /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 4 @@ -8626,7 +8626,7 @@ pixel_x = 1; pixel_y = -2 }, -/obj/item/weapon/storage/belt/champion, +/obj/item/storage/belt/champion, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 6 }, @@ -8666,23 +8666,23 @@ }, /area/ai_monitored/nuke_storage) "asZ" = ( -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 7; pixel_y = 12 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 12; pixel_y = 7 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 4; pixel_y = 8 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = -6; pixel_y = 5 }, -/obj/item/weapon/coin/silver{ +/obj/item/coin/silver{ pixel_x = 5; pixel_y = -8 }, @@ -8809,8 +8809,8 @@ /area/crew_quarters/dorms) "atm" = ( /obj/structure/closet, -/obj/item/weapon/weldingtool, -/obj/item/weapon/crowbar, +/obj/item/weldingtool, +/obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "atn" = ( @@ -9145,11 +9145,11 @@ /area/bridge) "aua" = ( /obj/structure/closet/secure_closet/freezer/money, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /obj/item/clothing/head/bearpelt, -/obj/item/weapon/skub, +/obj/item/skub, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ dir = 1 @@ -9189,11 +9189,11 @@ /area/ai_monitored/nuke_storage) "aue" = ( /obj/structure/safe, -/obj/item/weapon/bikehorn/golden, +/obj/item/bikehorn/golden, /obj/item/ammo_box/a357, -/obj/item/weapon/tank/internals/plasma/full, -/obj/item/weapon/disk/fakenucleardisk, -/obj/item/weapon/gun/energy/disabler, +/obj/item/tank/internals/plasma/full, +/obj/item/disk/fakenucleardisk, +/obj/item/gun/energy/disabler, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -9278,7 +9278,7 @@ "aun" = ( /obj/structure/table, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/dorms) "auo" = ( @@ -9407,8 +9407,8 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ layer = 3.1 }, /turf/open/floor/plasteel/black, @@ -9639,7 +9639,7 @@ /area/crew_quarters/dorms) "ave" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/nanotrasen, +/obj/item/bedsheet/nanotrasen, /obj/machinery/button/door{ id = "Dorm3Shutters"; name = "Privacy Shutters Control"; @@ -9803,7 +9803,7 @@ /area/security/brig) "avs" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/flasher{ id = "Cell 1"; pixel_x = -28 @@ -9822,7 +9822,7 @@ /area/security/brig) "avv" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/flasher{ id = "Cell 2"; pixel_x = -28 @@ -9841,7 +9841,7 @@ /area/security/brig) "avy" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/machinery/flasher{ id = "Cell 3"; pixel_x = -28 @@ -9871,8 +9871,8 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /turf/open/floor/plasteel/black, /area/security/brig) "avD" = ( @@ -9932,8 +9932,8 @@ /obj/machinery/shower{ dir = 1 }, -/obj/item/weapon/soap/deluxe, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/soap/deluxe, +/obj/item/bikehorn/rubberducky, /obj/effect/landmark/revenantspawn, /obj/structure/curtain, /turf/open/floor/plasteel/freezer, @@ -10021,21 +10021,21 @@ /area/bridge) "avV" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/ids{ +/obj/item/storage/box/ids{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/PDAs, +/obj/item/storage/box/PDAs, /turf/open/floor/plasteel/black, /area/bridge) "avW" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/black, /area/bridge) "avX" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/black, /area/bridge) "avY" = ( @@ -10045,7 +10045,7 @@ /area/bridge) "avZ" = ( /obj/structure/table/glass, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/item/device/laser_pointer/blue, /turf/open/floor/plasteel/black, @@ -10076,7 +10076,7 @@ /area/hallway/primary/central) "awe" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/plasteel, /area/hallway/primary/central) "awf" = ( @@ -10170,7 +10170,7 @@ /obj/machinery/light{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /obj/effect/turf_decal/stripes/corner{ dir = 4 }, @@ -10308,7 +10308,7 @@ }, /area/crew_quarters/fitness/recreation) "awC" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1 }, @@ -10490,7 +10490,7 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/reagent_containers/food/snacks/donut{ +/obj/item/reagent_containers/food/snacks/donut{ layer = 3 }, /obj/machinery/door/poddoor/preopen{ @@ -10498,7 +10498,7 @@ name = "brig shutters" }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ layer = 2.9 }, /turf/open/floor/plasteel/black, @@ -10513,7 +10513,7 @@ name = "Brig Desk"; req_access_txt = "1" }, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 3 }, /obj/machinery/door/poddoor/preopen{ @@ -10805,7 +10805,7 @@ /turf/open/floor/plasteel, /area/security/brig) "axF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -10916,7 +10916,7 @@ /area/crew_quarters/heads/captain) "axU" = ( /obj/machinery/computer/card, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; @@ -11043,7 +11043,7 @@ /area/crew_quarters/dorms) "ayj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/nanotrasen, +/obj/item/bedsheet/nanotrasen, /obj/machinery/button/door{ id = "Dorm2Shutters"; name = "Privacy Shutters Control"; @@ -11101,7 +11101,7 @@ /area/crew_quarters/dorms) "ayo" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 4 }, @@ -11109,17 +11109,17 @@ /area/crew_quarters/dorms) "ayp" = ( /obj/structure/table/wood, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayq" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /turf/open/floor/carpet, /area/crew_quarters/dorms) "ayr" = ( @@ -11320,7 +11320,7 @@ /area/hallway/primary/fore) "ayS" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/captain, +/obj/item/bedsheet/captain, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain) "ayT" = ( @@ -11394,7 +11394,7 @@ /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "azc" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 35; pixel_y = 5 }, @@ -11613,7 +11613,7 @@ /area/hallway/primary/central) "azr" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /turf/open/floor/carpet, /area/crew_quarters/dorms) "azs" = ( @@ -11646,7 +11646,7 @@ /area/crew_quarters/dorms) "azw" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 8 }, @@ -11707,7 +11707,7 @@ /area/crew_quarters/fitness/recreation) "azE" = ( /obj/structure/table, -/obj/item/weapon/paper/fluff/holodeck/disclaimer, +/obj/item/paper/fluff/holodeck/disclaimer, /turf/open/floor/plasteel, /area/crew_quarters/fitness/recreation) "azF" = ( @@ -11892,7 +11892,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/vending_refill/cigarette, +/obj/item/vending_refill/cigarette, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating{ icon_state = "panelscorched" @@ -11920,10 +11920,10 @@ "aAa" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/potato{ +/obj/item/stock_parts/cell/potato{ name = "\improper Beepsky's emergency battery" }, -/obj/item/weapon/paper/fluff/jobs/security/beepsky_mom, +/obj/item/paper/fluff/jobs/security/beepsky_mom, /turf/open/floor/plating, /area/maintenance/department/security/brig) "aAb" = ( @@ -12029,7 +12029,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/fore) "aAo" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -12044,13 +12044,13 @@ /area/crew_quarters/heads/captain) "aAq" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/matches, -/obj/item/weapon/razor{ +/obj/item/storage/box/matches, +/obj/item/razor{ pixel_x = -4; pixel_y = 2 }, /obj/item/clothing/mask/cigarette/cigar, -/obj/item/weapon/reagent_containers/food/drinks/flask/gold, +/obj/item/reagent_containers/food/drinks/flask/gold, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain) "aAr" = ( @@ -12061,7 +12061,7 @@ /area/crew_quarters/heads/captain) "aAs" = ( /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/grimy, /area/crew_quarters/heads/captain) "aAt" = ( @@ -12084,8 +12084,8 @@ /area/crew_quarters/heads/captain) "aAw" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/carpet, @@ -12096,8 +12096,8 @@ /area/crew_quarters/heads/captain) "aAy" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/captain, +/obj/item/folder/blue, +/obj/item/stamp/captain, /obj/machinery/light{ dir = 4 }, @@ -12371,7 +12371,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; layer = 4.1; pixel_y = 3 @@ -12509,7 +12509,7 @@ "aBz" = ( /obj/structure/table/wood, /obj/item/device/flashlight/lamp/green, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -22; pixel_y = 4 }, @@ -12613,7 +12613,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel, /area/hallway/primary/central) "aBL" = ( @@ -12627,7 +12627,7 @@ /area/crew_quarters/dorms) "aBM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/nanotrasen, +/obj/item/bedsheet/nanotrasen, /obj/machinery/button/door{ id = "Dorm1Shutters"; name = "Privacy Shutters Control"; @@ -12710,11 +12710,11 @@ "aBX" = ( /obj/structure/closet/wardrobe/black, /obj/item/clothing/shoes/jackboots, -/obj/item/weapon/storage/backpack, +/obj/item/storage/backpack, /turf/open/floor/plasteel/arrival, /area/crew_quarters/fitness/recreation) "aBY" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1 }, @@ -12758,8 +12758,8 @@ /area/solar/port) "aCb" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/security/brig) @@ -12825,7 +12825,7 @@ /area/maintenance/department/security/brig) "aCi" = ( /obj/structure/table/wood, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1; pixel_y = 12 @@ -12851,7 +12851,7 @@ /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aCm" = ( -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/grimy, /area/security/detectives_office) "aCn" = ( @@ -12873,7 +12873,7 @@ /area/security/detectives_office) "aCo" = ( /obj/structure/closet/secure_closet/detective, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -12912,7 +12912,7 @@ /area/storage/primary) "aCt" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/device/analyzer, /obj/machinery/requests_console{ department = "Tool Storage"; @@ -12926,13 +12926,13 @@ "aCu" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; pixel_y = 26 }, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /turf/open/floor/plasteel/neutral/side{ @@ -12965,7 +12965,7 @@ pixel_y = 22 }, /obj/item/device/flashlight, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/neutral/side{ dir = 1 }, @@ -13062,12 +13062,12 @@ /area/bridge) "aCG" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/quarantine, +/obj/item/aiModule/supplied/quarantine, /obj/machinery/camera/motion{ c_tag = "AI Upload Port"; dir = 4 }, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/flasher{ id = "brigentry"; pixel_x = -28 @@ -13109,7 +13109,7 @@ /area/ai_monitored/turret_protected/ai_upload) "aCM" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/freeform, +/obj/item/aiModule/supplied/freeform, /obj/machinery/camera/motion{ c_tag = "AI Upload Starboard"; dir = 8 @@ -13144,14 +13144,14 @@ /area/bridge) "aCP" = ( /obj/structure/table/wood, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 4 }, /obj/machinery/keycard_auth{ pixel_x = -26; pixel_y = 6 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/wood, @@ -13287,7 +13287,7 @@ /area/hallway/primary/central) "aDb" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /turf/open/floor/plasteel/grimy, /area/crew_quarters/dorms) "aDc" = ( @@ -13493,7 +13493,7 @@ /area/storage/primary) "aDC" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "aDD" = ( @@ -13880,16 +13880,16 @@ /area/security/detectives_office) "aEn" = ( /obj/structure/table/wood, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/carpet, /area/security/detectives_office) "aEo" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes, -/obj/item/weapon/lighter, +/obj/item/storage/fancy/cigarettes, +/obj/item/lighter, /obj/item/clothing/glasses/hud/security/sunglasses, /turf/open/floor/carpet, /area/security/detectives_office) @@ -13902,13 +13902,13 @@ /obj/structure/table/wood, /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 20 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_y = 10 }, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass{ pixel_x = 7; pixel_y = 10 }, @@ -13934,11 +13934,11 @@ /area/hallway/primary/fore) "aEt" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -2 }, /obj/machinery/light{ @@ -13963,11 +13963,11 @@ /area/storage/primary) "aEw" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2 }, /obj/machinery/light{ @@ -13979,8 +13979,8 @@ /area/storage/primary) "aEx" = ( /obj/structure/table/wood, -/obj/item/weapon/pinpointer, -/obj/item/weapon/disk/nuclear, +/obj/item/pinpointer, +/obj/item/disk/nuclear, /obj/machinery/light{ dir = 8 }, @@ -13988,12 +13988,12 @@ /area/crew_quarters/heads/captain) "aEy" = ( /obj/structure/table/wood, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "aEz" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/carpet, /area/crew_quarters/heads/captain) "aEA" = ( @@ -14031,8 +14031,8 @@ /area/bridge) "aED" = ( /obj/structure/table, -/obj/item/weapon/aiModule/core/full/asimov, -/obj/item/weapon/aiModule/core/freeformcore, +/obj/item/aiModule/core/full/asimov, +/obj/item/aiModule/core/freeformcore, /obj/machinery/door/window{ base_state = "right"; dir = 4; @@ -14040,8 +14040,8 @@ name = "Core Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/core/full/corp, -/obj/item/weapon/aiModule/core/full/custom, +/obj/item/aiModule/core/full/corp, +/obj/item/aiModule/core/full/custom, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -14075,8 +14075,8 @@ /area/ai_monitored/turret_protected/ai_upload) "aEI" = ( /obj/structure/table, -/obj/item/weapon/aiModule/supplied/oxygen, -/obj/item/weapon/aiModule/zeroth/oneHuman, +/obj/item/aiModule/supplied/oxygen, +/obj/item/aiModule/zeroth/oneHuman, /obj/machinery/door/window{ base_state = "left"; dir = 8; @@ -14084,9 +14084,9 @@ name = "High-Risk Modules"; req_access_txt = "20" }, -/obj/item/weapon/aiModule/reset/purge, -/obj/item/weapon/aiModule/core/full/antimov, -/obj/item/weapon/aiModule/supplied/protectStation, +/obj/item/aiModule/reset/purge, +/obj/item/aiModule/core/full/antimov, +/obj/item/aiModule/supplied/protectStation, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -14125,7 +14125,7 @@ /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aEM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-24"; layer = 4.1 }, @@ -14138,12 +14138,12 @@ /area/crew_quarters/heads/hop) "aEN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/PDAs{ +/obj/item/storage/box/PDAs{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/silver_ids, -/obj/item/weapon/storage/box/ids, +/obj/item/storage/box/silver_ids, +/obj/item/storage/box/ids, /turf/open/floor/wood, /area/crew_quarters/heads/hop) "aEO" = ( @@ -14188,7 +14188,7 @@ /area/crew_quarters/heads/hop) "aER" = ( /obj/structure/table/wood, -/obj/item/weapon/stamp/hop{ +/obj/item/stamp/hop{ pixel_x = -4; pixel_y = 4 }, @@ -14197,7 +14197,7 @@ name = "Station Intercom (General)"; pixel_x = 27 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/carpet, @@ -14325,7 +14325,7 @@ /turf/open/floor/plasteel/black, /area/security/detectives_office) "aFm" = ( -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = -22 }, /turf/open/floor/carpet, @@ -14372,7 +14372,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/electronics/apc, +/obj/item/electronics/apc, /obj/item/device/t_scanner, /turf/open/floor/plasteel/neutral/side{ dir = 8 @@ -14393,8 +14393,8 @@ /area/storage/primary) "aFv" = ( /obj/structure/table, -/obj/item/weapon/weldingtool, -/obj/item/weapon/crowbar, +/obj/item/weldingtool, +/obj/item/crowbar, /obj/item/stack/packageWrap, /obj/item/stack/packageWrap, /turf/open/floor/plasteel/neutral/side{ @@ -14473,7 +14473,7 @@ /turf/open/floor/plasteel, /area/hallway/primary/central) "aFE" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/machinery/power/apc{ dir = 8; name = "Starboard Emergency Storage APC"; @@ -14487,7 +14487,7 @@ /turf/open/floor/plating, /area/storage/emergency/starboard) "aFF" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/light/small{ dir = 4 }, @@ -14593,9 +14593,9 @@ /area/space) "aFQ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bowl, -/obj/item/weapon/reagent_containers/glass/bowl, -/obj/item/weapon/reagent_containers/food/condiment/rice, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/glass/bowl, +/obj/item/reagent_containers/food/condiment/rice, /obj/machinery/light/small{ dir = 1 }, @@ -14620,8 +14620,8 @@ /area/shuttle/escape) "aFU" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/security/detectives_office) "aFV" = ( @@ -14689,7 +14689,7 @@ /area/hallway/primary/fore) "aGe" = ( /obj/structure/rack, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/flashlight, /obj/item/device/gps, /turf/open/floor/plasteel/neutral/side{ @@ -14702,7 +14702,7 @@ /area/storage/primary) "aGg" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/device/assembly/prox_sensor{ pixel_x = -8; pixel_y = 4 @@ -14715,8 +14715,8 @@ /area/storage/primary) "aGh" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/storage/firstaid/regular, +/obj/item/reagent_containers/glass/beaker, /turf/open/floor/plasteel/neutral/side, /area/storage/primary) "aGi" = ( @@ -14731,7 +14731,7 @@ /area/storage/primary) "aGk" = ( /obj/machinery/vending/boozeomat{ - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 1, /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 1, /obj/item/weapon/reagent_containers/food/drinks/ale = 1, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 6, /obj/item/weapon/reagent_containers/food/drinks/ice = 1, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 4); + products = list(/obj/item/reagent_containers/food/drinks/bottle/rum = 1, /obj/item/reagent_containers/food/drinks/bottle/wine = 1, /obj/item/reagent_containers/food/drinks/ale = 1, /obj/item/reagent_containers/food/drinks/drinkingglass = 6, /obj/item/reagent_containers/food/drinks/ice = 1, /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 4); req_access_txt = "20" }, /turf/open/floor/plasteel/vault{ @@ -14754,7 +14754,7 @@ }, /area/crew_quarters/heads/captain) "aGn" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09"; light_color = "#2cb2e8"; light_range = 3; @@ -14838,8 +14838,8 @@ /area/hallway/primary/central) "aGy" = ( /obj/structure/table, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/paper_bin{ layer = 2.9 }, /obj/effect/turf_decal/delivery, @@ -14855,7 +14855,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plating, /area/storage/emergency/starboard) "aGB" = ( @@ -14929,11 +14929,11 @@ /area/crew_quarters/toilet/restrooms) "aGK" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/cookie{ +/obj/item/reagent_containers/food/snacks/cookie{ desc = "It has a distinctly eldritch taste to it."; name = "grandma's cookie" }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/light/small{ dir = 8 }, @@ -14962,7 +14962,7 @@ /area/maintenance/department/cargo) "aGQ" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -15035,7 +15035,7 @@ /turf/open/floor/plasteel, /area/storage/primary) "aHa" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_y = 3 @@ -15209,19 +15209,19 @@ /obj/machinery/shower{ dir = 4 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/freezer, /area/crew_quarters/toilet/restrooms) "aHs" = ( /obj/structure/closet/crate, -/obj/item/weapon/cultivator, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/cultivator, +/obj/item/shovel/spade, +/obj/item/storage/bag/plants/portaseeder, /obj/item/seeds/wheat/rice, /obj/item/seeds/replicapod, /obj/item/seeds/carrot, /obj/item/seeds/tomato, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, /turf/open/floor/plating, /area/maintenance/department/cargo) "aHt" = ( @@ -15746,7 +15746,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aIB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-17" }, /turf/open/floor/plasteel/red/side{ @@ -15783,7 +15783,7 @@ }, /area/hallway/secondary/exit/departure_lounge) "aIF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-17" }, /turf/open/floor/plasteel/red/side{ @@ -15792,7 +15792,7 @@ /area/hallway/secondary/exit/departure_lounge) "aIG" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plating, /area/maintenance/department/security/brig) "aIH" = ( @@ -16623,7 +16623,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/dorms) "aKg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-04"; layer = 4.1 }, @@ -16988,7 +16988,7 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "aLl" = ( -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/plating, /area/maintenance/department/cargo) "aLm" = ( @@ -17014,7 +17014,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aLq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/mineral/titanium/blue, @@ -17063,7 +17063,7 @@ dir = 4 }, /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXnineteen, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, @@ -17091,8 +17091,8 @@ /area/storage/art) "aLA" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/friedegg, -/obj/item/weapon/kitchen/fork, +/obj/item/reagent_containers/food/snacks/friedegg, +/obj/item/kitchen/fork, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, @@ -17291,7 +17291,7 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -17545,7 +17545,7 @@ /turf/open/floor/plasteel/floorgrime, /area/quartermaster/storage) "aMu" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/structure/disposalpipe/segment{ dir = 4 }, @@ -17602,7 +17602,7 @@ lootcount = 2; name = "2maintenance loot spawner" }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/machinery/light/small, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -17695,7 +17695,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aMK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -17736,7 +17736,7 @@ }, /area/hallway/secondary/exit/departure_lounge) "aMP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_y = 3 @@ -17823,7 +17823,7 @@ /area/storage/art) "aMX" = ( /obj/structure/table, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /obj/structure/cable{ d2 = 8; icon_state = "0-8" @@ -17871,7 +17871,7 @@ /area/crew_quarters/cafeteria/lunchroom) "aNb" = ( /obj/machinery/vending/sustenance{ - contraband = list(/obj/item/weapon/kitchen/knife = 6, /obj/item/weapon/reagent_containers/food/drinks/coffee = 12); + contraband = list(/obj/item/kitchen/knife = 6, /obj/item/reagent_containers/food/drinks/coffee = 12); desc = "A vending machine which vends food."; product_ads = "Sufficiently healthy." }, @@ -17901,7 +17901,7 @@ name = "Auxiliary Restrooms APC"; pixel_y = -24 }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/machinery/shower{ dir = 8 }, @@ -17915,18 +17915,18 @@ }, /area/maintenance/department/crew_quarters/bar) "aNg" = ( -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aNh" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating{ icon_state = "panelscorched" }, /area/maintenance/department/crew_quarters/bar) "aNi" = ( /obj/structure/grille/broken, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plating{ broken = 1; icon_state = "platingdmg3" @@ -17957,7 +17957,7 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aNn" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating, @@ -18001,11 +18001,11 @@ "aNr" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000 }, @@ -18023,8 +18023,8 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/tank/jetpack/carbondioxide, -/obj/item/weapon/tank/jetpack/carbondioxide{ +/obj/item/tank/jetpack/carbondioxide, +/obj/item/tank/jetpack/carbondioxide{ pixel_x = -4; pixel_y = 1 }, @@ -18035,7 +18035,7 @@ /area/storage/eva) "aNu" = ( /obj/structure/closet/crate, -/obj/item/weapon/melee/flyswatter, +/obj/item/melee/flyswatter, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; @@ -18185,11 +18185,11 @@ /turf/open/floor/plasteel, /area/quartermaster/office) "aNM" = ( -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/storage/box, -/obj/item/weapon/hand_labeler, -/obj/item/weapon/hand_labeler, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/storage/box, +/obj/item/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table, /obj/machinery/requests_console{ department = "Cargo Bay"; @@ -18393,7 +18393,7 @@ /area/hallway/secondary/exit/departure_lounge) "aOo" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/camera{ c_tag = "Departure Lounge Starboard" }, @@ -18422,7 +18422,7 @@ }, /area/hallway/secondary/exit/departure_lounge) "aOr" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -18440,15 +18440,15 @@ /area/hallway/secondary/exit/departure_lounge) "aOt" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/neutral/side{ dir = 10 }, /area/storage/art) "aOu" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, +/obj/item/storage/crayons, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Art Storage"; @@ -18470,8 +18470,8 @@ amount = 20; layer = 3.3 }, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/canvas/nineteenXnineteen, /turf/open/floor/plasteel/neutral/side{ dir = 6 }, @@ -18566,7 +18566,7 @@ /area/storage/eva) "aOE" = ( /obj/structure/table, -/obj/item/weapon/hand_tele, +/obj/item/hand_tele, /obj/machinery/light{ dir = 8 }, @@ -18826,7 +18826,7 @@ "aPf" = ( /obj/structure/disposalpipe/segment, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, -/obj/item/weapon/shard, +/obj/item/shard, /turf/open/floor/plating, /area/maintenance/department/cargo) "aPg" = ( @@ -18985,13 +18985,13 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aPy" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plating{ @@ -19113,7 +19113,7 @@ /area/teleporter) "aPQ" = ( /obj/structure/closet/crate, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/blue/side{ dir = 6 }, @@ -19513,7 +19513,7 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aQM" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -19645,7 +19645,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aQY" = ( @@ -19666,7 +19666,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/cable{ icon_state = "0-4"; d2 = 4 @@ -19766,9 +19766,9 @@ /area/quartermaster/office) "aRj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/folder/yellow, +/obj/item/pen, +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel, @@ -19783,10 +19783,10 @@ /area/quartermaster/office) "aRm" = ( /obj/structure/closet/crate, -/obj/item/weapon/reagent_containers/food/snacks/donut, -/obj/item/weapon/reagent_containers/food/snacks/donut, -/obj/item/weapon/reagent_containers/food/snacks/donut, -/obj/item/weapon/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, +/obj/item/reagent_containers/food/snacks/donut, /turf/open/floor/plating, /area/quartermaster/office) "aRn" = ( @@ -19905,8 +19905,8 @@ /area/hallway/secondary/exit/departure_lounge) "aRC" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -20036,10 +20036,10 @@ }, /area/maintenance/department/crew_quarters/bar) "aRQ" = ( -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/gun/ballistic/revolver/doublebarrel, /obj/structure/table/wood, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/item/stack/spacecash/c10, /obj/item/stack/spacecash/c100, /turf/open/floor/wood, @@ -20150,7 +20150,7 @@ /area/maintenance/department/crew_quarters/bar) "aSa" = ( /obj/structure/closet/secure_closet/freezer/cream_pie, -/obj/item/weapon/grown/bananapeel, +/obj/item/grown/bananapeel, /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aSb" = ( @@ -20326,7 +20326,7 @@ /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) "aSw" = ( -/obj/item/weapon/statuebust, +/obj/item/statuebust, /turf/open/floor/grass, /area/hallway/secondary/exit/departure_lounge) "aSx" = ( @@ -20343,7 +20343,7 @@ /area/hallway/secondary/exit/departure_lounge) "aSy" = ( /obj/structure/table, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 8 }, @@ -20408,11 +20408,11 @@ /area/hydroponics) "aSG" = ( /obj/structure/table, -/obj/item/weapon/book/manual/hydroponics_pod_people, -/obj/item/weapon/paper/guides/jobs/hydroponics, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/glass/bottle/mutagen, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/book/manual/hydroponics_pod_people, +/obj/item/paper/guides/jobs/hydroponics, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/glass/bottle/mutagen, +/obj/item/reagent_containers/dropper, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aSH" = ( @@ -20485,7 +20485,7 @@ /area/crew_quarters/bar) "aSQ" = ( /obj/effect/landmark/xeno_spawn, -/obj/item/weapon/storage/box/beanbag, +/obj/item/storage/box/beanbag, /turf/open/floor/wood, /area/crew_quarters/bar) "aSR" = ( @@ -20495,7 +20495,7 @@ /turf/open/floor/plating, /area/maintenance/department/crew_quarters/bar) "aSS" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/structure/cable{ d1 = 1; d2 = 4; @@ -20945,8 +20945,8 @@ /area/hallway/secondary/exit/departure_lounge) "aTJ" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/light, /turf/open/floor/plasteel, /area/hallway/secondary/exit/departure_lounge) @@ -21058,24 +21058,24 @@ /area/hydroponics) "aTW" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_y = 3 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 8; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/watertank, +/obj/item/watertank, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aTX" = ( /obj/structure/kitchenspike, /obj/item/device/assembly/mousetrap, -/obj/item/weapon/reagent_containers/food/snacks/deadmouse, +/obj/item/reagent_containers/food/snacks/deadmouse, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "aTY" = ( @@ -21141,7 +21141,7 @@ amount = 50 }, /obj/item/stack/cable_coil, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/wood{ icon_state = "wood-broken5" }, @@ -21327,7 +21327,7 @@ "aUB" = ( /obj/structure/rack, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/maintenance/department/cargo) "aUC" = ( @@ -21367,12 +21367,12 @@ /area/shuttle/escape) "aUF" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -21514,11 +21514,11 @@ /area/hydroponics) "aUS" = ( /obj/structure/closet/crate/hydroponics, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/wrench, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/wirecutters, +/obj/item/shovel/spade, +/obj/item/wrench, +/obj/item/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, +/obj/item/wirecutters, /turf/open/floor/plasteel/hydrofloor, /area/hydroponics) "aUT" = ( @@ -21629,7 +21629,7 @@ }, /area/crew_quarters/theatre) "aVh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-04"; layer = 4.1 }, @@ -21662,7 +21662,7 @@ /area/crew_quarters/theatre) "aVk" = ( /obj/structure/table/wood, -/obj/item/weapon/lipstick/random{ +/obj/item/lipstick/random{ pixel_x = 2; pixel_y = 2 }, @@ -21670,7 +21670,7 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/item/weapon/lipstick/random, +/obj/item/lipstick/random, /turf/open/floor/plasteel/black, /area/crew_quarters/theatre) "aVl" = ( @@ -21886,7 +21886,7 @@ /area/maintenance/department/cargo) "aVH" = ( /obj/structure/closet/l3closet/scientist, -/obj/item/weapon/book/manual/wiki/chemistry, +/obj/item/book/manual/wiki/chemistry, /obj/machinery/light/small{ dir = 1 }, @@ -21894,10 +21894,10 @@ /area/maintenance/department/cargo) "aVI" = ( /obj/structure/closet, -/obj/item/weapon/canvas/twentythreeXnineteen, -/obj/item/weapon/canvas/nineteenXnineteen, -/obj/item/weapon/canvas/twentythreeXtwentythree, -/obj/item/weapon/storage/crayons, +/obj/item/canvas/twentythreeXnineteen, +/obj/item/canvas/nineteenXnineteen, +/obj/item/canvas/twentythreeXtwentythree, +/obj/item/storage/crayons, /turf/open/floor/plating, /area/maintenance/department/cargo) "aVJ" = ( @@ -21907,7 +21907,7 @@ /area/shuttle/escape) "aVK" = ( /obj/structure/table, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aVL" = ( @@ -21928,7 +21928,7 @@ /area/hallway/secondary/exit/departure_lounge) "aVN" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -21998,10 +21998,10 @@ /area/hydroponics) "aVW" = ( /obj/structure/closet/chefcloset, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/showroomfloor, /area/crew_quarters/kitchen) "aVX" = ( @@ -22021,8 +22021,8 @@ /area/crew_quarters/kitchen) "aVZ" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -22354,7 +22354,7 @@ /area/hallway/secondary/exit/departure_lounge) "aWI" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/cookie, +/obj/item/reagent_containers/food/snacks/cookie, /turf/open/floor/plasteel/escape, /area/hallway/secondary/exit/departure_lounge) "aWJ" = ( @@ -22368,7 +22368,7 @@ /turf/open/floor/plasteel/escape, /area/hallway/secondary/exit/departure_lounge) "aWL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -22408,7 +22408,7 @@ /area/janitor) "aWO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/effect/landmark/start/janitor, /turf/open/floor/plasteel/black, /area/janitor) @@ -22770,7 +22770,7 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "aXD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_y = 3 @@ -22787,7 +22787,7 @@ /turf/open/floor/plasteel/escape, /area/hallway/secondary/exit/departure_lounge) "aXF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -22835,8 +22835,8 @@ name = "privacy shutters"; opacity = 0 }, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen, +/obj/item/folder/red, +/obj/item/pen, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/checkpoint/customs) @@ -22877,9 +22877,9 @@ /obj/structure/table, /obj/item/clothing/under/maid, /obj/item/key/janitor, -/obj/item/weapon/grenade/clusterbuster/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, -/obj/item/weapon/grenade/chem_grenade/cleaner, +/obj/item/grenade/clusterbuster/cleaner, +/obj/item/grenade/chem_grenade/cleaner, +/obj/item/grenade/chem_grenade/cleaner, /turf/open/floor/plasteel/vault, /area/janitor) "aXQ" = ( @@ -22893,7 +22893,7 @@ }, /area/hydroponics) "aXR" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel/neutral/side{ dir = 9 }, @@ -23038,9 +23038,9 @@ /area/crew_quarters/theatre) "aYl" = ( /obj/structure/table/wood, -/obj/item/weapon/soap, +/obj/item/soap, /obj/structure/table/wood, -/obj/item/weapon/bikehorn, +/obj/item/bikehorn, /obj/item/toy/cattoy, /turf/open/floor/plasteel/black, /area/crew_quarters/theatre) @@ -23078,11 +23078,11 @@ }, /area/quartermaster/office) "aYq" = ( -/obj/item/weapon/stamp{ +/obj/item/stamp{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/stamp/denied{ +/obj/item/stamp/denied{ pixel_x = 4; pixel_y = -2 }, @@ -23188,7 +23188,7 @@ /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/storage/box/matches, +/obj/item/storage/box/matches, /turf/open/floor/plating, /area/maintenance/department/cargo) "aYE" = ( @@ -23206,11 +23206,11 @@ /obj/item/stack/rods{ amount = 25 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /obj/effect/decal/cleanable/deadcockroach, -/obj/item/weapon/light/bulb, +/obj/item/light/bulb, /turf/open/floor/plating, /area/maintenance/department/cargo) "aYG" = ( @@ -23866,8 +23866,8 @@ /area/crew_quarters/bar) "bae" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/glass/rag, /turf/open/floor/plasteel/darkred/side{ dir = 8 }, @@ -23977,13 +23977,13 @@ /area/hallway/primary/central) "bas" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; pixel_y = -26 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /obj/structure/extinguisher_cabinet{ @@ -23993,8 +23993,8 @@ /area/quartermaster/office) "bat" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -24208,9 +24208,9 @@ }, /area/security/checkpoint/customs) "baR" = ( -/obj/item/weapon/pen, +/obj/item/pen, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel/red/side, @@ -24334,7 +24334,7 @@ }, /area/hydroponics) "bbd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -24357,7 +24357,7 @@ name = "Kitchen Desk"; req_access_txt = "28" }, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bbg" = ( @@ -24367,11 +24367,11 @@ /area/crew_quarters/kitchen) "bbh" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, +/obj/item/reagent_containers/food/condiment/peppermill, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bbi" = ( @@ -24382,7 +24382,7 @@ "bbj" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/snacks/pie/cream, +/obj/item/reagent_containers/food/snacks/pie/cream, /obj/machinery/camera{ c_tag = "Kitchen"; dir = 1; @@ -24406,7 +24406,7 @@ /area/crew_quarters/bar) "bbm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/revolver/russian, +/obj/item/gun/ballistic/revolver/russian, /turf/open/floor/plasteel/darkred/side{ dir = 8 }, @@ -24420,15 +24420,15 @@ /area/crew_quarters/bar) "bbo" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, /area/crew_quarters/bar) "bbp" = ( -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/structure/table/wood/fancy, -/obj/item/weapon/cane, +/obj/item/cane, /obj/item/device/flashlight/glowstick/random, /obj/item/device/flashlight/glowstick/random, /turf/open/floor/carpet{ @@ -24445,7 +24445,7 @@ /area/crew_quarters/bar) "bbr" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/carpet{ icon_state = "carpetsymbol" }, @@ -24523,7 +24523,7 @@ /area/quartermaster/office) "bbB" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, @@ -24532,7 +24532,7 @@ "bbC" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light/small, /turf/open/floor/plasteel, /area/quartermaster/office) @@ -24687,7 +24687,7 @@ name = "privacy shutters"; opacity = 0 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/security/checkpoint/customs) @@ -24749,7 +24749,7 @@ name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/plasteel, /area/hydroponics) "bcc" = ( @@ -24770,7 +24770,7 @@ name = "Hydroponics Desk"; req_access_txt = "35" }, -/obj/item/weapon/reagent_containers/food/snacks/monkeycube, +/obj/item/reagent_containers/food/snacks/monkeycube, /turf/open/floor/plasteel, /area/hydroponics) "bce" = ( @@ -24787,12 +24787,12 @@ /area/crew_quarters/kitchen) "bcg" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bch" = ( /obj/structure/table, -/obj/item/weapon/storage/box/ingredients/wildcard, +/obj/item/storage/box/ingredients/wildcard, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bci" = ( @@ -24931,7 +24931,7 @@ dir = 4; pixel_x = -23 }, -/obj/item/weapon/storage/belt/fannypack/yellow, +/obj/item/storage/belt/fannypack/yellow, /turf/open/floor/plasteel/brown{ dir = 9 }, @@ -25229,8 +25229,8 @@ /turf/open/floor/plasteel/floorgrime, /area/janitor) "bdi" = ( -/obj/item/weapon/reagent_containers/glass/bucket, -/obj/item/weapon/mop, +/obj/item/reagent_containers/glass/bucket, +/obj/item/mop, /obj/structure/sink{ dir = 4; pixel_x = 11 @@ -25269,12 +25269,12 @@ /area/hallway/primary/central) "bdp" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bdq" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/enzyme, +/obj/item/reagent_containers/food/condiment/enzyme, /turf/open/floor/plasteel/cafeteria, /area/crew_quarters/kitchen) "bdr" = ( @@ -25350,7 +25350,7 @@ }, /area/maintenance/department/cargo) "bdA" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -25441,8 +25441,8 @@ /area/quartermaster/miningdock) "bdJ" = ( /obj/structure/table, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /turf/open/floor/plasteel/brown/corner{ dir = 1 }, @@ -25522,7 +25522,7 @@ /area/maintenance/solars/starboard) "bdS" = ( /obj/structure/chair/stool, -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /turf/open/floor/plating, /area/maintenance/solars/starboard) "bdT" = ( @@ -25603,18 +25603,18 @@ /area/janitor) "bed" = ( /obj/structure/table, -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/restraints/legcuffs/beartrap, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/restraints/legcuffs/beartrap, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/floorgrime, /area/janitor) "bee" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed{ +/obj/item/storage/box/lights/mixed{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /turf/open/floor/plasteel/floorgrime, /area/janitor) "bef" = ( @@ -25785,7 +25785,7 @@ /area/crew_quarters/bar) "bew" = ( /obj/structure/table/reinforced, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/darkred/side{ dir = 8 }, @@ -25808,11 +25808,11 @@ /turf/open/floor/plasteel/black, /area/crew_quarters/bar) "bez" = ( -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 5; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ layer = 3.1; pixel_x = -2; pixel_y = 2 @@ -25846,7 +25846,7 @@ /area/crew_quarters/bar) "beD" = ( /obj/structure/table/wood, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /obj/item/clothing/glasses/regular/hipster, /turf/open/floor/plasteel/vault{ dir = 5 @@ -25894,16 +25894,16 @@ /area/science/robotics/mechbay) "beJ" = ( /obj/structure/table, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6; pixel_y = 5 }, -/obj/item/weapon/cartridge/quartermaster, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster, +/obj/item/cartridge/quartermaster{ pixel_x = -4; pixel_y = 7 }, -/obj/item/weapon/coin/silver, +/obj/item/coin/silver, /obj/machinery/status_display{ dir = 4; layer = 4; @@ -25970,12 +25970,12 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "beS" = ( -/obj/item/weapon/caution, +/obj/item/caution, /turf/open/floor/plating, /area/maintenance/department/cargo) "beT" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plating, @@ -26155,7 +26155,7 @@ /turf/open/floor/plasteel/green/corner, /area/hydroponics) "bfm" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel, /area/hydroponics) @@ -26221,7 +26221,7 @@ /area/maintenance/department/cargo) "bfv" = ( /obj/structure/table, -/obj/item/weapon/crowbar/large, +/obj/item/crowbar/large, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -26230,7 +26230,7 @@ /area/science/robotics/mechbay) "bfw" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/power/apc{ dir = 1; name = "Mech Bay APC"; @@ -26289,8 +26289,8 @@ /area/quartermaster/qm) "bfC" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/qm, +/obj/item/clipboard, +/obj/item/stamp/qm, /obj/machinery/light, /obj/machinery/camera{ c_tag = "Cargo Quartermaster's Office"; @@ -26315,14 +26315,14 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/pickaxe{ +/obj/item/pickaxe{ pixel_x = 5 }, -/obj/item/weapon/shovel{ +/obj/item/shovel{ pixel_x = -5 }, /obj/machinery/camera{ @@ -26408,7 +26408,7 @@ dir = 4 }, /obj/structure/table, -/obj/item/weapon/paperplane, +/obj/item/paperplane, /obj/item/trash/chips, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -26419,16 +26419,16 @@ "bfP" = ( /obj/structure/closet/cabinet, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/circuitboard/machine/hydroponics, -/obj/item/weapon/electronics/apc, +/obj/item/circuitboard/machine/hydroponics, +/obj/item/electronics/apc, /turf/open/floor/plating, /area/maintenance/department/cargo) "bfQ" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) "bfR" = ( @@ -26632,7 +26632,7 @@ "bgo" = ( /obj/structure/table, /obj/item/trash/plate, -/obj/item/weapon/storage/fancy/rollingpapers, +/obj/item/storage/fancy/rollingpapers, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -26663,7 +26663,7 @@ /area/hallway/primary/central) "bgs" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/neutral/corner{ dir = 1 }, @@ -26684,7 +26684,7 @@ /turf/open/floor/plasteel, /area/crew_quarters/bar) "bgv" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -26846,7 +26846,7 @@ /area/quartermaster/miningdock) "bgN" = ( /obj/structure/table, -/obj/item/weapon/paperplane, +/obj/item/paperplane, /turf/open/floor/plating, /area/maintenance/department/cargo) "bgO" = ( @@ -27459,8 +27459,8 @@ /area/shuttle/labor) "bhX" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/tank/internals/emergency_oxygen, +/obj/item/storage/firstaid/o2, +/obj/item/tank/internals/emergency_oxygen, /obj/item/clothing/mask/breath, /turf/open/floor/mineral/titanium/blue, /area/shuttle/arrival) @@ -27747,7 +27747,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "small" }, /turf/open/floor/plating, @@ -27771,7 +27771,7 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "biG" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /turf/open/floor/plating{ icon_state = "platingdmg1" }, @@ -27849,7 +27849,7 @@ /obj/item/device/healthanalyzer{ layer = 3.1 }, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 3.2 }, /turf/open/floor/plasteel/blue/side, @@ -27865,7 +27865,7 @@ /turf/open/floor/plasteel/purple/side, /area/hallway/primary/central) "biQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1 }, @@ -27969,7 +27969,7 @@ /turf/open/floor/plasteel/white/side, /area/medical/medbay/central) "bji" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -27994,7 +27994,7 @@ /turf/open/floor/plasteel/purple/side, /area/hallway/primary/central) "bjn" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -28031,8 +28031,8 @@ /area/science/robotics/mechbay) "bjv" = ( /obj/structure/closet, -/obj/item/weapon/weldingtool, -/obj/item/weapon/crowbar, +/obj/item/weldingtool, +/obj/item/crowbar, /turf/open/floor/plating, /area/maintenance/department/cargo) "bjw" = ( @@ -28312,7 +28312,7 @@ /area/medical/medbay/central) "bkc" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -28408,7 +28408,7 @@ pixel_y = -4 }, /obj/item/clothing/head/welding, -/obj/item/weapon/screwdriver{ +/obj/item/screwdriver{ pixel_y = 16 }, /turf/open/floor/plasteel/purple/side{ @@ -28423,10 +28423,10 @@ /area/science/research/lobby) "bks" = ( /obj/structure/table, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/cable_coil, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/purple/side{ dir = 1 }, @@ -28452,8 +28452,8 @@ name = "Robotics Desk"; req_access_txt = "29" }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "robotics"; name = "robotics lab shutters" @@ -28552,7 +28552,7 @@ /turf/closed/wall/r_wall, /area/science/xenobiology) "bkJ" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/maintenance/department/cargo) "bkK" = ( @@ -28572,7 +28572,7 @@ d2 = 8; icon_state = "2-8" }, -/obj/item/weapon/reagent_containers/food/snacks/deadmouse, +/obj/item/reagent_containers/food/snacks/deadmouse, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 10 }, @@ -28591,7 +28591,7 @@ /turf/open/floor/plating, /area/maintenance/department/cargo) "bkO" = ( -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/air, /turf/open/floor/plating, /area/maintenance/department/cargo) "bkP" = ( @@ -28645,9 +28645,9 @@ /turf/closed/wall, /area/construction/mining/aux_base/closet) "bkW" = ( -/obj/item/weapon/hemostat, -/obj/item/weapon/retractor, -/obj/item/weapon/cautery, +/obj/item/hemostat, +/obj/item/retractor, +/obj/item/cautery, /obj/effect/spawner/lootdrop/maintenance, /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" @@ -28757,8 +28757,8 @@ /area/security/checkpoint/medical) "blk" = ( /obj/structure/table, -/obj/item/weapon/pen, -/obj/item/weapon/paper_bin{ +/obj/item/pen, +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel/red/side{ @@ -28801,7 +28801,7 @@ /area/medical/medbay/central) "blq" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags{ +/obj/item/storage/box/bodybags{ pixel_x = 3; pixel_y = 2 }, @@ -28811,7 +28811,7 @@ /area/medical/medbay/central) "blr" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/device/healthanalyzer, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 @@ -28842,7 +28842,7 @@ "blw" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/purple/side{ dir = 1 }, @@ -29136,12 +29136,12 @@ /area/maintenance/department/cargo) "bmb" = ( /obj/item/trash/candle, -/obj/item/weapon/cautery, +/obj/item/cautery, /turf/open/floor/plating, /area/maintenance/department/cargo) "bmc" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/food/drinks/britcup{ desc = "Kingston's personal cup." }, /obj/machinery/light/small{ @@ -29245,17 +29245,17 @@ /area/storage/emergency/port) "bmk" = ( /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/crowbar, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/freezer, /area/storage/emergency/port) "bml" = ( /obj/structure/table, -/obj/item/weapon/storage/box/gloves{ +/obj/item/storage/box/gloves{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/masks, +/obj/item/storage/box/masks, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -29296,8 +29296,8 @@ /area/medical/morgue) "bmr" = ( /obj/structure/table, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Morgue"; dir = 8 @@ -29343,13 +29343,13 @@ /area/security/checkpoint/medical) "bmv" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/red/side{ dir = 6 }, /area/security/checkpoint/medical) "bmw" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1 }, @@ -29429,11 +29429,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -29746,7 +29746,7 @@ /area/medical/medbay/zone3) "bny" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/firealarm{ dir = 8; @@ -29757,9 +29757,9 @@ /area/medical/medbay/zone3) "bnz" = ( /obj/structure/table, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /turf/open/floor/plasteel/black, /area/medical/morgue) "bnA" = ( @@ -29783,14 +29783,14 @@ /area/security/checkpoint/medical) "bnC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/britcup{ +/obj/item/reagent_containers/food/drinks/britcup{ desc = "Kingston's personal cup." }, /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) "bnD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = 1 }, /turf/open/floor/plasteel/whiteblue/corner{ @@ -29975,7 +29975,7 @@ /area/science/explab) "bob" = ( /obj/machinery/atmospherics/pipe/manifold/general/visible, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/engine, /area/science/explab) "boc" = ( @@ -30002,11 +30002,11 @@ /area/science/xenobiology) "bof" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -30022,10 +30022,10 @@ /area/science/xenobiology) "boh" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -30037,7 +30037,7 @@ /turf/open/floor/engine, /area/science/xenobiology) "boj" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/cargo) @@ -30173,7 +30173,7 @@ /turf/open/floor/plasteel/black, /area/medical/morgue) "boD" = ( -/obj/item/weapon/ectoplasm, +/obj/item/ectoplasm, /turf/open/floor/plasteel/black, /area/medical/morgue) "boE" = ( @@ -30236,8 +30236,8 @@ /area/medical/medbay/central) "boJ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/whiteblue/side{ dir = 8 }, @@ -30265,7 +30265,7 @@ "boO" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine, +/obj/item/reagent_containers/glass/bottle/epinephrine, /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) "boP" = ( @@ -30278,12 +30278,12 @@ /area/science/research/lobby) "boR" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/purple/side, /area/science/research/lobby) "boS" = ( @@ -30291,7 +30291,7 @@ /turf/open/floor/plasteel/purple/side, /area/science/research/lobby) "boT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-17" }, /turf/open/floor/plasteel/purple/side, @@ -30332,7 +30332,7 @@ "boZ" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -30403,8 +30403,8 @@ /area/science/explab) "bpg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/book/manual/experimentor, +/obj/item/folder, +/obj/item/book/manual/experimentor, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -30457,7 +30457,7 @@ /obj/structure/rack, /obj/item/stack/packageWrap, /obj/item/stack/cable_coil, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -30508,8 +30508,8 @@ /area/maintenance/department/cargo) "bpt" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/light/small, /turf/open/floor/plasteel, /area/hallway/secondary/entry) @@ -30529,7 +30529,7 @@ /area/medical/genetics) "bpw" = ( /obj/structure/flora/grass/jungle, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, /turf/open/floor/grass, /area/medical/genetics) "bpx" = ( @@ -30804,8 +30804,8 @@ id = "chemistry_shutters"; name = "chemistry shutters" }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/whiteyellow{ dir = 4 }, @@ -30848,7 +30848,7 @@ /area/science/explab) "bqc" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 3.1 }, /obj/machinery/door/firedoor, @@ -30861,7 +30861,7 @@ id = "research_shutters_2"; name = "research shutters" }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /turf/open/floor/plating, /area/science/explab) "bqd" = ( @@ -30894,12 +30894,12 @@ /area/science/research/lobby) "bqg" = ( /obj/structure/table, -/obj/item/weapon/book/manual/robotics_cyborgs{ +/obj/item/book/manual/robotics_cyborgs{ pixel_x = 2; pixel_y = 5 }, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/storage/belt/utility, +/obj/item/reagent_containers/glass/beaker/large, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; @@ -30975,8 +30975,8 @@ /area/science/server) "bqn" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/science/server) "bqo" = ( @@ -31290,7 +31290,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/department/cargo) "bqP" = ( @@ -31322,7 +31322,7 @@ "bqT" = ( /obj/structure/flora/grass/jungle/b, /obj/structure/flora/ausbushes/ppflowers, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, /obj/machinery/camera{ c_tag = "Genetics Monkey Pen Fore"; dir = 4; @@ -31526,11 +31526,11 @@ }, /area/medical/chemistry) "brl" = ( -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/beaker/large, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/item/clothing/glasses/science, /turf/open/floor/plasteel/whiteyellow/side{ dir = 1 @@ -31567,8 +31567,8 @@ /area/hallway/primary/aft) "brp" = ( /obj/structure/table, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/machinery/requests_console{ department = "Science"; departmentType = 2; @@ -31576,7 +31576,7 @@ pixel_x = -32; receive_ore_updates = 1 }, -/obj/item/weapon/book/manual/research_and_development, +/obj/item/book/manual/research_and_development, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 }, @@ -31622,7 +31622,7 @@ }, /area/science/explab) "bru" = ( -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/holopad, /turf/open/floor/plasteel/whitepurple/side{ dir = 1 @@ -31673,25 +31673,25 @@ pixel_x = -8; pixel_y = 4 }, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus{ +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus{ pixel_x = 5; pixel_y = -5 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/table, /turf/open/floor/plasteel, /area/science/robotics/lab) "brz" = ( -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 }, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_y = 5 }, /obj/structure/window/reinforced{ @@ -31719,7 +31719,7 @@ /area/science/robotics/lab) "brC" = ( /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/structure/window/reinforced{ dir = 1; pixel_y = 1 @@ -31792,12 +31792,12 @@ /area/science/explab) "brM" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /obj/machinery/firealarm{ dir = 4; pixel_x = 28 @@ -31806,8 +31806,8 @@ /area/science/explab) "brN" = ( /obj/structure/table/glass, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/plasteel/white, /area/science/xenobiology) "brO" = ( @@ -31839,7 +31839,7 @@ /turf/closed/wall, /area/science/xenobiology) "brS" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/effect/turf_decal/stripes/line{ dir = 2 }, @@ -32269,8 +32269,8 @@ /turf/open/floor/plasteel/white, /area/medical/chemistry) "bsL" = ( -/obj/item/weapon/book/manual/wiki/chemistry, -/obj/item/weapon/storage/box/beakers, +/obj/item/book/manual/wiki/chemistry, +/obj/item/storage/box/beakers, /obj/structure/table/glass, /turf/open/floor/plasteel/white, /area/medical/chemistry) @@ -32311,8 +32311,8 @@ /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, -/obj/item/weapon/disk/tech_disk, -/obj/item/weapon/disk/design_disk, +/obj/item/disk/tech_disk, +/obj/item/disk/design_disk, /turf/open/floor/plasteel/white, /area/science/explab) "bsR" = ( @@ -32353,7 +32353,7 @@ }, /area/science/research/lobby) "bsW" = ( -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/plasteel/black, /area/science/robotics/lab) "bsX" = ( @@ -32370,15 +32370,15 @@ /turf/open/floor/plasteel/green/side, /area/science/robotics/lab) "bsZ" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ empty = 1; name = "First-Aid (empty)" }, @@ -32391,8 +32391,8 @@ /turf/open/floor/plasteel/green/side, /area/science/robotics/lab) "bta" = ( -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/retractor, +/obj/item/hemostat, /obj/structure/window/reinforced{ dir = 8; layer = 2.9 @@ -32448,8 +32448,8 @@ /area/science/server) "btg" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /turf/open/floor/plasteel/white, /area/science/explab) "bth" = ( @@ -32467,7 +32467,7 @@ /area/science/explab) "btk" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/clothing/ears/earmuffs, /turf/open/floor/plasteel/white, /area/science/explab) @@ -32492,13 +32492,13 @@ }, /obj/item/stack/cable_coil, /obj/item/device/multitool, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/white, /area/science/explab) "btn" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/clothing/glasses/science, /obj/item/clothing/glasses/science, /turf/open/floor/plasteel/white, @@ -32675,7 +32675,7 @@ /obj/structure/chair{ dir = 4 }, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb, +/obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb, /turf/open/floor/plating, /area/maintenance/department/cargo) "btG" = ( @@ -32804,12 +32804,12 @@ "btT" = ( /obj/structure/flora/junglebush, /obj/structure/flora/ausbushes/sunnybush, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, /mob/living/carbon/monkey, /turf/open/floor/grass, /area/medical/genetics) "btU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whiteblue/side, @@ -32831,7 +32831,7 @@ /area/medical/genetics) "btX" = ( /obj/structure/table, -/obj/item/weapon/book/manual/medical_cloning{ +/obj/item/book/manual/medical_cloning{ pixel_y = 6 }, /obj/structure/disposalpipe/segment, @@ -32840,12 +32840,12 @@ /area/medical/genetics) "btY" = ( /obj/structure/table, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/bodybags, -/obj/item/weapon/pen, +/obj/item/storage/box/bodybags, +/obj/item/pen, /obj/machinery/button/door{ desc = "A remote control switch for the genetics doors."; id = "GeneticsDoor"; @@ -32881,7 +32881,7 @@ /turf/open/floor/plasteel/white, /area/medical/sleeper) "bud" = ( -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /obj/machinery/atmospherics/pipe/manifold/general/visible, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -32984,12 +32984,12 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/reagent_containers/glass/beaker/large, +/obj/item/reagent_containers/glass/beaker/large, /obj/machinery/airalarm{ dir = 4; pixel_x = -22 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /obj/item/clothing/glasses/welding, /turf/open/floor/plasteel/white, /area/science/explab) @@ -33061,7 +33061,7 @@ /area/science/robotics/lab) "buw" = ( /obj/machinery/atmospherics/pipe/simple/supply/hidden, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-07"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -33080,7 +33080,7 @@ /turf/open/floor/plasteel/black, /area/science/server) "buy" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-07"; name = "Photosynthetic Potted plant"; pixel_y = 10 @@ -33125,7 +33125,7 @@ /obj/machinery/light{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-14"; layer = 4.1 }, @@ -33599,7 +33599,7 @@ /obj/machinery/r_n_d/circuit_imprinter{ pixel_y = 4 }, -/obj/item/weapon/reagent_containers/glass/beaker/sulphuric, +/obj/item/reagent_containers/glass/beaker/sulphuric, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/science/explab) @@ -33848,7 +33848,7 @@ }, /area/science/research) "bvU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1 }, @@ -34073,7 +34073,7 @@ "bws" = ( /obj/structure/closet, /obj/item/stack/cable_coil/random, -/obj/item/weapon/electronics/airalarm, +/obj/item/electronics/airalarm, /turf/open/floor/plating, /area/maintenance/department/engine) "bwt" = ( @@ -34094,8 +34094,8 @@ /area/medical/genetics) "bwv" = ( /obj/structure/table, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, +/obj/item/folder/white, +/obj/item/pen, /obj/machinery/airalarm{ pixel_y = 22 }, @@ -34141,11 +34141,11 @@ /area/medical/genetics) "bwA" = ( /obj/structure/table, -/obj/item/weapon/storage/box/rxglasses{ +/obj/item/storage/box/rxglasses{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/bodybags, +/obj/item/storage/box/bodybags, /turf/open/floor/plasteel/whitepurple/side{ dir = 5 }, @@ -34329,7 +34329,7 @@ "bwV" = ( /obj/structure/rack, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/item/device/radio/headset/headset_med, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/white, @@ -35097,7 +35097,7 @@ /area/medical/genetics) "byf" = ( /obj/structure/table, -/obj/item/weapon/storage/box/disks, +/obj/item/storage/box/disks, /obj/item/device/flashlight/pen, /obj/item/device/flashlight/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -35140,7 +35140,7 @@ /obj/structure/table, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/gloves/color/latex, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/machinery/light{ dir = 4 }, @@ -35287,11 +35287,11 @@ name = "Chemistry Desk"; req_access_txt = "5; 33" }, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2 }, @@ -35339,9 +35339,9 @@ name = "Research and Development Desk"; req_access_txt = "7" }, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/machinery/door/firedoor, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/door/poddoor/shutters/preopen{ id = "research_shutters_2"; name = "research shutters" @@ -35487,7 +35487,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-09"; name = "Photosynthetic Potted plant"; pixel_y = 4 @@ -35508,8 +35508,8 @@ /area/science/research) "byV" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden, /turf/open/floor/plasteel/black, /area/science/research) @@ -35610,17 +35610,17 @@ /turf/open/floor/plasteel/whitepurple/side, /area/science/xenobiology) "bzh" = ( -/obj/item/weapon/storage/box/monkeycubes, -/obj/item/weapon/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, +/obj/item/storage/box/monkeycubes, /obj/structure/table/glass, /turf/open/floor/plasteel/whitepurple/side, /area/science/xenobiology) "bzi" = ( -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ pixel_x = 4; pixel_y = 3 }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /obj/structure/table/glass, /turf/open/floor/plasteel/whitepurple/side, /area/science/xenobiology) @@ -35923,7 +35923,7 @@ name = "Monkey Pen"; req_one_access_txt = "9" }, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, /turf/open/floor/grass, /area/medical/genetics) "bzG" = ( @@ -35973,7 +35973,7 @@ /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 5 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10"; layer = 4.1 }, @@ -36164,17 +36164,17 @@ amount = 2; layer = 2.9 }, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, -/obj/item/weapon/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, +/obj/item/grenade/chem_grenade, /obj/item/stack/cable_coil/random, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plasteel/whiteyellow/side{ dir = 6 }, /area/medical/chemistry) "bAi" = ( -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/clothing/gloves/color/latex, /obj/structure/table/glass, /turf/open/floor/plasteel/yellow/side{ @@ -36206,7 +36206,7 @@ dir = 4 }, /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2; pixel_y = 4 @@ -36252,14 +36252,14 @@ /area/science/explab) "bAq" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/capacitor, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/capacitor, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /obj/item/device/multitool, /obj/structure/window/reinforced, /turf/open/floor/plasteel/whitepurple/side, @@ -36267,18 +36267,18 @@ "bAr" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/structure/window/reinforced, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plasteel/whitepurple/side, /area/science/explab) "bAs" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/matter_bin, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/matter_bin, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/machinery/light_switch{ @@ -36421,7 +36421,7 @@ d2 = 2; icon_state = "1-2" }, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating{ burnt = 1; icon_state = "panelscorched" @@ -36451,9 +36451,9 @@ /area/medical/genetics) "bAQ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/storage/pill_bottle/mutadone, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/storage/pill_bottle/mutadone, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -36718,7 +36718,7 @@ }, /area/crew_quarters/heads/hor) "bBu" = ( -/obj/item/weapon/twohanded/required/kirbyplants/dead, +/obj/item/twohanded/required/kirbyplants/dead, /obj/structure/disposalpipe/segment{ dir = 2; icon_state = "pipe-c" @@ -36786,7 +36786,7 @@ }, /area/science/research/lobby) "bBB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-20"; layer = 4.1; pixel_y = 3 @@ -36976,13 +36976,13 @@ /area/maintenance/department/engine) "bBZ" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/item/device/radio/intercom{ dir = 0; name = "Station Intercom (General)"; pixel_x = -27 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel/whitepurple/side{ @@ -37080,9 +37080,9 @@ name = "Treatment Center APC"; pixel_x = -24 }, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/reagent_containers/glass/beaker/cryoxadone, /obj/structure/cable, /turf/open/floor/plasteel/blue, /area/medical/sleeper) @@ -37156,11 +37156,11 @@ /area/crew_quarters/heads/cmo) "bCs" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 3.1 }, /obj/structure/disposalpipe/segment{ @@ -37170,7 +37170,7 @@ /area/crew_quarters/heads/cmo) "bCt" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white, +/obj/item/folder/white, /obj/item/clothing/glasses/hud/health, /obj/structure/disposalpipe/segment{ dir = 4 @@ -37505,7 +37505,7 @@ /obj/effect/turf_decal/stripes/line{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -37547,7 +37547,7 @@ /area/maintenance/department/engine) "bDk" = ( /obj/item/chair, -/obj/item/weapon/cigbutt/roach, +/obj/item/cigbutt/roach, /turf/open/floor/plating, /area/maintenance/department/engine) "bDl" = ( @@ -37734,8 +37734,8 @@ /area/science/research/lobby) "bDK" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /obj/structure/sign/poster/random{ pixel_x = 32 }, @@ -38091,11 +38091,11 @@ /area/medical/virology) "bEv" = ( /obj/structure/table, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/structure/extinguisher_cabinet{ pixel_x = -26 }, @@ -38105,12 +38105,12 @@ /area/medical/medbay/central) "bEw" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38120,12 +38120,12 @@ /area/medical/medbay/central) "bEx" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38135,12 +38135,12 @@ /area/medical/medbay/central) "bEy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38150,12 +38150,12 @@ /area/medical/medbay/central) "bEz" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/regular{ pixel_x = -3; pixel_y = -3 }, @@ -38183,7 +38183,7 @@ /area/medical/medbay/central) "bED" = ( /obj/structure/closet/secure_closet/CMO, -/obj/item/weapon/valentine, +/obj/item/valentine, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "bEE" = ( @@ -38191,31 +38191,31 @@ /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "bEF" = ( -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = -2; pixel_y = 6 }, -/obj/item/weapon/cartridge/medical{ +/obj/item/cartridge/medical{ pixel_x = 6; pixel_y = 3 }, -/obj/item/weapon/cartridge/medical, -/obj/item/weapon/cartridge/chemistry{ +/obj/item/cartridge/medical, +/obj/item/cartridge/chemistry{ pixel_y = 2 }, /obj/structure/table, /obj/machinery/light, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "bEG" = ( -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/cmo, +/obj/item/folder/blue, +/obj/item/stamp/cmo, /obj/structure/table, /turf/open/floor/plasteel/cmo, /area/crew_quarters/heads/cmo) "bEH" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-16"; layer = 4.1 }, @@ -38250,12 +38250,12 @@ }, /obj/machinery/vending/wallmed{ pixel_y = 28; - products = list(/obj/item/weapon/reagent_containers/syringe = 3, /obj/item/weapon/reagent_containers/pill/patch/styptic = 1, /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/weapon/reagent_containers/spray/medical/sterilizer = 1) + products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/spray/medical/sterilizer = 1) }, /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/effect/landmark/blobstart, -/obj/item/weapon/melee/baton/cattleprod{ - cell = new /obj/item/weapon/stock_parts/cell/high() +/obj/item/melee/baton/cattleprod{ + cell = new /obj/item/stock_parts/cell/high() }, /turf/open/floor/plasteel/black, /area/medical/exam_room) @@ -38335,7 +38335,7 @@ /turf/open/floor/plasteel/yellow/corner, /area/hallway/primary/aft) "bEQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-03"; layer = 4.1 }, @@ -38357,7 +38357,7 @@ "bES" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/circuitboard/aicore, +/obj/item/circuitboard/aicore, /obj/machinery/requests_console{ announcementConsole = 1; department = "Research Director's Desk"; @@ -38370,14 +38370,14 @@ /turf/open/floor/plasteel/darkpurple/side, /area/crew_quarters/heads/hor) "bET" = ( -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen, -/obj/item/weapon/stamp/rd, +/obj/item/folder/white, +/obj/item/pen, +/obj/item/stamp/rd, /obj/machinery/status_display{ density = 0; pixel_y = -30; @@ -38392,12 +38392,12 @@ /turf/open/floor/plasteel/darkpurple/side, /area/crew_quarters/heads/hor) "bEU" = ( -/obj/item/weapon/cartridge/signal/toxins, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins, +/obj/item/cartridge/signal/toxins{ pixel_x = -4; pixel_y = 2 }, -/obj/item/weapon/cartridge/signal/toxins{ +/obj/item/cartridge/signal/toxins{ pixel_x = 4; pixel_y = 6 }, @@ -38538,8 +38538,8 @@ /area/science/mixing) "bFk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/screwdriver{ +/obj/item/wrench, +/obj/item/screwdriver{ pixel_y = 10 }, /obj/item/device/analyzer, @@ -38745,7 +38745,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, @@ -38924,14 +38924,14 @@ /obj/structure/table/glass, /obj/item/device/flashlight/pen, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/lipstick/black, +/obj/item/lipstick/black, /obj/machinery/power/apc{ dir = 8; name = "Personal Examination Room APC"; pixel_x = -25 }, /obj/structure/cable, -/obj/item/weapon/reagent_containers/pill/morphine, +/obj/item/reagent_containers/pill/morphine, /turf/open/floor/plasteel/black, /area/medical/exam_room) "bFW" = ( @@ -38945,9 +38945,9 @@ /area/medical/exam_room) "bFX" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cmo, +/obj/item/bedsheet/cmo, /obj/effect/decal/cleanable/blood/drip, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/clothing/mask/muzzle, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/black, @@ -39250,7 +39250,7 @@ /area/maintenance/department/engine) "bGL" = ( /obj/structure/closet/masks, -/obj/item/weapon/reagent_containers/food/snacks/deadmouse, +/obj/item/reagent_containers/food/snacks/deadmouse, /obj/effect/landmark/revenantspawn, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -39398,7 +39398,7 @@ /area/medical/medbay/central) "bHb" = ( /obj/structure/closet/crate/freezer/surplus_limbs, -/obj/item/weapon/reagent_containers/glass/beaker/synthflesh, +/obj/item/reagent_containers/glass/beaker/synthflesh, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, @@ -39469,7 +39469,7 @@ }, /area/science/research/lobby) "bHj" = ( -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/glasses/science, /obj/machinery/atmospherics/pipe/manifold/supply/hidden{ dir = 1 @@ -39888,19 +39888,19 @@ /area/medical/medbay/central) "bIg" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, -/obj/item/weapon/storage/belt/medical{ +/obj/item/storage/belt/medical{ pixel_y = 2 }, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, /obj/item/clothing/glasses/hud/health, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) "bIh" = ( @@ -40003,7 +40003,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden, /obj/machinery/vending/wallmed{ pixel_y = 28; - products = list(/obj/item/weapon/reagent_containers/syringe = 3, /obj/item/weapon/reagent_containers/pill/patch/styptic = 1, /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/weapon/reagent_containers/spray/medical/sterilizer = 1) + products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/spray/medical/sterilizer = 1) }, /turf/open/floor/plasteel/whiteblue/side{ dir = 1 @@ -40354,7 +40354,7 @@ /area/maintenance/department/engine) "bJf" = ( /obj/structure/chair/comfy/black, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/vault{ dir = 5 }, @@ -40372,20 +40372,20 @@ /turf/open/floor/plasteel/black, /area/maintenance/department/engine) "bJi" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plating, /area/maintenance/department/engine) "bJj" = ( /obj/structure/rack, -/obj/item/weapon/cartridge/medical, +/obj/item/cartridge/medical, /turf/open/floor/plating, /area/maintenance/department/engine) "bJk" = ( /obj/structure/table/glass, -/obj/item/weapon/book/manual/wiki/infections, -/obj/item/weapon/hand_labeler, +/obj/item/book/manual/wiki/infections, +/obj/item/hand_labeler, /obj/item/device/radio/headset/headset_med, /obj/machinery/light{ dir = 8 @@ -40607,7 +40607,7 @@ /obj/machinery/atmospherics/pipe/manifold/scrubbers/hidden{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 3 }, @@ -40931,7 +40931,7 @@ }, /area/medical/virology) "bKv" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed, /obj/effect/landmark/revenantspawn, /obj/structure/mirror{ @@ -40945,7 +40945,7 @@ "bKw" = ( /obj/machinery/vending/wallmed{ pixel_y = 28; - products = list(/obj/item/weapon/reagent_containers/syringe = 3, /obj/item/weapon/reagent_containers/pill/patch/styptic = 1, /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/weapon/reagent_containers/spray/medical/sterilizer = 1) + products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 1, /obj/item/reagent_containers/pill/patch/silver_sulf = 1, /obj/item/reagent_containers/spray/medical/sterilizer = 1) }, /obj/machinery/atmospherics/components/unary/vent_pump/on{ dir = 4 @@ -41299,8 +41299,8 @@ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/storage/bag/ore, +/obj/item/storage/bag/ore, +/obj/item/storage/bag/ore, /turf/open/floor/plasteel, /area/science/mineral_storeroom) "bLk" = ( @@ -41405,7 +41405,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bLz" = ( -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/bed, /obj/effect/decal/cleanable/cobweb, /obj/effect/landmark/revenantspawn, @@ -41417,13 +41417,13 @@ /area/medical/virology) "bLB" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/effect/landmark/revenantspawn, /turf/open/floor/plasteel/freezer, /area/medical/virology) "bLC" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/structure/disposalpipe/segment, /turf/open/floor/plasteel/white, /area/medical/virology) @@ -41444,7 +41444,7 @@ pixel_x = 32; receive_ore_updates = 1 }, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ layer = 3.1 }, /obj/item/stack/sheet/mineral/plasma{ @@ -41458,10 +41458,10 @@ /area/medical/virology) "bLF" = ( /obj/structure/table, -/obj/item/weapon/clipboard{ +/obj/item/clipboard{ toppaper = null }, -/obj/item/weapon/pen{ +/obj/item/pen{ layer = 3.1 }, /obj/item/clothing/neck/stethoscope{ @@ -41548,7 +41548,7 @@ /area/medical/surgery) "bLQ" = ( /obj/structure/table, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/whiteblue/side{ dir = 4 }, @@ -41566,7 +41566,7 @@ }, /area/hallway/primary/aft) "bLT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "applebush"; layer = 4.1 }, @@ -41908,16 +41908,16 @@ /area/medical/virology) "bMJ" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/beakers{ +/obj/item/storage/box/beakers{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/syringes, +/obj/item/storage/box/syringes, /obj/structure/reagent_dispensers/virusfood{ density = 0; pixel_x = 32 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /turf/open/floor/plasteel/whitegreen/side{ icon_state = "whitegreen"; dir = 6 @@ -41931,9 +41931,9 @@ /area/medical/medbay/central) "bML" = ( /obj/machinery/light, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/item/clothing/neck/stethoscope, -/obj/item/weapon/gun/syringe, +/obj/item/gun/syringe, /obj/structure/table/glass, /turf/open/floor/plasteel/whiteblue/side, /area/medical/medbay/central) @@ -41945,37 +41945,37 @@ /area/medical/medbay/central) "bMN" = ( /obj/structure/table, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /obj/item/stack/medical/gauze, /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "bMO" = ( /obj/structure/table, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "bMP" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /obj/machinery/light, /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "bMQ" = ( /obj/structure/table, -/obj/item/weapon/cautery{ +/obj/item/cautery{ pixel_x = 4 }, -/obj/item/weapon/razor{ +/obj/item/razor{ pixel_y = 5 }, /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "bMR" = ( /obj/structure/table, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/whiteblue, /area/medical/surgery) "bMS" = ( @@ -42325,35 +42325,35 @@ /area/maintenance/department/engine) "bNL" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, /obj/machinery/light/small, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/freezer, /area/medical/virology) "bNM" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/freezer, /area/medical/virology) "bNN" = ( /obj/structure/table/glass, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_y = 4 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /obj/machinery/light/small, /turf/open/floor/plasteel/freezer, /area/medical/virology) "bNO" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, -/obj/item/weapon/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /turf/open/floor/plasteel/freezer, /area/medical/virology) @@ -42367,14 +42367,14 @@ /obj/machinery/light, /obj/machinery/atmospherics/pipe/simple/cyan/hidden, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, -/obj/item/weapon/pen/red, +/obj/item/pen/red, /turf/open/floor/plasteel/whitegreen/side, /area/medical/virology) "bNR" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21" }, /turf/open/floor/plasteel/whitegreen/side, @@ -42395,7 +42395,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bNV" = ( -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /turf/open/floor/plating, /area/maintenance/department/engine) "bNW" = ( @@ -42850,7 +42850,7 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/t_scanner, /obj/item/device/t_scanner, /obj/item/device/t_scanner, @@ -43015,8 +43015,8 @@ /area/maintenance/department/engine) "bPr" = ( /obj/structure/table, -/obj/item/weapon/paper, -/obj/item/weapon/pen, +/obj/item/paper, +/obj/item/pen, /turf/open/floor/plasteel/black, /area/maintenance/department/engine) "bPs" = ( @@ -43133,18 +43133,18 @@ /area/hallway/primary/aft) "bPJ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime, +/obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bPK" = ( /obj/structure/table, /obj/item/clothing/gloves/color/fyellow, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bPL" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel, /area/hallway/primary/aft) "bPM" = ( @@ -43394,7 +43394,7 @@ "bQt" = ( /obj/structure/table, /obj/item/device/aicard, -/obj/item/weapon/aiModule/reset, +/obj/item/aiModule/reset, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /obj/machinery/airalarm{ dir = 2; @@ -43407,7 +43407,7 @@ /obj/machinery/cell_charger{ pixel_y = 5 }, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bQv" = ( @@ -43415,21 +43415,21 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/pandemic{ +/obj/item/circuitboard/computer/pandemic{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/circuitboard/computer/rdconsole, -/obj/item/weapon/circuitboard/machine/rdserver{ +/obj/item/circuitboard/computer/rdconsole, +/obj/item/circuitboard/machine/rdserver{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/destructive_analyzer, -/obj/item/weapon/circuitboard/machine/protolathe, -/obj/item/weapon/circuitboard/computer/aifixer, -/obj/item/weapon/circuitboard/computer/teleporter, -/obj/item/weapon/circuitboard/machine/circuit_imprinter, -/obj/item/weapon/circuitboard/machine/mechfab, +/obj/item/circuitboard/machine/destructive_analyzer, +/obj/item/circuitboard/machine/protolathe, +/obj/item/circuitboard/computer/aifixer, +/obj/item/circuitboard/computer/teleporter, +/obj/item/circuitboard/machine/circuit_imprinter, +/obj/item/circuitboard/machine/mechfab, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -43440,12 +43440,12 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/mining, -/obj/item/weapon/circuitboard/machine/autolathe{ +/obj/item/circuitboard/computer/mining, +/obj/item/circuitboard/machine/autolathe{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/computer/arcade/battle, +/obj/item/circuitboard/computer/arcade/battle, /obj/machinery/light{ dir = 1; light_color = "#cee5d2" @@ -43455,29 +43455,29 @@ dir = 2; network = list("SS13") }, -/obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle, +/obj/item/circuitboard/computer/shuttle/monastery_shuttle, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bQx" = ( /obj/structure/rack, -/obj/item/weapon/circuitboard/machine/telecomms/processor, -/obj/item/weapon/circuitboard/machine/telecomms/receiver, -/obj/item/weapon/circuitboard/machine/telecomms/server, -/obj/item/weapon/circuitboard/machine/telecomms/bus, -/obj/item/weapon/circuitboard/machine/telecomms/broadcaster, -/obj/item/weapon/circuitboard/computer/message_monitor{ +/obj/item/circuitboard/machine/telecomms/processor, +/obj/item/circuitboard/machine/telecomms/receiver, +/obj/item/circuitboard/machine/telecomms/server, +/obj/item/circuitboard/machine/telecomms/bus, +/obj/item/circuitboard/machine/telecomms/broadcaster, +/obj/item/circuitboard/computer/message_monitor{ pixel_y = -5 }, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bQy" = ( /obj/structure/rack, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/firealarm, -/obj/item/weapon/electronics/firelock, -/obj/item/weapon/electronics/tracker, +/obj/item/electronics/airalarm, +/obj/item/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/firealarm, +/obj/item/electronics/firelock, +/obj/item/electronics/tracker, /obj/structure/sign/poster/official/random{ pixel_y = 32 }, @@ -44074,14 +44074,14 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/cloning, -/obj/item/weapon/circuitboard/computer/med_data{ +/obj/item/circuitboard/computer/cloning, +/obj/item/circuitboard/computer/med_data{ pixel_x = 3; pixel_y = -3 }, -/obj/item/weapon/circuitboard/machine/clonescanner, -/obj/item/weapon/circuitboard/machine/clonepod, -/obj/item/weapon/circuitboard/computer/scan_consolenew, +/obj/item/circuitboard/machine/clonescanner, +/obj/item/circuitboard/machine/clonepod, +/obj/item/circuitboard/computer/scan_consolenew, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bRP" = ( @@ -44089,11 +44089,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/secure_data{ +/obj/item/circuitboard/computer/secure_data{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/security{ +/obj/item/circuitboard/computer/security{ pixel_x = 1; pixel_y = -1 }, @@ -44104,15 +44104,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/powermonitor{ +/obj/item/circuitboard/computer/powermonitor{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/stationalert{ +/obj/item/circuitboard/computer/stationalert{ pixel_x = 1; pixel_y = -1 }, -/obj/item/weapon/circuitboard/computer/atmos_alert{ +/obj/item/circuitboard/computer/atmos_alert{ pixel_x = 3; pixel_y = -3 }, @@ -44253,7 +44253,7 @@ /obj/machinery/atmospherics/pipe/manifold/general/visible{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plasteel, /area/engine/atmos) "bSg" = ( @@ -44353,7 +44353,7 @@ /obj/machinery/atmospherics/pipe/simple/cyan/hidden{ dir = 6 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/department/engine) "bSt" = ( @@ -44364,7 +44364,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bSu" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -44379,7 +44379,7 @@ /area/maintenance/department/engine) "bSx" = ( /obj/structure/closet, -/obj/item/weapon/restraints/handcuffs/cable, +/obj/item/restraints/handcuffs/cable, /turf/open/floor/plating, /area/maintenance/department/engine) "bSy" = ( @@ -44537,7 +44537,7 @@ /turf/open/floor/plasteel/yellow/corner, /area/hallway/primary/aft) "bSP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-02" }, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, @@ -44649,7 +44649,7 @@ /obj/item/stack/sheet/cardboard{ amount = 14 }, -/obj/item/weapon/vending_refill/cola, +/obj/item/vending_refill/cola, /obj/structure/disposalpipe/segment{ dir = 8; icon_state = "pipe-c" @@ -44657,7 +44657,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bTe" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/structure/disposalpipe/segment, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -44685,7 +44685,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bTi" = ( -/obj/item/weapon/picket_sign, +/obj/item/picket_sign, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -44695,7 +44695,7 @@ /area/maintenance/department/engine) "bTk" = ( /obj/structure/closet, -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -44751,10 +44751,10 @@ pixel_y = 1 }, /obj/structure/table, -/obj/item/weapon/paper/guides/jobs/engi/gravity_gen{ +/obj/item/paper/guides/jobs/engi/gravity_gen{ layer = 3 }, -/obj/item/weapon/pen/blue, +/obj/item/pen/blue, /obj/machinery/power/terminal{ dir = 8 }, @@ -44794,19 +44794,19 @@ /obj/structure/closet/crate/engineering/electrical, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/electronics/airalarm, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/electronics/airalarm, +/obj/item/electronics/airlock, /turf/open/floor/plasteel/black, /area/storage/tech) "bTw" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -44814,10 +44814,10 @@ /area/storage/tech) "bTx" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /obj/machinery/light{ light_color = "#cee5d2" }, @@ -44825,10 +44825,10 @@ /area/storage/tech) "bTy" = ( /obj/structure/rack, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/darkgreen, /area/storage/tech) "bTz" = ( @@ -44836,7 +44836,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 2; pixel_y = 4 }, @@ -44849,7 +44849,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 2; pixel_y = 4 }, @@ -44878,9 +44878,9 @@ /obj/item/solar_assembly, /obj/item/solar_assembly, /obj/item/solar_assembly, -/obj/item/weapon/circuitboard/computer/solar_control, -/obj/item/weapon/electronics/tracker, -/obj/item/weapon/paper/guides/jobs/engi/solars, +/obj/item/circuitboard/computer/solar_control, +/obj/item/electronics/tracker, +/obj/item/paper/guides/jobs/engi/solars, /obj/machinery/power/apc{ dir = 2; name = "Tech Storage APC"; @@ -45031,7 +45031,7 @@ /turf/open/floor/plasteel, /area/engine/atmos) "bTS" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/machinery/atmospherics/pipe/manifold4w/general/visible, /turf/open/floor/plasteel, /area/engine/atmos) @@ -45065,7 +45065,7 @@ /area/space) "bTX" = ( /obj/structure/table, -/obj/item/weapon/storage/box/mousetraps, +/obj/item/storage/box/mousetraps, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -45094,17 +45094,17 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bUc" = ( -/obj/item/weapon/reagent_containers/food/snacks/beans, +/obj/item/reagent_containers/food/snacks/beans, /turf/open/floor/plating, /area/maintenance/department/engine) "bUd" = ( /obj/structure/closet, -/obj/item/weapon/shard, +/obj/item/shard, /obj/item/stack/spacecash/c10, /turf/open/floor/plating, /area/maintenance/department/engine) "bUe" = ( -/obj/item/weapon/cigbutt/cigarbutt, +/obj/item/cigbutt/cigarbutt, /turf/open/floor/plating, /area/maintenance/department/engine) "bUf" = ( @@ -45126,7 +45126,7 @@ /area/storage/tech) "bUi" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/machinery/camera{ c_tag = "Engineering Security Post"; dir = 4; @@ -45345,30 +45345,30 @@ "bUF" = ( /obj/structure/table, /obj/item/stack/cable_coil, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/maintenance/department/engine) "bUG" = ( -/obj/item/weapon/circuitboard/computer/libraryconsole, +/obj/item/circuitboard/computer/libraryconsole, /turf/open/floor/plating, /area/maintenance/department/engine) "bUH" = ( /turf/closed/wall/r_wall, /area/crew_quarters/heads/chief) "bUI" = ( -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 4; pixel_y = 5 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = -3; pixel_y = 2 }, -/obj/item/weapon/cartridge/engineering{ +/obj/item/cartridge/engineering{ pixel_x = 3 }, /obj/structure/table/reinforced, -/obj/item/weapon/cartridge/atmos, +/obj/item/cartridge/atmos, /obj/machinery/requests_console{ announcementConsole = 1; department = "Chief Engineer's Desk"; @@ -45486,7 +45486,7 @@ /area/engine/engine_smes) "bUV" = ( /obj/structure/table, -/obj/item/weapon/pen, +/obj/item/pen, /obj/machinery/light{ dir = 8 }, @@ -45495,7 +45495,7 @@ departmentType = 5; pixel_x = -32 }, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /turf/open/floor/plasteel/red/side{ @@ -45726,19 +45726,19 @@ /area/space) "bVs" = ( /obj/structure/mopbucket, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plating, /area/maintenance/department/engine) "bVt" = ( /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plating, /area/maintenance/department/engine) "bVu" = ( /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/clothing/head/welding, /obj/machinery/light/small{ dir = 1 @@ -45750,10 +45750,10 @@ /obj/structure/rack{ dir = 4 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, /obj/item/stack/cable_coil, /obj/item/stack/cable_coil, /obj/item/wallframe/camera, @@ -45792,7 +45792,7 @@ /area/maintenance/department/engine) "bVy" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/machinery/light/small{ dir = 1 }, @@ -45811,12 +45811,12 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "bVB" = ( -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /obj/structure/closet/crate{ icon_state = "crateopen"; opened = 1 }, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /obj/effect/spawner/lootdrop/maintenance, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -45848,9 +45848,9 @@ req_access_txt = "24" }, /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/paper/monitorkey, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/paper/monitorkey, +/obj/item/pen, /mob/living/simple_animal/parrot/Poly, /turf/open/floor/plasteel/yellow/side{ dir = 8 @@ -45871,13 +45871,13 @@ /area/crew_quarters/heads/chief) "bVH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/lighter, +/obj/item/clipboard, +/obj/item/lighter, /obj/item/clothing/glasses/meson{ pixel_y = 4 }, -/obj/item/weapon/stamp/ce, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/stamp/ce, +/obj/item/stock_parts/cell/high/plus, /obj/machinery/keycard_auth{ pixel_x = 26; pixel_y = 26 @@ -45917,11 +45917,11 @@ /area/storage/tech) "bVL" = ( /obj/structure/table, -/obj/item/weapon/storage/box/metalfoam{ +/obj/item/storage/box/metalfoam{ pixel_x = 4; pixel_y = 7 }, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -46217,11 +46217,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/robotics{ +/obj/item/circuitboard/computer/robotics{ pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/circuitboard/computer/mecha_control{ +/obj/item/circuitboard/computer/mecha_control{ pixel_x = 1; pixel_y = -1 }, @@ -46232,15 +46232,15 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/crew{ +/obj/item/circuitboard/computer/crew{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/card{ +/obj/item/circuitboard/computer/card{ pixel_x = 2; pixel_y = -2 }, -/obj/item/weapon/circuitboard/computer/communications{ +/obj/item/circuitboard/computer/communications{ pixel_x = 5; pixel_y = -5 }, @@ -46255,11 +46255,11 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/circuitboard/computer/borgupload{ +/obj/item/circuitboard/computer/borgupload{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/circuitboard/computer/aiupload{ +/obj/item/circuitboard/computer/aiupload{ pixel_x = 2; pixel_y = -2 }, @@ -46583,7 +46583,7 @@ }, /area/maintenance/department/engine) "bXb" = ( -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plating, /area/maintenance/department/engine) "bXc" = ( @@ -47777,7 +47777,7 @@ /turf/open/floor/plating, /area/shuttle/auxillary_base) "bZw" = ( -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plating, /area/maintenance/department/engine) "bZx" = ( @@ -48136,7 +48136,7 @@ dir = 8; layer = 2.9 }, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/head/welding{ pixel_x = -3; pixel_y = 5 @@ -48227,7 +48227,7 @@ /area/engine/engineering) "caw" = ( /obj/structure/table, -/obj/item/weapon/airlock_painter{ +/obj/item/airlock_painter{ pixel_y = 3 }, /obj/item/device/flashlight, @@ -48235,11 +48235,11 @@ /area/engine/engineering) "cax" = ( /obj/structure/table, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/apc, -/obj/item/weapon/stock_parts/cell/high/plus, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/electronics/apc, +/obj/item/stock_parts/cell/high/plus, +/obj/item/stock_parts/cell/high/plus, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48518,7 +48518,7 @@ }) "caZ" = ( /obj/structure/table, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/effect/spawner/lootdrop/maintenance, /obj/machinery/light/small{ brightness = 3; @@ -48528,7 +48528,7 @@ /area/maintenance/department/engine) "cba" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold, +/obj/item/storage/fancy/cigarettes/cigpack_robustgold, /obj/effect/decal/cleanable/deadcockroach, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -48560,21 +48560,21 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cbe" = ( -/obj/item/weapon/pen, -/obj/item/weapon/storage/belt/utility, +/obj/item/pen, +/obj/item/storage/belt/utility, /obj/item/clothing/glasses/meson, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9 }, /obj/structure/table/glass, /turf/open/floor/plasteel, /area/engine/engineering) "cbf" = ( -/obj/item/weapon/book/manual/wiki/engineering_hacking{ +/obj/item/book/manual/wiki/engineering_hacking{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_construction, +/obj/item/book/manual/wiki/engineering_construction, /obj/item/clothing/gloves/color/yellow, /obj/structure/cable{ d1 = 1; @@ -48586,12 +48586,12 @@ /turf/open/floor/plasteel, /area/engine/engineering) "cbg" = ( -/obj/item/weapon/book/manual/engineering_singularity_safety{ +/obj/item/book/manual/engineering_singularity_safety{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/book/manual/wiki/engineering_guide, -/obj/item/weapon/book/manual/engineering_particle_accelerator{ +/obj/item/book/manual/wiki/engineering_guide, +/obj/item/book/manual/engineering_particle_accelerator{ pixel_x = -3; pixel_y = -3 }, @@ -48659,7 +48659,7 @@ "cbn" = ( /obj/structure/table, /obj/item/clothing/gloves/color/yellow, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/clothing/glasses/meson, /turf/open/floor/plasteel, /area/engine/engineering) @@ -48797,9 +48797,9 @@ }, /obj/item/clothing/under/rank/chaplain, /obj/item/clothing/shoes/sneakers/black, -/obj/item/weapon/storage/backpack/cultpack, -/obj/item/weapon/storage/fancy/candle_box, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/backpack/cultpack, +/obj/item/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/item/clothing/suit/nun, /obj/item/clothing/head/nun_hood, /obj/item/clothing/suit/holidaypriest, @@ -48825,7 +48825,7 @@ /area/chapel/office) "cbJ" = ( /obj/structure/table/wood, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-18"; layer = 4.1; pixel_y = 8 @@ -48858,7 +48858,7 @@ /area/chapel/main/monastery) "cbN" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /obj/structure/cable{ d1 = 1; d2 = 2; @@ -48868,7 +48868,7 @@ /area/chapel/main/monastery) "cbO" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/trophy{ +/obj/item/reagent_containers/food/drinks/trophy{ pixel_y = 8 }, /turf/open/floor/carpet, @@ -48900,7 +48900,7 @@ /turf/open/floor/plating, /area/maintenance/department/engine) "cbT" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /obj/effect/landmark/xeno_spawn, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -49024,22 +49024,22 @@ /area/engine/engineering) "ccj" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2 }, /turf/open/floor/plasteel, /area/engine/engineering) "cck" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 2; pixel_y = 4 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -2 }, /obj/structure/cable{ @@ -49121,12 +49121,12 @@ /area/chapel/office) "ccx" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/bottle/holywater{ +/obj/item/reagent_containers/food/drinks/bottle/holywater{ name = "flask of holy water"; pixel_x = -2; pixel_y = 2 }, -/obj/item/weapon/nullrod, +/obj/item/nullrod, /turf/open/floor/carpet, /area/chapel/office) "ccy" = ( @@ -49273,7 +49273,7 @@ /area/maintenance/department/engine) "ccO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/random, +/obj/item/bedsheet/random, /obj/structure/table/optable, /turf/open/floor/plating, /area/maintenance/department/engine) @@ -49301,9 +49301,9 @@ /obj/item/stack/sheet/glass{ amount = 50 }, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/electronics/airlock, -/obj/item/weapon/stock_parts/cell/high/plus, +/obj/item/electronics/airlock, +/obj/item/electronics/airlock, +/obj/item/stock_parts/cell/high/plus, /obj/item/stack/sheet/mineral/plasma{ amount = 30 }, @@ -49471,8 +49471,8 @@ /area/engine/engineering) "cdg" = ( /obj/structure/table/glass, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkyellow/side{ tag = "icon-darkyellow (SOUTHWEST)"; icon_state = "darkyellow"; @@ -49481,7 +49481,7 @@ /area/maintenance/disposal/incinerator) "cdh" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /turf/open/floor/plasteel/darkyellow/side, /area/maintenance/disposal/incinerator) "cdi" = ( @@ -49540,12 +49540,12 @@ /area/chapel/office) "cdp" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/carpet, /area/chapel/office) "cdq" = ( @@ -49601,7 +49601,7 @@ /turf/open/floor/plasteel/black, /area/chapel/office) "cdu" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-08"; layer = 4.1 }, @@ -49611,7 +49611,7 @@ /area/chapel/main/monastery) "cdv" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 8 }, @@ -49630,14 +49630,14 @@ /area/chapel/main/monastery) "cdy" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/machinery/light/small, /turf/open/floor/plasteel/chapel{ dir = 1 }, /area/chapel/main/monastery) "cdz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-08"; layer = 4.1 }, @@ -49664,14 +49664,14 @@ "cdD" = ( /obj/structure/table, /obj/item/trash/plate, -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /turf/open/floor/plating/asteroid, /area/chapel/asteroid{ name = "Monastery Asteroid" }) "cdE" = ( /obj/structure/chair, -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plating, /area/maintenance/department/engine) "cdF" = ( @@ -49954,7 +49954,7 @@ /area/chapel/main/monastery) "cen" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) "ceo" = ( @@ -50022,7 +50022,7 @@ pixel_x = 3; pixel_y = -7 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/cable/yellow{ d1 = 1; d2 = 2; @@ -50042,7 +50042,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cex" = ( -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /turf/open/floor/plating, /area/engine/engineering) "cey" = ( @@ -50260,7 +50260,7 @@ /area/engine/engineering) "ceY" = ( /obj/machinery/power/rad_collector/anchored, -/obj/item/weapon/tank/internals/plasma, +/obj/item/tank/internals/plasma, /obj/structure/cable/yellow, /obj/effect/turf_decal/stripes/line{ dir = 1 @@ -50461,7 +50461,7 @@ /turf/open/floor/plating, /area/engine/engineering) "cfw" = ( -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/structure/cable/yellow{ d1 = 2; d2 = 8; @@ -50685,7 +50685,7 @@ /obj/machinery/airalarm{ pixel_y = 22 }, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "cgc" = ( @@ -50699,7 +50699,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "cge" = ( -/obj/item/weapon/storage/bag/plants, +/obj/item/storage/bag/plants, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden{ dir = 4 }, @@ -50913,7 +50913,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "cgE" = ( -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, /obj/structure/cable{ d1 = 4; d2 = 8; @@ -50955,7 +50955,7 @@ /turf/open/floor/grass, /area/hydroponics/garden/monastery) "cgJ" = ( -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/grass, /area/hydroponics/garden/monastery) "cgK" = ( @@ -51205,7 +51205,7 @@ /area/hydroponics/garden/monastery) "chk" = ( /obj/structure/sink/puddle, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/effect/landmark/event_spawn, /turf/open/floor/grass, /area/hydroponics/garden/monastery) @@ -51362,7 +51362,7 @@ /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "chF" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -51411,7 +51411,7 @@ /area/chapel/main/monastery) "chM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/green, +/obj/item/bedsheet/green, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -51422,7 +51422,7 @@ dir = 8; pixel_y = -4 }, -/obj/item/weapon/soap/homemade, +/obj/item/soap/homemade, /turf/open/floor/plasteel/showroomfloor, /area/chapel/main/monastery) "chO" = ( @@ -51472,7 +51472,7 @@ name = "Monastery Asteroid" }) "chU" = ( -/obj/item/weapon/phone, +/obj/item/phone, /turf/open/floor/plating, /area/chapel/main/monastery) "chV" = ( @@ -51482,21 +51482,21 @@ /area/chapel/main/monastery) "chW" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill, -/obj/item/weapon/storage/box/ingredients/wildcard{ +/obj/item/reagent_containers/food/condiment/peppermill, +/obj/item/storage/box/ingredients/wildcard{ layer = 3.1 }, /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) "chX" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/kitchen/rollingpin, -/obj/item/weapon/kitchen/knife, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife, /obj/machinery/light/small, /turf/open/floor/plasteel/hydrofloor, /area/chapel/main/monastery) @@ -51625,7 +51625,7 @@ dir = 4 }, /obj/structure/easel, -/obj/item/weapon/canvas/twentythreeXnineteen, +/obj/item/canvas/twentythreeXnineteen, /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "ciq" = ( @@ -51773,7 +51773,7 @@ /area/chapel/main/monastery) "ciK" = ( /obj/structure/table, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -51930,12 +51930,12 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/grimy, /area/chapel/main/monastery) "ciY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/yellow, +/obj/item/bedsheet/yellow, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 9 }, @@ -51950,7 +51950,7 @@ brightness = 3; dir = 8 }, -/obj/item/weapon/bikehorn/rubberducky, +/obj/item/bikehorn/rubberducky, /turf/open/floor/plasteel/showroomfloor, /area/chapel/main/monastery) "cja" = ( @@ -51968,7 +51968,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/gun/medbeam, +/obj/item/gun/medbeam, /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "cjc" = ( @@ -51985,7 +51985,7 @@ }, /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "cje" = ( @@ -52256,7 +52256,7 @@ d2 = 8; icon_state = "4-8" }, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/machinery/light/small{ dir = 1 }, @@ -52291,7 +52291,7 @@ /obj/machinery/light/small{ dir = 1 }, -/obj/item/weapon/storage/box/lights/bulbs, +/obj/item/storage/box/lights/bulbs, /obj/machinery/atmospherics/pipe/simple/scrubbers/hidden, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) @@ -52310,7 +52310,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "cjP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/item/device/radio/intercom{ @@ -52334,7 +52334,7 @@ /turf/open/floor/carpet, /area/library) "cjS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/structure/cable{ @@ -52390,7 +52390,7 @@ }, /obj/structure/window/reinforced, /obj/structure/table/glass, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/hardsuit/engine/elite, /turf/open/floor/plating/abductor, @@ -52412,8 +52412,8 @@ /area/shuttle/abandoned) "cjZ" = ( /obj/structure/table, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/wrench, +/obj/item/storage/crayons, +/obj/item/wrench, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) "cka" = ( @@ -52443,11 +52443,11 @@ /obj/effect/decal/cleanable/cobweb{ icon_state = "cobweb2" }, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/storage/fancy/candle_box, +/obj/item/storage/fancy/candle_box, /obj/structure/table/wood/fancy, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -52469,7 +52469,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ckg" = ( -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ckh" = ( @@ -52510,7 +52510,7 @@ /turf/open/floor/carpet, /area/library) "ckn" = ( -/obj/item/weapon/storage/bag/books, +/obj/item/storage/bag/books, /turf/open/floor/plasteel/black, /area/library) "cko" = ( @@ -52551,9 +52551,9 @@ name = "Bomb Testing Asteroid" }) "cku" = ( -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, -/obj/item/weapon/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, +/obj/item/reagent_containers/food/snacks/grown/poppy, /obj/structure/table/wood/fancy, /turf/open/floor/plasteel/black, /area/chapel/main/monastery) @@ -52615,7 +52615,7 @@ /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ckC" = ( -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, /turf/open/floor/plating, /area/maintenance/department/chapel/monastery) "ckD" = ( @@ -52706,8 +52706,8 @@ /area/maintenance/department/chapel/monastery) "ckS" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/folder/yellow, +/obj/item/pen, /obj/machinery/camera{ c_tag = "Monastery Library"; dir = 4; @@ -52851,17 +52851,17 @@ /area/library) "clq" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ layer = 2.9; pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/pen, -/obj/item/weapon/barcodescanner, +/obj/item/pen, +/obj/item/barcodescanner, /turf/open/floor/plasteel/black, /area/library) "clr" = ( -/obj/item/weapon/pickaxe/mini, +/obj/item/pickaxe/mini, /turf/closed/mineral, /area/chapel/asteroid{ name = "Monastery Asteroid" @@ -53098,7 +53098,7 @@ /obj/machinery/atmospherics/pipe/simple/supply/hidden{ dir = 4 }, -/obj/item/weapon/wrench, +/obj/item/wrench, /obj/item/stack/cable_coil, /turf/open/floor/plating, /area/tcommsat/computer) @@ -53123,7 +53123,7 @@ /area/tcommsat/computer) "cmf" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /obj/item/device/radio, /obj/machinery/airalarm{ dir = 4; @@ -53293,11 +53293,11 @@ pixel_x = -32 }, /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/plasteel/yellow/side{ dir = 10 }, @@ -53596,26 +53596,26 @@ }) "cnr" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/amplifier, -/obj/item/weapon/stock_parts/subspace/analyzer, -/obj/item/weapon/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/amplifier, +/obj/item/stock_parts/subspace/analyzer, +/obj/item/stock_parts/subspace/analyzer, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cns" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/ansible, -/obj/item/weapon/stock_parts/subspace/crystal, -/obj/item/weapon/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/ansible, +/obj/item/stock_parts/subspace/crystal, +/obj/item/stock_parts/subspace/crystal, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cnt" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/filter, -/obj/item/weapon/stock_parts/subspace/transmitter, -/obj/item/weapon/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/filter, +/obj/item/stock_parts/subspace/transmitter, +/obj/item/stock_parts/subspace/transmitter, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cnu" = ( @@ -53628,24 +53628,24 @@ /area/tcommsat/server) "cnv" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/subspace/treatment, -/obj/item/weapon/stock_parts/manipulator, -/obj/item/weapon/stock_parts/manipulator, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/subspace/treatment, +/obj/item/stock_parts/manipulator, +/obj/item/stock_parts/manipulator, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cnw" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/console_screen, -/obj/item/weapon/stock_parts/micro_laser, -/obj/item/weapon/stock_parts/micro_laser, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/console_screen, +/obj/item/stock_parts/micro_laser, +/obj/item/stock_parts/micro_laser, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cnx" = ( /obj/structure/table, -/obj/item/weapon/stock_parts/scanning_module, -/obj/item/weapon/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, +/obj/item/stock_parts/scanning_module, /turf/open/floor/plasteel/black/telecomms, /area/tcommsat/server) "cny" = ( diff --git a/_maps/map_files/PubbyStation/monastery_shuttle.dm b/_maps/map_files/PubbyStation/monastery_shuttle.dm index e64d784a1f3..b1cbb3c7b24 100644 --- a/_maps/map_files/PubbyStation/monastery_shuttle.dm +++ b/_maps/map_files/PubbyStation/monastery_shuttle.dm @@ -1,11 +1,11 @@ /obj/machinery/computer/shuttle/monastery_shuttle name = "monastery shuttle console" desc = "Used to control the monastery shuttle." - circuit = /obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle + circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle shuttleId = "pod1" possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station" no_destination_swap = TRUE -/obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle +/obj/item/circuitboard/computer/shuttle/monastery_shuttle name = "Monastery Shuttle (Computer Board)" build_path = /obj/machinery/computer/shuttle/monastery_shuttle diff --git a/_maps/map_files/debug/runtimestation.dmm b/_maps/map_files/debug/runtimestation.dmm index 364e912b4b7..1caecb0225c 100644 --- a/_maps/map_files/debug/runtimestation.dmm +++ b/_maps/map_files/debug/runtimestation.dmm @@ -333,7 +333,7 @@ /obj/item/device/flashlight{ pixel_y = 5 }, -/obj/item/weapon/airlock_painter, +/obj/item/airlock_painter, /turf/open/floor/plating, /area/engine/engineering) "aT" = ( @@ -427,7 +427,7 @@ /area/engine/atmos) "bd" = ( /obj/structure/table, -/obj/item/weapon/weldingtool/experimental, +/obj/item/weldingtool/experimental, /turf/open/floor/plating, /area/engine/engineering) "be" = ( @@ -473,7 +473,7 @@ /obj/machinery/light, /obj/structure/table, /obj/item/device/analyzer, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/plating, /area/engine/atmos) "bk" = ( @@ -505,13 +505,13 @@ "bo" = ( /obj/machinery/atmospherics/components/unary/vent_pump/on, /obj/structure/table, -/obj/item/weapon/screwdriver/power, -/obj/item/weapon/wirecutters/power, +/obj/item/screwdriver/power, +/obj/item/wirecutters/power, /turf/open/floor/plating, /area/engine/engineering) "bp" = ( /obj/machinery/light, -/obj/item/weapon/storage/box/lights/mixed, +/obj/item/storage/box/lights/mixed, /obj/item/device/lightreplacer, /turf/open/floor/plating, /area/engine/engineering) @@ -635,7 +635,7 @@ "bH" = ( /obj/structure/table, /obj/item/ammo_box/c10mm, -/obj/item/weapon/gun/ballistic, +/obj/item/gun/ballistic, /turf/open/floor/plasteel, /area/bridge) "bI" = ( @@ -644,20 +644,20 @@ /area/bridge) "bJ" = ( /obj/structure/table, -/obj/item/weapon/card/id/captains_spare, +/obj/item/card/id/captains_spare, /turf/open/floor/plasteel, /area/bridge) "bK" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/holding, +/obj/item/storage/backpack/holding, /turf/open/floor/plasteel, /area/bridge) "bL" = ( /obj/structure/table, -/obj/item/weapon/rcd_ammo/large, -/obj/item/weapon/rcd_ammo/large, -/obj/item/weapon/rcd_ammo/large, -/obj/item/weapon/construction/rcd, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/rcd_ammo/large, +/obj/item/construction/rcd, /turf/open/floor/plasteel, /area/bridge) "bM" = ( @@ -1012,14 +1012,14 @@ /area/hallway/secondary/entry) "cI" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/arrival{ dir = 8 }, /area/hallway/secondary/entry) "cJ" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/arrival{ dir = 10 }, @@ -1037,7 +1037,7 @@ /area/hallway/secondary/entry) "cL" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -3; pixel_y = 7 }, @@ -1045,8 +1045,8 @@ /area/hallway/secondary/entry) "cM" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/item/device/healthanalyzer, /turf/open/floor/plasteel/arrival, /area/hallway/secondary/entry) @@ -1353,8 +1353,8 @@ "dO" = ( /obj/structure/table, /obj/machinery/light, -/obj/item/weapon/twohanded/fireaxe, -/obj/item/weapon/extinguisher, +/obj/item/twohanded/fireaxe, +/obj/item/extinguisher, /turf/open/floor/plasteel, /area/storage/primary) "dP" = ( @@ -1364,8 +1364,8 @@ /area/storage/primary) "dQ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/storage/box/lights/tubes, +/obj/item/storage/box/lights/mixed, +/obj/item/storage/box/lights/tubes, /obj/machinery/light, /turf/open/floor/plasteel, /area/storage/primary) diff --git a/_maps/map_files/generic/CentCom.dmm b/_maps/map_files/generic/CentCom.dmm index 6069ddfa018..4f3e01ed7e6 100644 --- a/_maps/map_files/generic/CentCom.dmm +++ b/_maps/map_files/generic/CentCom.dmm @@ -67,7 +67,7 @@ /obj/structure/table/wood{ layer = 3.3 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1; pixel_y = 4 @@ -167,7 +167,7 @@ /area/holodeck/rec_center/bunker) "aB" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -4; pixel_y = 8 }, @@ -212,7 +212,7 @@ /area/holodeck/rec_center/winterwonderland) "aJ" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /turf/open/floor/holofloor{ icon_state = "asteroidfloor"; dir = 8 @@ -299,7 +299,7 @@ /area/holodeck/rec_center/winterwonderland) "aV" = ( /obj/structure/table/wood, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-05"; layer = 4.1; pixel_y = 10 @@ -379,7 +379,7 @@ /area/holodeck/rec_center/lounge) "bh" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/barman_recipes, +/obj/item/book/manual/barman_recipes, /obj/item/clothing/mask/cigarette/pipe, /turf/open/floor/holofloor/carpet, /area/holodeck/rec_center/lounge) @@ -425,7 +425,7 @@ /area/holodeck/rec_center/pet_lounge) "bq" = ( /obj/structure/table/glass, -/obj/item/weapon/surgicaldrill, +/obj/item/surgicaldrill, /turf/open/floor/holofloor{ icon_state = "white"; dir = 9 @@ -433,7 +433,7 @@ /area/holodeck/rec_center/medical) "br" = ( /obj/structure/table/glass, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/holofloor{ icon_state = "white"; dir = 1 @@ -441,10 +441,10 @@ /area/holodeck/rec_center/medical) "bs" = ( /obj/structure/table/glass, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 10 }, -/obj/item/weapon/circular_saw, +/obj/item/circular_saw, /turf/open/floor/holofloor{ icon_state = "white"; dir = 1 @@ -452,7 +452,7 @@ /area/holodeck/rec_center/medical) "bt" = ( /obj/structure/table/glass, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/holofloor{ icon_state = "white"; dir = 1 @@ -461,7 +461,7 @@ "bu" = ( /obj/structure/table/glass, /obj/item/stack/medical/gauze, -/obj/item/weapon/cautery, +/obj/item/cautery, /turf/open/floor/holofloor{ icon_state = "white"; dir = 5 @@ -506,7 +506,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/under/color/red, -/obj/item/weapon/holo/esword/red, +/obj/item/holo/esword/red, /turf/open/floor/holofloor{ icon_state = "warningline"; dir = 2 @@ -554,8 +554,8 @@ /area/holodeck/rec_center/pet_lounge) "bI" = ( /obj/structure/table/glass, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/holofloor{ icon_state = "white"; dir = 8 @@ -619,7 +619,7 @@ /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/pet_lounge) "bV" = ( -/obj/item/weapon/storage/bag/easterbasket{ +/obj/item/storage/bag/easterbasket{ name = "picnic basket"; pixel_y = 6 }, @@ -688,7 +688,7 @@ }, /area/holodeck/rec_center/pet_lounge) "ch" = ( -/obj/item/weapon/shovel/spade{ +/obj/item/shovel/spade{ pixel_x = 2; pixel_y = -2 }, @@ -725,11 +725,11 @@ /area/holodeck/rec_center/medical) "cm" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 4; pixel_y = 4 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/open/floor/holofloor{ icon_state = "white" }, @@ -805,7 +805,7 @@ /area/holodeck/rec_center/anthophila) "cx" = ( /obj/effect/holodeck_effect/mobspawner/bee, -/obj/item/weapon/melee/flyswatter, +/obj/item/melee/flyswatter, /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/anthophila) "cy" = ( @@ -891,7 +891,7 @@ /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/pet_lounge) "cL" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/pet_lounge) "cM" = ( @@ -928,7 +928,7 @@ /area/holodeck/rec_center/pet_lounge) "cS" = ( /obj/machinery/hydroponics/soil, -/obj/item/weapon/cultivator, +/obj/item/cultivator, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/pet_lounge) "cT" = ( @@ -942,7 +942,7 @@ /area/holodeck/rec_center/pet_lounge) "cV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/window{ dir = 1 }, @@ -956,7 +956,7 @@ dir = 8 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/structure/window{ dir = 1 }, @@ -984,11 +984,11 @@ /turf/open/floor/holofloor/beach/coast_t, /area/holodeck/rec_center/beach) "da" = ( -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /turf/open/floor/holofloor/beach/coast_t, /area/holodeck/rec_center/beach) "db" = ( -/obj/item/weapon/shovel/spade, +/obj/item/shovel/spade, /turf/open/floor/holofloor/beach/coast_t, /area/holodeck/rec_center/beach) "dc" = ( @@ -1031,7 +1031,7 @@ /area/holodeck/rec_center/beach) "dj" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/iv_drip{ density = 0 }, @@ -1045,7 +1045,7 @@ dir = 8 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/medical, +/obj/item/bedsheet/medical, /obj/machinery/iv_drip{ density = 0 }, @@ -1120,7 +1120,7 @@ /obj/item/clothing/head/helmet/thunderdome, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/under/color/green, -/obj/item/weapon/holo/esword/green, +/obj/item/holo/esword/green, /turf/open/floor/holofloor{ icon_state = "warningline"; dir = 1 @@ -1165,14 +1165,14 @@ }, /area/holodeck/rec_center/spacechess) "dA" = ( -/obj/item/weapon/banner/blue, +/obj/item/banner/blue, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/thunderdome1218) "dB" = ( /obj/structure/table/wood/fancy, /obj/item/clothing/suit/armor/riot/knight/blue, /obj/item/clothing/head/helmet/knight/blue, -/obj/item/weapon/claymore/weak, +/obj/item/claymore/weak, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/thunderdome1218) "dC" = ( @@ -1186,11 +1186,11 @@ /obj/structure/table/wood/fancy, /obj/item/clothing/suit/armor/riot/knight/red, /obj/item/clothing/head/helmet/knight/red, -/obj/item/weapon/claymore/weak, +/obj/item/claymore/weak, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/thunderdome1218) "dE" = ( -/obj/item/weapon/banner/red, +/obj/item/banner/red, /turf/open/floor/holofloor/grass, /area/holodeck/rec_center/thunderdome1218) "dF" = ( @@ -1224,7 +1224,7 @@ /area/holodeck/rec_center/chapelcourt) "dJ" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/book/bible, +/obj/item/storage/book/bible, /turf/open/floor/holofloor{ dir = 8; icon_state = "dark" @@ -1232,7 +1232,7 @@ /area/holodeck/rec_center/chapelcourt) "dK" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/holofloor{ dir = 8; icon_state = "dark" @@ -1397,7 +1397,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); + prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1423,7 +1423,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); + prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1438,7 +1438,7 @@ icon = 'icons/obj/machines/particle_accelerator.dmi'; icon_state = "control_boxp"; name = "Kobayashi Maru control computer"; - prizes = list(/obj/item/weapon/paper/fluff/holodeck/trek_diploma = 1); + prizes = list(/obj/item/paper/fluff/holodeck/trek_diploma = 1); settlers = list("Kirk","Worf","Gene") }, /turf/open/floor/holofloor/plating, @@ -1593,7 +1593,7 @@ /area/holodeck/rec_center/kobayashi) "ez" = ( /obj/structure/table/glass, -/obj/item/weapon/gun/energy/e_gun/mini/practice_phaser, +/obj/item/gun/energy/e_gun/mini/practice_phaser, /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/kobayashi) "eA" = ( @@ -1612,8 +1612,8 @@ }, /area/holodeck/rec_center/chapelcourt) "eC" = ( -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /obj/structure/table/wood, /turf/open/floor/holofloor{ dir = 8; @@ -1636,7 +1636,7 @@ }, /area/holodeck/rec_center/chapelcourt) "eF" = ( -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/rollercoaster) "eG" = ( @@ -1663,7 +1663,7 @@ }, /area/holodeck/rec_center/firingrange) "eJ" = ( -/obj/item/weapon/weldingtool, +/obj/item/weldingtool, /turf/open/floor/holofloor/plating, /area/holodeck/rec_center/refuel) "eK" = ( @@ -1685,22 +1685,22 @@ /area/holodeck/rec_center/thunderdome1218) "eN" = ( /obj/structure/table/wood, -/obj/item/weapon/melee/chainofcommand{ +/obj/item/melee/chainofcommand{ name = "chain whip" }, -/obj/item/weapon/twohanded/spear, +/obj/item/twohanded/spear, /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/thunderdome1218) "eO" = ( /obj/structure/table/wood, -/obj/item/weapon/scythe, -/obj/item/weapon/twohanded/spear, +/obj/item/scythe, +/obj/item/twohanded/spear, /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/thunderdome1218) "eP" = ( /obj/structure/table/wood, -/obj/item/weapon/tailclub, -/obj/item/weapon/twohanded/spear, +/obj/item/tailclub, +/obj/item/twohanded/spear, /turf/open/floor/holofloor/asteroid, /area/holodeck/rec_center/thunderdome1218) "eQ" = ( @@ -1858,8 +1858,8 @@ /area/holodeck/rec_center/kobayashi) "fn" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen/blue, +/obj/item/folder, +/obj/item/pen/blue, /obj/structure/window/reinforced{ dir = 8 }, @@ -1870,8 +1870,8 @@ /area/holodeck/rec_center/kobayashi) "fo" = ( /obj/structure/table, -/obj/item/weapon/folder, -/obj/item/weapon/pen, +/obj/item/folder, +/obj/item/pen, /turf/open/floor/holofloor{ icon_state = "neutral"; dir = 1 @@ -1882,8 +1882,8 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/folder, -/obj/item/weapon/pen/red, +/obj/item/folder, +/obj/item/pen/red, /turf/open/floor/holofloor{ icon_state = "neutral"; dir = 1 @@ -1918,7 +1918,7 @@ }, /area/holodeck/rec_center/firingrange) "ft" = ( -/obj/item/weapon/paper/guides/jobs/security/range, +/obj/item/paper/guides/jobs/security/range, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) "fu" = ( @@ -2066,7 +2066,7 @@ /area/holodeck/rec_center/firingrange) "fM" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/laser/practice, +/obj/item/gun/energy/laser/practice, /obj/item/clothing/ears/earmuffs, /turf/open/floor/holofloor, /area/holodeck/rec_center/firingrange) @@ -2090,8 +2090,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/transforming/energy/sword/saber/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/transforming/energy/sword/saber/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -2127,8 +2127,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/transforming/energy/sword/saber/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/transforming/energy/sword/saber/green, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -2157,7 +2157,7 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -2169,7 +2169,7 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -2617,11 +2617,11 @@ /turf/open/floor/circuit/green/anim, /area/ctf) "hJ" = ( -/obj/item/weapon/twohanded/ctf/blue, +/obj/item/twohanded/ctf/blue, /turf/open/floor/circuit/green/anim, /area/ctf) "hK" = ( -/obj/item/weapon/twohanded/ctf/red, +/obj/item/twohanded/ctf/red, /turf/open/floor/circuit/green/anim, /area/ctf) "hL" = ( @@ -2841,15 +2841,15 @@ /area/centcom/prison) "ix" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/control) "iy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, @@ -2878,7 +2878,7 @@ /area/centcom/control) "iB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /obj/machinery/light{ dir = 1 }, @@ -2886,14 +2886,14 @@ /turf/open/floor/plasteel, /area/centcom/control) "iC" = ( -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/emps{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/grenade/plastic/x4, -/obj/item/weapon/grenade/plastic/x4, -/obj/item/weapon/grenade/plastic/x4, +/obj/item/storage/box/flashbangs, +/obj/item/grenade/plastic/x4, +/obj/item/grenade/plastic/x4, +/obj/item/grenade/plastic/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, /obj/structure/reagent_dispensers/peppertank{ @@ -2904,14 +2904,14 @@ /area/centcom/control) "iD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs/cable/zipties, +/obj/item/restraints/handcuffs/cable/zipties, /obj/item/device/assembly/flash/handheld, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/control) "iE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/control) @@ -2932,10 +2932,10 @@ /area/centcom/control) "iI" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -2943,10 +2943,10 @@ /area/centcom/control) "iJ" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -3027,10 +3027,10 @@ /area/centcom/control) "iX" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -3038,10 +3038,10 @@ /area/centcom/control) "iY" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -3219,7 +3219,7 @@ /area/centcom/supply) "jr" = ( /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/structure/table, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -3530,8 +3530,8 @@ }, /area/centcom/control) "kc" = ( -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/crowbar/red, +/obj/item/storage/box/handcuffs, +/obj/item/crowbar/red, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -3553,7 +3553,7 @@ }, /area/centcom/control) "kf" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ @@ -3561,8 +3561,8 @@ }, /area/centcom/control) "kg" = ( -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ @@ -3570,7 +3570,7 @@ }, /area/centcom/control) "kh" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -3580,7 +3580,7 @@ /area/centcom/control) "ki" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -3599,24 +3599,24 @@ }, /area/centcom/control) "kj" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/control) "kk" = ( -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -3651,7 +3651,7 @@ /turf/open/floor/plasteel, /area/centcom/control) "kq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -3680,8 +3680,8 @@ /area/syndicate_mothership/control) "kv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/crowbar/red, +/obj/item/storage/box/handcuffs, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -3696,13 +3696,13 @@ /turf/open/floor/plasteel, /area/centcom/control) "kx" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/wood, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -3711,7 +3711,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/control) "kz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/firealarm{ @@ -3726,7 +3726,7 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -3736,7 +3736,7 @@ /obj/structure/window/reinforced{ dir = 1 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/grimy, @@ -3753,8 +3753,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/grimy, /area/centcom/control) "kE" = ( @@ -3769,23 +3769,23 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/law, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/stamp/law, /turf/open/floor/plasteel/grimy, /area/centcom/control) "kG" = ( /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/plasteel/grimy, /area/centcom/control) "kH" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/airalarm{ @@ -3834,8 +3834,8 @@ /area/centcom/control) "kP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -3844,7 +3844,7 @@ /area/centcom/control) "kQ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/device/flashlight/seclite, /obj/effect/turf_decal/stripes/line{ dir = 8 @@ -3853,15 +3853,15 @@ /area/centcom/control) "kR" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/grimy, /area/centcom/control) "kS" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/stamp/law, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/stamp/law, /turf/open/floor/plasteel/grimy, /area/centcom/control) "kT" = ( @@ -3902,8 +3902,8 @@ /obj/structure/window/reinforced{ dir = 8 }, -/obj/item/weapon/gavelblock, -/obj/item/weapon/gavelhammer, +/obj/item/gavelblock, +/obj/item/gavelhammer, /obj/structure/window/reinforced, /turf/open/floor/plasteel/grimy, /area/centcom/control) @@ -3993,9 +3993,9 @@ /area/centcom/control) "lg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -4003,10 +4003,10 @@ /area/centcom/control) "lh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/crowbar/power, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/box/handcuffs, +/obj/item/crowbar/red, +/obj/item/crowbar/power, +/obj/item/storage/belt/security/full, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -4030,7 +4030,7 @@ /area/centcom/control) "ll" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/briefcase, +/obj/item/storage/briefcase, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4058,9 +4058,9 @@ pixel_y = 32 }, /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4084,8 +4084,8 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4133,7 +4133,7 @@ /turf/open/floor/plating, /area/centcom/control) "ly" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -4204,7 +4204,7 @@ }, /area/syndicate_mothership/control) "lI" = ( -/obj/item/weapon/disk/data, +/obj/item/disk/data, /obj/effect/light_emitter{ set_cap = 1; set_luminosity = 4 @@ -4259,16 +4259,16 @@ /area/centcom/supply) "lQ" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/stack/packageWrap, /obj/item/stack/cable_coil/white, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/green/side{ dir = 9 }, /area/centcom/control) "lR" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/green/side{ @@ -4276,7 +4276,7 @@ }, /area/centcom/control) "lS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -4298,7 +4298,7 @@ }, /area/centcom/control) "lV" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table, /turf/open/floor/plasteel/green/side{ dir = 5 @@ -4321,9 +4321,9 @@ /area/centcom/control) "lY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, /obj/machinery/button/door{ id = "XCCsec3"; name = "XCC Shutter 3 Control"; @@ -4378,8 +4378,8 @@ /area/centcom/control) "me" = ( /obj/structure/table/wood, -/obj/item/weapon/folder, -/obj/item/weapon/pen/red, +/obj/item/folder, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4430,7 +4430,7 @@ /obj/machinery/door/window/brigdoor/southleft{ name = "Shower" }, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/machinery/atmospherics/components/unary/vent_pump/on, /turf/open/floor/plasteel/white, /area/centcom/ferry) @@ -4478,7 +4478,7 @@ }, /area/centcom/control) "ms" = ( -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4500,7 +4500,7 @@ /area/centcom/control) "mv" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs/cable/zipties, +/obj/item/restraints/handcuffs/cable/zipties, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4514,8 +4514,8 @@ /area/centcom/control) "mx" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4560,12 +4560,12 @@ /turf/open/floor/plasteel/white, /area/centcom/ferry) "mE" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4578,7 +4578,7 @@ /obj/structure/table/reinforced, /obj/item/stack/packageWrap, /obj/item/stack/cable_coil/white, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4657,16 +4657,16 @@ /area/centcom/control) "mP" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /obj/item/device/camera, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/control) "mQ" = ( -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -4787,7 +4787,7 @@ "ng" = ( /obj/structure/table/wood, /obj/item/device/taperecorder, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /obj/item/device/flashlight/seclite, /obj/structure/noticeboard{ pixel_y = 28 @@ -4798,7 +4798,7 @@ /area/centcom/ferry) "nh" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /obj/item/device/camera, /obj/structure/reagent_dispensers/peppertank{ pixel_y = 32 @@ -4811,7 +4811,7 @@ /obj/machinery/ai_status_display{ pixel_y = 32 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-15"; pixel_x = -6; pixel_y = 12 @@ -4852,7 +4852,7 @@ /area/centcom/ferry) "nn" = ( /obj/machinery/computer/card/centcom, -/obj/item/weapon/card/id/centcom, +/obj/item/card/id/centcom, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "no" = ( @@ -4861,8 +4861,8 @@ /area/centcom/ferry) "np" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /obj/machinery/vending/wallmed{ name = "Emergency NanoMed"; pixel_y = 32; @@ -4873,10 +4873,10 @@ /area/centcom/ferry) "nq" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/blue, -/obj/item/weapon/melee/chainofcommand, -/obj/item/weapon/stamp/captain, +/obj/item/clipboard, +/obj/item/folder/blue, +/obj/item/melee/chainofcommand, +/obj/item/stamp/captain, /obj/machinery/newscaster/security_unit{ pixel_y = 32 }, @@ -4885,7 +4885,7 @@ "nr" = ( /obj/structure/table/wood, /obj/machinery/computer/security/wooden_tv, -/obj/item/weapon/storage/secure/safe{ +/obj/item/storage/secure/safe{ pixel_x = 32; pixel_y = 24 }, @@ -4900,8 +4900,8 @@ /area/centcom/supply) "nt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, +/obj/item/paper_bin, +/obj/item/pen/red, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -4910,7 +4910,7 @@ "nu" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line, /obj/machinery/light{ dir = 1 @@ -4933,22 +4933,22 @@ /area/centcom/supply) "nx" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/brown{ dir = 8 }, /area/centcom/control) "ny" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/delivery, /turf/open/floor/plasteel, /area/centcom/control) "nz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -4960,8 +4960,8 @@ /area/centcom/control) "nA" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -4979,11 +4979,11 @@ /turf/open/floor/plasteel/vault, /area/centcom/control) "nD" = ( -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5002,7 +5002,7 @@ /area/centcom/ferry) "nG" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "nH" = ( @@ -5017,13 +5017,13 @@ /area/centcom/ferry) "nJ" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "nK" = ( @@ -5100,8 +5100,8 @@ /area/centcom/control) "nT" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -5136,7 +5136,7 @@ /area/centcom/ferry) "nX" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -5165,8 +5165,8 @@ /area/centcom/ferry) "nZ" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "oa" = ( @@ -5194,7 +5194,7 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "oe" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -5210,8 +5210,8 @@ /area/centcom/ferry) "of" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/stamp/qm, +/obj/item/folder/yellow, +/obj/item/stamp/qm, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -5243,9 +5243,9 @@ req_access_txt = "109"; base_state = "rightsecure" }, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/red, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/centcom/supply) @@ -5258,11 +5258,11 @@ }, /area/centcom/control) "ok" = ( -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /obj/structure/noticeboard{ dir = 8; @@ -5349,7 +5349,7 @@ /area/centcom/ferry) "ou" = ( /obj/structure/destructible/cult/tome, -/obj/item/weapon/book/codex_gigas, +/obj/item/book/codex_gigas, /obj/machinery/airalarm{ dir = 8; pixel_x = 24 @@ -5360,13 +5360,13 @@ /area/centcom/ferry) "ov" = ( /obj/structure/table/reinforced, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = -6 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_x = 6 }, -/obj/item/weapon/cartridge/quartermaster{ +/obj/item/cartridge/quartermaster{ pixel_y = 6 }, /obj/item/device/gps/mining, @@ -5381,14 +5381,14 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, +/obj/item/paper_bin, +/obj/item/pen/red, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/centcom/supply) "ox" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -5441,7 +5441,7 @@ /area/centcom/control) "oE" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/light, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5457,7 +5457,7 @@ }, /area/centcom/control) "oG" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/structure/extinguisher_cabinet{ @@ -5468,9 +5468,9 @@ }, /area/centcom/control) "oH" = ( -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /obj/structure/table, -/obj/item/weapon/storage/crayons, +/obj/item/storage/crayons, /turf/open/floor/plasteel/freezer{ dir = 2 }, @@ -5488,9 +5488,9 @@ /area/syndicate_mothership/control) "oK" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /obj/machinery/airalarm{ dir = 1; @@ -5502,8 +5502,8 @@ /area/centcom/ferry) "oL" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/lighter, +/obj/item/folder/red, +/obj/item/lighter, /obj/machinery/firealarm{ dir = 1; pixel_y = -24 @@ -5513,14 +5513,14 @@ }, /area/centcom/ferry) "oM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, /turf/open/floor/wood, /area/centcom/ferry) "oN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light_switch{ @@ -5535,7 +5535,7 @@ /area/centcom/ferry) "oP" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/dsquad, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5547,11 +5547,11 @@ /area/centcom/ferry) "oR" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/secure/briefcase{ +/obj/item/storage/secure/briefcase{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/lockbox/medal, +/obj/item/storage/lockbox/medal, /obj/machinery/newscaster/security_unit{ pixel_x = 32 }, @@ -5566,7 +5566,7 @@ /area/centcom/ferry) "oT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -5600,12 +5600,12 @@ /area/centcom/supply) "oX" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder, -/obj/item/weapon/stamp/denied{ +/obj/item/folder, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -5649,8 +5649,8 @@ /area/centcom/control) "pd" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/green/side{ dir = 6 }, @@ -5716,7 +5716,7 @@ /area/syndicate_mothership/control) "po" = ( /obj/machinery/vending/cigarette{ - products = list(/obj/item/weapon/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/weapon/storage/box/matches = 10, /obj/item/weapon/lighter/greyscale = 4, /obj/item/weapon/storage/fancy/rollingpapers = 5) + products = list(/obj/item/storage/fancy/cigarettes/cigpack_syndicate = 7, /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, /obj/item/storage/fancy/cigarettes/cigpack_robust = 2, /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, /obj/item/storage/fancy/cigarettes/cigpack_midori = 1, /obj/item/storage/box/matches = 10, /obj/item/lighter/greyscale = 4, /obj/item/storage/fancy/rollingpapers = 5) }, /turf/open/floor/plasteel/bar{ dir = 2 @@ -5731,7 +5731,7 @@ }, /area/syndicate_mothership/control) "pq" = ( -/obj/item/weapon/soap/syndie, +/obj/item/soap/syndie, /obj/structure/mopbucket, /obj/machinery/light/small{ dir = 1 @@ -5744,7 +5744,7 @@ /obj/structure/mirror{ pixel_x = 28 }, -/obj/item/weapon/mop, +/obj/item/mop, /turf/open/floor/plasteel/freezer{ dir = 2 }, @@ -5804,7 +5804,7 @@ /turf/open/floor/engine/cult, /area/wizard_station) "pz" = ( -/obj/item/weapon/paper/fluff/stations/centcom/disk_memo, +/obj/item/paper/fluff/stations/centcom/disk_memo, /obj/structure/noticeboard{ pixel_x = -32 }, @@ -5849,7 +5849,7 @@ /area/syndicate_mothership/control) "pF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5860,7 +5860,7 @@ pixel_y = 32 }, /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/device/radio/headset/headset_cent, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5885,8 +5885,8 @@ dir = 1 }, /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/wrench, +/obj/item/crowbar/red, +/obj/item/wrench, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/vault{ dir = 8 @@ -5910,7 +5910,7 @@ /area/centcom/ferry) "pM" = ( /obj/structure/reagent_dispensers/fueltank, -/obj/item/weapon/weldingtool/experimental, +/obj/item/weldingtool/experimental, /obj/effect/decal/cleanable/oil, /obj/effect/decal/cleanable/dirt, /obj/effect/turf_decal/stripes/line, @@ -5941,7 +5941,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "pO" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/newscaster{ @@ -5956,7 +5956,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "pQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -5978,7 +5978,7 @@ /area/centcom/ferry) "pT" = ( /obj/machinery/computer/card/centcom, -/obj/item/weapon/card/id/centcom, +/obj/item/card/id/centcom, /obj/machinery/computer/security/telescreen{ desc = "Used for watching the RD's goons and the AI's satellite from the safety of his office."; name = "Research Monitor"; @@ -6028,7 +6028,7 @@ amount = 50 }, /obj/item/stack/cable_coil/white, -/obj/item/weapon/screwdriver/power, +/obj/item/screwdriver/power, /obj/effect/decal/cleanable/dirt, /obj/structure/cable/white{ d2 = 2; @@ -6053,8 +6053,8 @@ /area/centcom/ferry) "pY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/loyalty, -/obj/item/weapon/gun/ballistic/automatic/ar, +/obj/item/storage/lockbox/loyalty, +/obj/item/gun/ballistic/automatic/ar, /obj/machinery/light{ dir = 1 }, @@ -6063,10 +6063,10 @@ /area/centcom/ferry) "pZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/crowbar/power, -/obj/item/weapon/storage/belt/security/full, +/obj/item/storage/box/handcuffs, +/obj/item/crowbar/red, +/obj/item/crowbar/power, +/obj/item/storage/belt/security/full, /obj/structure/extinguisher_cabinet{ pixel_x = 26 }, @@ -6098,7 +6098,7 @@ /turf/open/floor/plasteel, /area/centcom/control) "qd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -6123,8 +6123,8 @@ /area/centcom/control) "qg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -6134,8 +6134,8 @@ /area/centcom/control) "qh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/wrench, -/obj/item/weapon/restraints/handcuffs, +/obj/item/wrench, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -6143,18 +6143,18 @@ /area/centcom/control) "qi" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, -/obj/item/weapon/crowbar/red, +/obj/item/storage/box/handcuffs, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/control) "qj" = ( -/obj/item/weapon/storage/box/ids{ +/obj/item/storage/box/ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/silver_ids, +/obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, /obj/machinery/newscaster{ pixel_y = 32 @@ -6309,7 +6309,7 @@ /turf/open/floor/wood, /area/centcom/ferry) "qE" = ( -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/structure/table/reinforced, /obj/item/device/detective_scanner, /obj/machinery/atmospherics/pipe/simple/supply/hidden{ @@ -6485,8 +6485,8 @@ /area/centcom/evac) "qU" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -6550,14 +6550,14 @@ /area/syndicate_mothership/control) "rg" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/snacks/pizzaslice/mushroom, +/obj/item/reagent_containers/food/snacks/pizzaslice/mushroom, /turf/open/floor/plasteel/bar{ dir = 2 }, /area/syndicate_mothership/control) "rh" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/beer{ +/obj/item/reagent_containers/food/drinks/beer{ pixel_x = 5; pixel_y = -2 }, @@ -6672,7 +6672,7 @@ /area/centcom/ferry) "rz" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/pill_bottle/dice, +/obj/item/storage/pill_bottle/dice, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "rA" = ( @@ -6698,15 +6698,15 @@ /area/centcom/ferry) "rC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "rD" = ( -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/table/reinforced, /obj/machinery/atmospherics/pipe/simple/supply/hidden, /turf/open/floor/plasteel/vault{ @@ -6714,8 +6714,8 @@ }, /area/centcom/ferry) "rE" = ( -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 4 @@ -6781,10 +6781,10 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "rI" = ( -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /obj/item/ammo_box/a357, /obj/item/ammo_box/a357, -/obj/item/weapon/gun/ballistic/revolver/mateba, +/obj/item/gun/ballistic/revolver/mateba, /obj/structure/table/reinforced, /obj/machinery/firealarm{ dir = 1; @@ -6796,7 +6796,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "rJ" = ( -/obj/item/weapon/gun/energy/pulse/carbine/loyalpin, +/obj/item/gun/energy/pulse/carbine/loyalpin, /obj/item/device/flashlight/seclite, /obj/structure/table/reinforced, /obj/machinery/airalarm{ @@ -6809,14 +6809,14 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "rK" = ( -/obj/item/weapon/storage/box/emps{ +/obj/item/storage/box/emps{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/flashbangs, -/obj/item/weapon/grenade/plastic/x4, -/obj/item/weapon/grenade/plastic/x4, -/obj/item/weapon/grenade/plastic/x4, +/obj/item/storage/box/flashbangs, +/obj/item/grenade/plastic/x4, +/obj/item/grenade/plastic/x4, +/obj/item/grenade/plastic/x4, /obj/structure/table/reinforced, /obj/item/clothing/ears/earmuffs, /obj/structure/reagent_dispensers/peppertank{ @@ -6828,7 +6828,7 @@ /turf/open/floor/plasteel, /area/centcom/ferry) "rL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/green/corner{ @@ -6859,7 +6859,7 @@ }, /area/centcom/control) "rQ" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -6872,7 +6872,7 @@ /turf/closed/indestructible/riveted, /area/centcom/control) "rS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -6880,7 +6880,7 @@ }, /area/centcom/control) "rT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -6964,13 +6964,13 @@ /turf/open/floor/plating/airless, /area/syndicate_mothership/control) "sf" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -7194,9 +7194,9 @@ "sH" = ( /obj/structure/table/reinforced, /obj/item/stack/packageWrap, -/obj/item/weapon/crowbar/power, -/obj/item/weapon/wrench, -/obj/item/weapon/hand_labeler, +/obj/item/crowbar/power, +/obj/item/wrench, +/obj/item/hand_labeler, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -7217,8 +7217,8 @@ /area/centcom/ferry) "sK" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -7228,7 +7228,7 @@ }, /area/centcom/ferry) "sL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/vault{ @@ -7240,7 +7240,7 @@ /turf/open/floor/plasteel/vault, /area/centcom/ferry) "sN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -7259,11 +7259,11 @@ /area/centcom/ferry) "sP" = ( /obj/structure/table/wood, -/obj/item/weapon/dice/d20{ +/obj/item/dice/d20{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/dice/d10{ +/obj/item/dice/d10{ pixel_x = -3 }, /obj/machinery/computer/security/telescreen/entertainment{ @@ -7318,8 +7318,8 @@ "sV" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; @@ -7387,8 +7387,8 @@ /turf/open/floor/carpet, /area/wizard_station) "th" = ( -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/rum, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/rum, /obj/structure/table/wood, /turf/open/floor/wood, /area/syndicate_mothership/control) @@ -7433,9 +7433,9 @@ /area/centcom/ferry) "to" = ( /obj/structure/closet/emcloset, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, /obj/item/clothing/mask/gas, @@ -7543,7 +7543,7 @@ /area/centcom/control) "tx" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -7557,8 +7557,8 @@ /area/centcom/control) "tz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -7592,9 +7592,9 @@ /area/centcom/control) "tD" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /obj/machinery/light{ dir = 8 }, @@ -7614,8 +7614,8 @@ /area/centcom/control) "tG" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -7798,15 +7798,15 @@ /area/centcom/control) "uh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -7882,7 +7882,7 @@ icon_state = "minibar_left"; name = "skeletal minibar" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/open/floor/wood, /area/syndicate_mothership/control) "uv" = ( @@ -7894,7 +7894,7 @@ icon_state = "minibar_right"; name = "skeletal minibar" }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/gin, +/obj/item/reagent_containers/food/drinks/bottle/gin, /turf/open/floor/wood, /area/syndicate_mothership/control) "uw" = ( @@ -7978,7 +7978,7 @@ /turf/open/floor/plating, /area/centcom/ferry) "uG" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8017,7 +8017,7 @@ /turf/open/floor/plasteel/green/corner, /area/centcom/control) "uN" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8026,7 +8026,7 @@ }, /area/centcom/control) "uO" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8035,7 +8035,7 @@ }, /area/centcom/control) "uP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/effect/turf_decal/stripes/line{ @@ -8050,7 +8050,7 @@ }, /area/centcom/evac) "uR" = ( -/obj/item/weapon/statuebust{ +/obj/item/statuebust{ pixel_y = 12 }, /obj/structure/table/wood/fancy, @@ -8066,14 +8066,14 @@ /area/wizard_station) "uU" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/pill_bottle/dice{ +/obj/item/storage/pill_bottle/dice{ icon_state = "magicdicebag" }, /turf/open/floor/carpet, /area/wizard_station) "uV" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /obj/machinery/light, /turf/open/floor/carpet, /area/wizard_station) @@ -8259,11 +8259,11 @@ }, /area/centcom/control) "vx" = ( -/obj/item/weapon/storage/box/ids{ +/obj/item/storage/box/ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/silver_ids, +/obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -8271,9 +8271,9 @@ /area/centcom/control) "vy" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/blue, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -8294,9 +8294,9 @@ /area/centcom/control) "vB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -8314,7 +8314,7 @@ /turf/open/floor/plasteel/blue/side, /area/centcom/control) "vE" = ( -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/table, /turf/open/floor/plasteel/green/side{ dir = 6 @@ -8337,7 +8337,7 @@ /area/wizard_station) "vI" = ( /obj/structure/table/wood, -/obj/item/weapon/retractor, +/obj/item/retractor, /obj/machinery/light{ dir = 1 }, @@ -8347,7 +8347,7 @@ /obj/structure/table/wood, /obj/item/clothing/suit/wizrobe/magusblue, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /obj/structure/mirror/magic{ pixel_y = 28 }, @@ -8360,11 +8360,11 @@ /obj/structure/table/wood, /obj/item/clothing/suit/wizrobe/magusred, /obj/item/clothing/head/wizard/magus, -/obj/item/weapon/staff, +/obj/item/staff, /turf/open/floor/engine/cult, /area/wizard_station) "vL" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, /turf/open/floor/grass, /area/wizard_station) "vM" = ( @@ -8386,14 +8386,14 @@ /area/syndicate_mothership/control) "vQ" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "vR" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -8431,7 +8431,7 @@ }, /area/centcom/ferry) "vU" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8440,7 +8440,7 @@ }, /area/centcom/ferry) "vV" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light{ @@ -8470,7 +8470,7 @@ /area/centcom/ferry) "vY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/device/flashlight/seclite, /obj/structure/noticeboard{ pixel_y = 28 @@ -8480,10 +8480,10 @@ /area/centcom/ferry) "vZ" = ( /obj/structure/table/reinforced, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = 6 }, -/obj/item/weapon/grenade/plastic/c4{ +/obj/item/grenade/plastic/c4{ pixel_x = -4 }, /obj/machinery/firealarm{ @@ -8494,11 +8494,11 @@ /area/centcom/ferry) "wa" = ( /obj/structure/rack, -/obj/item/weapon/gun/energy/e_gun{ +/obj/item/gun/energy/e_gun{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/gun/energy/e_gun, +/obj/item/gun/energy/e_gun, /obj/structure/sign/nanotrasen{ pixel_y = 32 }, @@ -8558,7 +8558,7 @@ }, /obj/item/clothing/suit/wizrobe/red, /obj/item/clothing/head/wizard/red, -/obj/item/weapon/staff, +/obj/item/staff, /obj/item/clothing/shoes/sandal/magic, /turf/open/floor/engine/cult, /area/wizard_station) @@ -8566,7 +8566,7 @@ /turf/open/floor/grass, /area/wizard_station) "wj" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, /turf/open/floor/grass, /area/wizard_station) "wk" = ( @@ -8578,7 +8578,7 @@ /area/syndicate_mothership/control) "wl" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/ionrifle{ +/obj/item/gun/energy/ionrifle{ pin = /obj/item/device/firing_pin }, /obj/effect/turf_decal/stripes/line{ @@ -8588,8 +8588,8 @@ /area/syndicate_mothership/control) "wm" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/open/floor/plasteel/vault{ @@ -8636,14 +8636,14 @@ /turf/open/floor/plasteel/blue/corner, /area/centcom/control) "wu" = ( -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -8682,14 +8682,14 @@ /obj/structure/destructible/cult/talisman{ desc = "A altar dedicated to the Wizard's Federation" }, -/obj/item/weapon/kitchen/knife/ritual, +/obj/item/kitchen/knife/ritual, /turf/open/floor/engine/cult, /area/wizard_station) "wB" = ( /obj/item/clothing/shoes/sandal/marisa, /obj/item/clothing/suit/wizrobe/marisa, /obj/item/clothing/head/wizard/marisa, -/obj/item/weapon/staff/broom, +/obj/item/staff/broom, /turf/open/floor/engine/cult, /area/wizard_station) "wC" = ( @@ -8705,44 +8705,44 @@ /area/centcom/ferry) "wE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = -2; pixel_y = -2 }, -/obj/item/weapon/folder/blue{ +/obj/item/folder/blue{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "wF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "wG" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "wH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/blue, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "wI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -8761,7 +8761,7 @@ /area/centcom/ferry) "wM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/radio, /obj/effect/turf_decal/stripes/line{ dir = 9 @@ -8770,7 +8770,7 @@ /area/centcom/ferry) "wN" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/turf_decal/stripes/line{ dir = 5 }, @@ -8785,7 +8785,7 @@ }, /area/centcom/ferry) "wP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8804,14 +8804,14 @@ /turf/open/floor/plasteel/green/corner, /area/centcom/control) "wS" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/blue/corner, /area/centcom/control) "wT" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/cmo, /area/centcom/control) "wU" = ( @@ -8842,7 +8842,7 @@ /turf/open/floor/grass, /area/wizard_station) "xa" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime, /turf/open/floor/grass, /area/wizard_station) "xb" = ( @@ -8857,13 +8857,13 @@ /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "xd" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) @@ -8883,9 +8883,9 @@ /area/centcom/ferry) "xh" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -8901,8 +8901,8 @@ /area/centcom/ferry) "xj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, +/obj/item/clipboard, +/obj/item/folder/yellow, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -8910,8 +8910,8 @@ /area/centcom/ferry) "xk" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/zipties, -/obj/item/weapon/crowbar/red, +/obj/item/storage/box/zipties, +/obj/item/crowbar/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -8955,12 +8955,12 @@ "xs" = ( /obj/structure/table, /obj/item/toy/sword, -/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow, +/obj/item/gun/ballistic/shotgun/toy/crossbow, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/centcom/evac) "xt" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -8983,13 +8983,13 @@ /turf/open/floor/engine/cult, /area/wizard_station) "xw" = ( -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, /turf/open/floor/grass, /area/wizard_station) "xx" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -9000,21 +9000,21 @@ /area/centcom/ferry) "xz" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /turf/open/floor/plasteel/grimy, /area/centcom/ferry) "xA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "xB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/crowbar/red, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/item/clothing/mask/gas, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9022,16 +9022,16 @@ /area/centcom/ferry) "xC" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen/blue, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen/blue, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/ferry) "xD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs/cable/zipties, +/obj/item/restraints/handcuffs/cable/zipties, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9039,7 +9039,7 @@ /area/centcom/ferry) "xE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /obj/effect/turf_decal/stripes/line{ dir = 10 }, @@ -9047,8 +9047,8 @@ /area/centcom/ferry) "xF" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/tank/internals/emergency_oxygen/engi, +/obj/item/storage/toolbox/mechanical, +/obj/item/tank/internals/emergency_oxygen/engi, /obj/effect/turf_decal/stripes/line{ dir = 6 }, @@ -9071,38 +9071,38 @@ /turf/open/floor/plasteel, /area/centcom/control) "xI" = ( -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/structure/table/reinforced, /turf/open/floor/plasteel/cmo, /area/centcom/control) "xJ" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -9139,8 +9139,8 @@ /turf/open/floor/plasteel, /area/centcom/control) "xN" = ( -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -9148,8 +9148,8 @@ /turf/open/floor/plasteel/cmo, /area/centcom/control) "xO" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -9163,7 +9163,7 @@ "xP" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/machinery/door/window/brigdoor{ base_state = "rightsecure"; dir = 1; @@ -9177,8 +9177,8 @@ "xQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /obj/structure/window/reinforced{ dir = 1 }, @@ -9207,7 +9207,7 @@ /area/wizard_station) "xT" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/device/radio/headset/headset_cent, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9248,7 +9248,7 @@ /area/centcom/evac) "xY" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs/cable/zipties, +/obj/item/restraints/handcuffs/cable/zipties, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9278,9 +9278,9 @@ /area/syndicate_mothership) "yd" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9288,8 +9288,8 @@ /area/centcom/ferry) "ye" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/lighter, +/obj/item/folder/red, +/obj/item/lighter, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -9323,7 +9323,7 @@ }, /area/centcom/ferry) "yj" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/power/apc{ @@ -9345,7 +9345,7 @@ }, /area/centcom/ferry) "yl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/machinery/light, @@ -9358,7 +9358,7 @@ }, /area/centcom/ferry) "ym" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -9410,8 +9410,8 @@ /area/centcom/ferry) "yq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/emps, -/obj/item/weapon/gun/energy/ionrifle, +/obj/item/storage/box/emps, +/obj/item/gun/energy/ionrifle, /obj/structure/sign/bluecross_2{ pixel_y = -32 }, @@ -9422,8 +9422,8 @@ /area/centcom/ferry) "yr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/syringes, -/obj/item/weapon/gun/syringe/rapidsyringe, +/obj/item/storage/box/syringes, +/obj/item/gun/syringe/rapidsyringe, /obj/structure/reagent_dispensers/peppertank{ pixel_y = -32 }, @@ -9452,7 +9452,7 @@ /area/centcom/ferry) "yu" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /obj/machinery/firealarm{ dir = 4; @@ -9464,8 +9464,8 @@ /area/centcom/control) "yv" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -9487,9 +9487,9 @@ /area/centcom/control) "yy" = ( /obj/structure/table, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /obj/machinery/light{ dir = 1 }, @@ -9509,7 +9509,7 @@ /area/centcom/control) "yA" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -9537,10 +9537,10 @@ /area/centcom/evac) "yE" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /obj/machinery/light{ dir = 8 }, @@ -9566,21 +9566,21 @@ /area/centcom/control) "yH" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -4 }, -/obj/item/weapon/reagent_containers/hypospray/medipen, +/obj/item/reagent_containers/hypospray/medipen, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/control) "yI" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 4 }, @@ -9590,23 +9590,23 @@ /area/centcom/control) "yJ" = ( /obj/structure/closet/secure_closet/security, -/obj/item/weapon/storage/belt/security/full, -/obj/item/weapon/gun/ballistic/automatic/wt550, +/obj/item/storage/belt/security/full, +/obj/item/gun/ballistic/automatic/wt550, /obj/item/clothing/head/helmet/swat/nanotrasen, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/evac) "yK" = ( /obj/structure/table/reinforced, -/obj/item/weapon/crowbar/red, +/obj/item/crowbar/red, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/evac) "yL" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -9618,13 +9618,13 @@ }, /area/centcom/evac) "yM" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9645,7 +9645,7 @@ "yP" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/structure/window/reinforced{ dir = 4 }, @@ -9655,7 +9655,7 @@ "yQ" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/structure/window/reinforced{ dir = 8 }, @@ -9679,8 +9679,8 @@ /area/centcom/evac) "yU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light, /turf/open/floor/plasteel/vault{ dir = 8 @@ -9688,18 +9688,18 @@ /area/centcom/evac) "yV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /obj/item/device/taperecorder, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/centcom/evac) "yW" = ( -/obj/item/weapon/storage/box/ids{ +/obj/item/storage/box/ids{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/silver_ids, +/obj/item/storage/box/silver_ids, /obj/structure/table/reinforced, /obj/structure/reagent_dispensers/peppertank{ pixel_x = 32 @@ -9730,13 +9730,13 @@ /turf/open/floor/engine/cult, /area/wizard_station) "za" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/red, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/folder/red, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /obj/machinery/light{ dir = 8 @@ -9756,8 +9756,8 @@ "zc" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/red, -/obj/item/weapon/pen/red, +/obj/item/folder/red, +/obj/item/pen/red, /obj/machinery/door/window/brigdoor{ name = "CentCom Customs"; icon_state = "rightsecure"; @@ -9771,8 +9771,8 @@ "zd" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/blue, +/obj/item/folder/white, +/obj/item/pen/blue, /obj/machinery/door/window/brigdoor{ name = "CentCom Customs"; icon_state = "rightsecure"; @@ -9817,8 +9817,8 @@ "zj" = ( /obj/structure/table/wood, /obj/effect/landmark/teleport_scroll, -/obj/item/weapon/dice/d20, -/obj/item/weapon/dice, +/obj/item/dice/d20, +/obj/item/dice, /turf/open/floor/carpet, /area/wizard_station) "zk" = ( @@ -9867,7 +9867,7 @@ }, /area/centcom/control) "zq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -9876,7 +9876,7 @@ }, /area/centcom/control) "zr" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/green/corner, @@ -9892,9 +9892,9 @@ /area/centcom/control) "zt" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/white, -/obj/item/weapon/pen/blue, +/obj/item/clipboard, +/obj/item/folder/white, +/obj/item/pen/blue, /obj/machinery/airalarm{ dir = 1; pixel_y = -22 @@ -9904,22 +9904,22 @@ }, /area/centcom/control) "zu" = ( -/obj/item/weapon/cautery/alien, +/obj/item/cautery/alien, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/wizard_station) "zv" = ( -/obj/item/weapon/coin/antagtoken, +/obj/item/coin/antagtoken, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/wizard_station) "zw" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/wiz, +/obj/item/bedsheet/wiz, /turf/open/floor/carpet, /area/wizard_station) "zx" = ( -/obj/item/weapon/soap/homemade, +/obj/item/soap/homemade, /obj/machinery/light/small{ brightness = 3; dir = 8 @@ -9939,7 +9939,7 @@ /area/centcom/control) "zz" = ( /obj/structure/closet/cardboard, -/obj/item/weapon/banhammer, +/obj/item/banhammer, /obj/effect/turf_decal/stripes/line, /turf/open/floor/plasteel, /area/wizard_station) @@ -9958,13 +9958,13 @@ /area/wizard_station) "zC" = ( /obj/structure/dresser, -/obj/item/weapon/storage/backpack/satchel, +/obj/item/storage/backpack/satchel, /turf/open/floor/carpet, /area/wizard_station) "zD" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/bag/tray, -/obj/item/weapon/reagent_containers/food/snacks/burger/spell, +/obj/item/storage/bag/tray, +/obj/item/reagent_containers/food/snacks/burger/spell, /turf/open/floor/carpet, /area/wizard_station) "zE" = ( @@ -9979,7 +9979,7 @@ /area/wizard_station) "zG" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/skub{ +/obj/item/skub{ pixel_y = 16 }, /turf/open/floor/plasteel/white, @@ -10005,12 +10005,12 @@ /turf/open/floor/plasteel, /area/tdome/tdomeobserve) "zL" = ( -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp/denied{ +/obj/item/clipboard, +/obj/item/stamp/denied{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/stamp, +/obj/item/stamp, /obj/structure/table/reinforced, /turf/open/floor/plasteel/vault{ dir = 8 @@ -10018,8 +10018,8 @@ /area/tdome/tdomeobserve) "zM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/red, +/obj/item/paper_bin, +/obj/item/pen/red, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -10031,8 +10031,8 @@ /area/tdome/tdomeobserve) "zO" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/green/side{ dir = 9 }, @@ -10142,7 +10142,7 @@ "Af" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/paper/pamphlet/centcom/visitor_info, +/obj/item/paper/pamphlet/centcom/visitor_info, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) @@ -10193,7 +10193,7 @@ /area/wizard_station) "Ao" = ( /obj/structure/table/wood, -/obj/item/weapon/gun/magic/wand{ +/obj/item/gun/magic/wand{ desc = "Used in emergencies to reignite magma engines."; max_charges = 0; name = "wand of emergency engine ignition" @@ -10202,7 +10202,7 @@ /area/wizard_station) "Ap" = ( /obj/structure/table/wood, -/obj/item/weapon/bikehorn/golden{ +/obj/item/bikehorn/golden{ pixel_x = -8; pixel_y = 8 }, @@ -10238,19 +10238,19 @@ /area/centcom/holding) "Au" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/donkpockets{ +/obj/item/storage/box/donkpockets{ pixel_x = 3; pixel_y = 3 }, @@ -10337,7 +10337,7 @@ /turf/open/floor/plasteel, /area/tdome/tdomeobserve) "AI" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/green/corner{ @@ -10350,7 +10350,7 @@ }, /area/tdome/tdomeobserve) "AK" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10419,7 +10419,7 @@ }, /area/tdome/tdomeobserve) "AU" = ( -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /turf/open/floor/plasteel/white, /area/tdome/tdomeobserve) "AV" = ( @@ -10432,7 +10432,7 @@ }, /area/tdome/tdomeobserve) "AW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10485,7 +10485,7 @@ /turf/open/floor/plasteel/green/side, /area/tdome/tdomeobserve) "Bg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10525,28 +10525,28 @@ /area/centcom/holding) "Bl" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/freezer{ dir = 2 }, /area/centcom/holding) "Bm" = ( /obj/structure/table, -/obj/item/weapon/lighter, +/obj/item/lighter, /turf/open/floor/plasteel/freezer{ dir = 2 }, /area/centcom/holding) "Bn" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola, +/obj/item/reagent_containers/food/drinks/soda_cans/cola, /turf/open/floor/plasteel/freezer{ dir = 2 }, /area/centcom/holding) "Bo" = ( /obj/structure/table, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/open/floor/plasteel/freezer{ dir = 2 }, @@ -10588,7 +10588,7 @@ }, /area/tdome/tdomeobserve) "Bv" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/neutral/side{ @@ -10597,7 +10597,7 @@ }, /area/tdome/tdomeobserve) "Bw" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10606,7 +10606,7 @@ }, /area/tdome/tdomeobserve) "Bx" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10615,7 +10615,7 @@ }, /area/tdome/tdomeobserve) "By" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/red/side, @@ -10631,13 +10631,13 @@ /turf/open/floor/plasteel/loadingarea, /area/tdome/tdomeobserve) "BC" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/green/side, /area/tdome/tdomeobserve) "BD" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10646,7 +10646,7 @@ }, /area/tdome/tdomeobserve) "BE" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -10723,8 +10723,8 @@ /area/wizard_station) "BP" = ( /obj/structure/rack, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol, +/obj/item/storage/crayons, +/obj/item/gun/ballistic/automatic/toy/pistol, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "BQ" = ( @@ -10756,49 +10756,49 @@ /area/tdome/tdomeobserve) "BU" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawbacon, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, -/obj/item/weapon/reagent_containers/food/snacks/sausage, -/obj/item/weapon/reagent_containers/food/snacks/sausage, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, -/obj/item/weapon/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/meat/rawbacon, +/obj/item/reagent_containers/food/snacks/meat/rawbacon, +/obj/item/reagent_containers/food/snacks/meat/rawbacon, +/obj/item/reagent_containers/food/snacks/meat/rawbacon, +/obj/item/reagent_containers/food/snacks/meat/slab/killertomato, +/obj/item/reagent_containers/food/snacks/meat/slab/killertomato, +/obj/item/reagent_containers/food/snacks/meat/slab/killertomato, +/obj/item/reagent_containers/food/snacks/meat/slab/killertomato, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard, +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/sausage, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, +/obj/item/reagent_containers/food/snacks/carpmeat, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/tdome/tdomeobserve) "BV" = ( /obj/structure/closet/secure_closet/freezer/fridge, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/potato, -/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/weapon/reagent_containers/food/snacks/grown/whitebeet, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/tomato, -/obj/item/weapon/reagent_containers/food/snacks/grown/rice, -/obj/item/weapon/reagent_containers/food/snacks/grown/rice, -/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper, -/obj/item/weapon/reagent_containers/food/snacks/grown/icepepper, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lemon, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/lime, -/obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange, -/obj/item/weapon/reagent_containers/food/snacks/grown/cherries, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/deus, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/potato, +/obj/item/reagent_containers/food/snacks/grown/whitebeet, +/obj/item/reagent_containers/food/snacks/grown/whitebeet, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/tomato, +/obj/item/reagent_containers/food/snacks/grown/rice, +/obj/item/reagent_containers/food/snacks/grown/rice, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/icepepper, +/obj/item/reagent_containers/food/snacks/grown/citrus/lemon, +/obj/item/reagent_containers/food/snacks/grown/citrus/lime, +/obj/item/reagent_containers/food/snacks/grown/citrus/orange, +/obj/item/reagent_containers/food/snacks/grown/cherries, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/deus, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -10810,48 +10810,48 @@ /area/tdome/tdomeobserve) "BX" = ( /obj/structure/closet/secure_closet/freezer/kitchen, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, -/obj/item/weapon/reagent_containers/food/snacks/grown/banana, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/wheat, -/obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/weapon/reagent_containers/food/snacks/grown/vanillapod, -/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/weapon/reagent_containers/food/snacks/grown/sugarcane, -/obj/item/weapon/reagent_containers/food/snacks/grown/oat, -/obj/item/weapon/reagent_containers/food/snacks/grown/oat, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/grapes, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/corn, -/obj/item/weapon/reagent_containers/food/snacks/grown/chili, -/obj/item/weapon/reagent_containers/food/snacks/grown/chili, -/obj/item/weapon/reagent_containers/food/snacks/grown/carrot, -/obj/item/weapon/reagent_containers/food/snacks/grown/apple, -/obj/item/weapon/reagent_containers/food/snacks/grown/ambrosia/vulgaris, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/banana, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/wheat, +/obj/item/reagent_containers/food/snacks/grown/vanillapod, +/obj/item/reagent_containers/food/snacks/grown/vanillapod, +/obj/item/reagent_containers/food/snacks/grown/sugarcane, +/obj/item/reagent_containers/food/snacks/grown/sugarcane, +/obj/item/reagent_containers/food/snacks/grown/oat, +/obj/item/reagent_containers/food/snacks/grown/oat, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/grapes, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/corn, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/chili, +/obj/item/reagent_containers/food/snacks/grown/carrot, +/obj/item/reagent_containers/food/snacks/grown/apple, +/obj/item/reagent_containers/food/snacks/grown/ambrosia/vulgaris, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/tdome/tdomeobserve) "BY" = ( /obj/structure/closet/secure_closet/freezer/meat, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/spaghetti, -/obj/item/weapon/reagent_containers/food/snacks/spaghetti, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, -/obj/item/weapon/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/goliath, +/obj/item/reagent_containers/food/snacks/meat/slab/goliath, +/obj/item/reagent_containers/food/snacks/meat/slab/goliath, +/obj/item/reagent_containers/food/snacks/meat/slab/goliath, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/spaghetti, +/obj/item/reagent_containers/food/snacks/spaghetti, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, +/obj/item/reagent_containers/food/snacks/meat/rawcutlet, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -10916,8 +10916,8 @@ /area/tdome/tdomeobserve) "Cg" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/beanbag, -/obj/item/weapon/gun/ballistic/revolver/doublebarrel, +/obj/item/storage/box/beanbag, +/obj/item/gun/ballistic/revolver/doublebarrel, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -10940,8 +10940,8 @@ /area/tdome/tdomeobserve) "Cj" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 5 }, /turf/open/floor/plasteel/vault{ @@ -10968,8 +10968,8 @@ /area/wizard_station) "Cn" = ( /obj/structure/rack, -/obj/item/weapon/storage/crayons, -/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow, +/obj/item/storage/crayons, +/obj/item/gun/ballistic/shotgun/toy/crossbow, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "Co" = ( @@ -11002,7 +11002,7 @@ /area/tdome/tdomeobserve) "Ct" = ( /obj/structure/table/wood, -/obj/item/weapon/reagent_containers/food/drinks/trophy/gold_cup, +/obj/item/reagent_containers/food/drinks/trophy/gold_cup, /turf/open/floor/plasteel/grimy, /area/tdome/tdomeobserve) "Cu" = ( @@ -11038,7 +11038,7 @@ /area/centcom/holding) "Cy" = ( /obj/structure/table, -/obj/item/weapon/gun/ballistic/automatic/toy/pistol, +/obj/item/gun/ballistic/automatic/toy/pistol, /turf/open/floor/plasteel/cafeteria, /area/centcom/holding) "Cz" = ( @@ -11056,14 +11056,14 @@ /area/tdome/tdomeobserve) "CB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /obj/machinery/newscaster{ pixel_x = -32 }, @@ -11194,8 +11194,8 @@ /area/tdome/tdomeobserve) "CP" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/mint, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/snacks/mint, +/obj/item/reagent_containers/food/condiment/enzyme{ pixel_y = 5 }, /turf/open/floor/plasteel/vault{ @@ -11234,7 +11234,7 @@ /turf/open/floor/plasteel/whitegreen/corner, /area/tdome/tdomeobserve) "CU" = ( -/obj/item/weapon/reagent_containers/food/snacks/egg/rainbow{ +/obj/item/reagent_containers/food/snacks/egg/rainbow{ desc = "I bet you think you're pretty clever... well you are."; name = "easter egg" }, @@ -11259,7 +11259,7 @@ "CX" = ( /obj/structure/table/reinforced, /obj/item/clothing/suit/apron/chef, -/obj/item/weapon/kitchen/rollingpin, +/obj/item/kitchen/rollingpin, /turf/open/floor/plasteel/vault{ dir = 8 }, @@ -11267,14 +11267,14 @@ "CY" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -8; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = -8 }, -/obj/item/weapon/reagent_containers/food/drinks/britcup, +/obj/item/reagent_containers/food/drinks/britcup, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) @@ -11364,8 +11364,8 @@ "Di" = ( /obj/structure/table/reinforced, /obj/machinery/door/firedoor, -/obj/item/weapon/storage/bag/tray, -/obj/item/weapon/kitchen/fork, +/obj/item/storage/bag/tray, +/obj/item/kitchen/fork, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/tdome/tdomeobserve) @@ -11382,7 +11382,7 @@ }, /area/tdome/tdomeobserve) "Dl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -11395,8 +11395,8 @@ /area/tdome/tdomeobserve) "Dn" = ( /obj/structure/rack, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/item/clothing/head/chefhat, /turf/open/floor/plasteel/vault, /area/tdome/tdomeobserve) @@ -11418,13 +11418,13 @@ }, /area/tdome/tdomeobserve) "Dq" = ( -/obj/item/weapon/storage/fancy/cigarettes/cigars{ +/obj/item/storage/fancy/cigarettes/cigars{ pixel_y = 6 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba{ +/obj/item/storage/fancy/cigarettes/cigars/cohiba{ pixel_y = 3 }, -/obj/item/weapon/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/fancy/cigarettes/cigars/havana, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -11436,7 +11436,7 @@ }, /area/tdome/tdomeobserve) "Ds" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -11504,7 +11504,7 @@ }, /area/tdome/tdomeobserve) "DA" = ( -/obj/item/weapon/storage/box/matches{ +/obj/item/storage/box/matches{ pixel_x = -3; pixel_y = 5 }, @@ -11517,11 +11517,11 @@ }, /area/tdome/tdomeobserve) "DB" = ( -/obj/item/weapon/lighter{ +/obj/item/lighter{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lighter, +/obj/item/lighter, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -11529,9 +11529,9 @@ /area/tdome/tdomeobserve) "DC" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/barman_recipes, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/reagent_containers/glass/rag, +/obj/item/book/manual/barman_recipes, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/glass/rag, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -11584,8 +11584,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/red, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/transforming/energy/sword/saber/red, +/obj/item/melee/baton/loaded, +/obj/item/melee/transforming/energy/sword/saber/red, /obj/effect/turf_decal/stripes/line{ dir = 4 }, @@ -11704,8 +11704,8 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/tdome/green, /obj/item/clothing/head/helmet/thunderdome, -/obj/item/weapon/melee/baton/loaded, -/obj/item/weapon/melee/transforming/energy/sword/saber/green, +/obj/item/melee/baton/loaded, +/obj/item/melee/transforming/energy/sword/saber/green, /obj/effect/turf_decal/stripes/line{ dir = 8 }, @@ -11958,7 +11958,7 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -11988,7 +11988,7 @@ /obj/item/clothing/shoes/sneakers/brown, /obj/item/clothing/suit/armor/vest, /obj/item/clothing/head/helmet/swat, -/obj/item/weapon/gun/energy/laser, +/obj/item/gun/energy/laser, /obj/effect/turf_decal/stripes/line{ dir = 1 }, @@ -12059,7 +12059,7 @@ }, /area/tdome/tdomeadmin) "Fd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -12081,7 +12081,7 @@ }, /area/tdome/tdomeadmin) "Fg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -12143,7 +12143,7 @@ /area/shuttle/escape) "Fp" = ( /obj/structure/table/wood, -/obj/item/weapon/paper/fluff/stations/centcom/broken_evac, +/obj/item/paper/fluff/stations/centcom/broken_evac, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "Fq" = ( @@ -12154,8 +12154,8 @@ /area/tdome/tdomeadmin) "Fr" = ( /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/fourcolor, +/obj/item/paper_bin, +/obj/item/pen/fourcolor, /obj/machinery/light, /turf/open/floor/plasteel/vault{ dir = 8 @@ -12163,9 +12163,9 @@ /area/tdome/tdomeadmin) "Fs" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/book/manual/wiki/security_space_law, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/book/manual/wiki/security_space_law, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault{ dir = 8 @@ -12173,7 +12173,7 @@ /area/tdome/tdomeadmin) "Ft" = ( /obj/structure/table/wood, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/device/radio/headset/headset_cent, /turf/open/floor/plasteel/vault{ dir = 8 @@ -12181,7 +12181,7 @@ /area/tdome/tdomeadmin) "Fu" = ( /obj/structure/table/wood, -/obj/item/weapon/phone{ +/obj/item/phone{ desc = "Supposedly a direct line to Nanotrasen Central Command. It's not even plugged in."; pixel_x = -3; pixel_y = 3 @@ -12239,8 +12239,8 @@ /area/tdome/tdomeadmin) "Fy" = ( /obj/structure/table/wood, -/obj/item/weapon/folder/red, -/obj/item/weapon/lighter, +/obj/item/folder/red, +/obj/item/lighter, /obj/machinery/newscaster{ pixel_y = -32 }, @@ -12249,11 +12249,11 @@ }, /area/tdome/tdomeadmin) "Fz" = ( -/obj/item/weapon/storage/briefcase{ +/obj/item/storage/briefcase{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/secure/briefcase, +/obj/item/storage/secure/briefcase, /obj/structure/table/wood, /turf/open/floor/plasteel/vault{ dir = 8 @@ -12261,15 +12261,15 @@ /area/tdome/tdomeadmin) "FA" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 8 }, /area/tdome/tdomeadmin) "FB" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey{ +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/whiskey{ pixel_y = 5 }, /obj/machinery/light, @@ -12279,7 +12279,7 @@ /area/tdome/tdomeadmin) "FC" = ( /obj/structure/table/wood, -/obj/item/weapon/book/manual/random, +/obj/item/book/manual/random, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "FD" = ( @@ -12386,17 +12386,17 @@ /area/centcom/evac) "FW" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -2; pixel_y = 4 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "FX" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/fire{ pixel_x = -2; pixel_y = 4 }, @@ -12404,10 +12404,10 @@ /area/centcom/evac) "FY" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -12499,17 +12499,17 @@ /area/abductor_ship) "Gp" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/mineral/plastitanium, /area/centcom/evac) "Gq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/mineral/plastitanium, /area/centcom/evac) "Gr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/pen, +/obj/item/pen, /turf/open/floor/mineral/plastitanium, /area/centcom/evac) "Gs" = ( @@ -12575,8 +12575,8 @@ /area/centcom/evac) "GE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/clipboard, -/obj/item/weapon/stamp, +/obj/item/clipboard, +/obj/item/stamp, /turf/open/floor/mineral/plastitanium, /area/centcom/evac) "GF" = ( @@ -12585,8 +12585,8 @@ }, /area/abductor_ship) "GG" = ( -/obj/item/weapon/retractor/alien, -/obj/item/weapon/hemostat/alien, +/obj/item/retractor/alien, +/obj/item/hemostat/alien, /obj/structure/table/abductor, /turf/open/floor/plating/abductor, /area/abductor_ship) @@ -12604,7 +12604,7 @@ /area/abductor_ship) "GK" = ( /obj/structure/table/abductor, -/obj/item/weapon/storage/box/alienhandcuffs, +/obj/item/storage/box/alienhandcuffs, /turf/open/floor/plating/abductor, /area/abductor_ship) "GL" = ( @@ -12644,11 +12644,11 @@ }, /area/abductor_ship) "GS" = ( -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/paper/guides/antag/abductor, -/obj/item/weapon/scalpel/alien, +/obj/item/surgical_drapes, +/obj/item/paper/guides/antag/abductor, +/obj/item/scalpel/alien, /obj/structure/table/abductor, -/obj/item/weapon/cautery/alien, +/obj/item/cautery/alien, /turf/open/floor/plating/abductor, /area/abductor_ship) "GT" = ( @@ -12658,7 +12658,7 @@ /area/abductor_ship) "GU" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/open/floor/mineral/plastitanium, /area/centcom/evac) "GV" = ( @@ -12698,8 +12698,8 @@ /area/abductor_ship) "Ha" = ( /obj/structure/table/abductor, -/obj/item/weapon/surgicaldrill/alien, -/obj/item/weapon/circular_saw/alien, +/obj/item/surgicaldrill/alien, +/obj/item/circular_saw/alien, /turf/open/floor/plating/abductor, /area/abductor_ship) "Hb" = ( @@ -12818,13 +12818,13 @@ /area/centcom/evac) "Hw" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/machinery/light, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Hx" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "Hy" = ( @@ -12880,7 +12880,7 @@ /area/centcom/evac) "HH" = ( /obj/structure/table, -/obj/item/weapon/storage/lockbox, +/obj/item/storage/lockbox, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "HI" = ( @@ -12893,13 +12893,13 @@ /area/centcom/evac) "HK" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/pen, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "HL" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, +/obj/item/paper_bin, /turf/open/floor/mineral/titanium/blue, /area/centcom/evac) "HM" = ( @@ -13112,7 +13112,7 @@ /area/centcom/evac) "JU" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/machinery/light{ dir = 8 }, @@ -13622,7 +13622,7 @@ /area/centcom/evac) "LW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/open/floor/plasteel/vault{ dir = 8 }, diff --git a/_maps/shuttles/emergency_asteroid.dmm b/_maps/shuttles/emergency_asteroid.dmm index 298f353da7b..97c252807c5 100644 --- a/_maps/shuttles/emergency_asteroid.dmm +++ b/_maps/shuttles/emergency_asteroid.dmm @@ -188,8 +188,8 @@ /area/shuttle/escape) "aJ" = ( /obj/structure/table, -/obj/item/weapon/extinguisher, -/obj/item/weapon/crowbar, +/obj/item/extinguisher, +/obj/item/crowbar, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aK" = ( @@ -198,8 +198,8 @@ /area/shuttle/escape) "aL" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -299,7 +299,7 @@ /area/shuttle/escape) "bc" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -311,8 +311,8 @@ /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /obj/machinery/recharger, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -440,8 +440,8 @@ /area/shuttle/escape) "by" = ( /obj/structure/table, -/obj/item/weapon/extinguisher, -/obj/item/weapon/crowbar, +/obj/item/extinguisher, +/obj/item/crowbar, /obj/machinery/recharger, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) @@ -486,9 +486,9 @@ /area/shuttle/escape) "bF" = ( /obj/structure/table, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, -/obj/item/weapon/scalpel, +/obj/item/retractor, +/obj/item/hemostat, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bG" = ( @@ -497,11 +497,11 @@ /area/shuttle/escape) "bH" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/cautery{ +/obj/item/circular_saw, +/obj/item/cautery{ pixel_x = 4 }, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bI" = ( diff --git a/_maps/shuttles/emergency_bar.dmm b/_maps/shuttles/emergency_bar.dmm index dab289be7ad..72beb3763e3 100644 --- a/_maps/shuttles/emergency_bar.dmm +++ b/_maps/shuttles/emergency_bar.dmm @@ -36,8 +36,8 @@ /area/shuttle/escape) "ai" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/fancy/cigarettes/cigars/havana, -/obj/item/weapon/lighter{ +/obj/item/storage/fancy/cigarettes/cigars/havana, +/obj/item/lighter{ pixel_x = -4; pixel_y = 6 }, @@ -108,8 +108,8 @@ pixel_y = -24 }, /obj/structure/table/wood/poker, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/whiskey, /obj/machinery/light, /turf/open/floor/carpet, /area/shuttle/escape) @@ -168,7 +168,7 @@ pixel_x = 6; pixel_y = 24 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -275,8 +275,8 @@ pixel_x = 27 }, /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/bottle/lizardwine, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/bottle/lizardwine, /turf/open/floor/plasteel/bar, /area/shuttle/escape) "aT" = ( @@ -330,7 +330,7 @@ /turf/open/floor/plasteel/bar, /area/shuttle/escape) "bc" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -373,8 +373,8 @@ /area/shuttle/escape) "bj" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ pixel_x = 4; pixel_y = 4 }, @@ -447,7 +447,7 @@ /area/shuttle/escape) "bw" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/machinery/light/small{ brightness = 3; dir = 8 @@ -472,10 +472,10 @@ /area/shuttle/escape) "bz" = ( /obj/structure/table, -/obj/item/weapon/circular_saw, -/obj/item/weapon/hemostat, -/obj/item/weapon/retractor, -/obj/item/weapon/scalpel, +/obj/item/circular_saw, +/obj/item/hemostat, +/obj/item/retractor, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bA" = ( @@ -511,7 +511,7 @@ /turf/open/floor/plasteel/freezer, /area/shuttle/escape) "bG" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -529,7 +529,7 @@ /area/shuttle/escape) "bJ" = ( /obj/structure/table/wood/bar, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/grimy, /area/shuttle/escape) "bK" = ( @@ -550,14 +550,14 @@ /area/shuttle/escape) "bN" = ( /obj/structure/table, -/obj/item/weapon/storage/box/drinkingglasses, -/obj/item/weapon/reagent_containers/food/drinks/shaker, -/obj/item/weapon/storage/fancy/cigarettes/cigars/havana, +/obj/item/storage/box/drinkingglasses, +/obj/item/reagent_containers/food/drinks/shaker, +/obj/item/storage/fancy/cigarettes/cigars/havana, /turf/open/floor/plasteel/bar, /area/shuttle/escape) "bO" = ( /obj/structure/table/wood/bar, -/obj/item/weapon/folder/red, +/obj/item/folder/red, /turf/open/floor/plasteel/grimy, /area/shuttle/escape) "bP" = ( @@ -582,23 +582,23 @@ /area/shuttle/escape) "bS" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/toxin{ pixel_x = 4; pixel_y = 4 }, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bT" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" }, /turf/open/floor/plasteel/bar, /area/shuttle/escape) "bU" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute{ pixel_x = 4; pixel_y = 4 }, diff --git a/_maps/shuttles/emergency_birdboat.dmm b/_maps/shuttles/emergency_birdboat.dmm index 55c36c22f5d..98827c6bc0b 100644 --- a/_maps/shuttles/emergency_birdboat.dmm +++ b/_maps/shuttles/emergency_birdboat.dmm @@ -12,18 +12,18 @@ /area/shuttle/escape) "ad" = ( /obj/structure/table, -/obj/item/weapon/scalpel, -/obj/item/weapon/retractor{ +/obj/item/scalpel, +/obj/item/retractor{ pixel_y = 5 }, -/obj/item/weapon/hemostat, +/obj/item/hemostat, /turf/open/floor/plasteel/white, /area/shuttle/escape) "ae" = ( /obj/structure/table, -/obj/item/weapon/cautery, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/circular_saw{ +/obj/item/cautery, +/obj/item/surgicaldrill, +/obj/item/circular_saw{ pixel_y = 9 }, /turf/open/floor/plasteel/white, @@ -48,7 +48,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ak" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/mineral/titanium/blue, @@ -66,7 +66,7 @@ /area/shuttle/escape) "an" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/white, /area/shuttle/escape) "ao" = ( @@ -129,7 +129,7 @@ /area/shuttle/escape) "ay" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs, +/obj/item/storage/box/handcuffs, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "az" = ( @@ -144,7 +144,7 @@ /turf/open/floor/plasteel/white, /area/shuttle/escape) "aB" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -181,7 +181,7 @@ /area/shuttle/escape) "aI" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti{ +/obj/item/reagent_containers/food/snacks/boiledspaghetti{ name = "pasghetti"; pixel_x = 4; pixel_y = 7 @@ -212,7 +212,7 @@ /area/shuttle/escape) "aM" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/snacks/chocolatebar, +/obj/item/reagent_containers/food/snacks/chocolatebar, /turf/open/floor/plasteel/black, /area/shuttle/escape) "aN" = ( @@ -248,11 +248,11 @@ /area/shuttle/escape) "aR" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/fire{ +/obj/item/storage/firstaid/fire{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/toxin, /turf/open/floor/plasteel/white, /area/shuttle/escape) "aS" = ( @@ -270,11 +270,11 @@ /area/shuttle/escape) "aU" = ( /obj/structure/table/glass, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/brute{ pixel_x = 5; pixel_y = 5 }, -/obj/item/weapon/storage/firstaid/brute, +/obj/item/storage/firstaid/brute, /obj/machinery/light{ dir = 4 }, @@ -298,7 +298,7 @@ /area/shuttle/escape) "aY" = ( /obj/structure/table/glass, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /turf/open/floor/plasteel/white, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_box.dmm b/_maps/shuttles/emergency_box.dmm index 7bb5ad5ccf3..c156282518a 100644 --- a/_maps/shuttles/emergency_box.dmm +++ b/_maps/shuttles/emergency_box.dmm @@ -37,12 +37,12 @@ /area/shuttle/escape) "ai" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/crowbar, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aj" = ( @@ -163,12 +163,12 @@ /area/shuttle/escape) "aE" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aF" = ( @@ -341,12 +341,12 @@ /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, diff --git a/_maps/shuttles/emergency_cere.dmm b/_maps/shuttles/emergency_cere.dmm index 8d9c39a2696..66be4bbac80 100644 --- a/_maps/shuttles/emergency_cere.dmm +++ b/_maps/shuttles/emergency_cere.dmm @@ -15,8 +15,8 @@ /area/shuttle/escape) "ae" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/crowbar, +/obj/item/storage/toolbox/emergency, +/obj/item/crowbar, /obj/machinery/light{ dir = 1 }, @@ -28,8 +28,8 @@ /area/shuttle/escape) "ag" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/darkpurple, /area/shuttle/escape) "ah" = ( @@ -64,11 +64,11 @@ /area/shuttle/escape) "an" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/o2, +/obj/item/storage/firstaid/o2, /obj/machinery/light{ dir = 1 }, @@ -125,7 +125,7 @@ /area/shuttle/escape) "ay" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/plasteel/darkred, /area/shuttle/escape) "az" = ( @@ -196,7 +196,7 @@ /turf/open/floor/plasteel/darkred, /area/shuttle/escape) "aM" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/item/device/radio/intercom{ @@ -218,7 +218,7 @@ /turf/open/floor/plasteel/black, /area/shuttle/escape) "aP" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /obj/item/device/radio/intercom{ @@ -267,7 +267,7 @@ /area/shuttle/escape) "aV" = ( /obj/structure/table, -/obj/item/weapon/book/manual/wiki/security_space_law, +/obj/item/book/manual/wiki/security_space_law, /turf/open/floor/mineral/plastitanium/brig{ icon_state = "darkred"; dir = 1; @@ -499,8 +499,8 @@ /area/shuttle/escape) "by" = ( /obj/structure/table, -/obj/item/weapon/storage/box/teargas, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/teargas, +/obj/item/storage/box/zipties, /turf/open/floor/mineral/plastitanium/brig{ icon_state = "darkred"; dir = 2; @@ -562,7 +562,7 @@ /area/shuttle/escape) "bG" = ( /obj/structure/table, -/obj/item/weapon/storage/box/cups, +/obj/item/storage/box/cups, /obj/item/device/radio/intercom{ dir = 4; name = "Station Intercom (General)"; @@ -581,14 +581,14 @@ /area/shuttle/escape) "bJ" = ( /obj/structure/table, -/obj/item/weapon/storage/box/donkpockets, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /turf/open/floor/plasteel/neutral, /area/shuttle/escape) "bK" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /obj/machinery/light{ dir = 1 }, @@ -652,7 +652,7 @@ /area/shuttle/escape) "bV" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -692,7 +692,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "ca" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -716,7 +716,7 @@ /obj/machinery/light{ dir = 4 }, -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -781,8 +781,8 @@ /area/shuttle/escape) "cm" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker/cryoxadone, -/obj/item/weapon/wrench, +/obj/item/reagent_containers/glass/beaker/cryoxadone, +/obj/item/wrench, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 5 @@ -854,7 +854,7 @@ /area/shuttle/escape) "cy" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -898,26 +898,26 @@ /area/shuttle/escape) "cE" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/empty, -/obj/item/weapon/reagent_containers/blood/AMinus, -/obj/item/weapon/reagent_containers/blood/BMinus{ +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/empty, +/obj/item/reagent_containers/blood/AMinus, +/obj/item/reagent_containers/blood/BMinus{ pixel_x = -4; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/blood/BPlus{ +/obj/item/reagent_containers/blood/BPlus{ pixel_x = 1; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/OPlus{ +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/OPlus{ pixel_x = -2; pixel_y = -1 }, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/random, -/obj/item/weapon/reagent_containers/blood/APlus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/APlus, +/obj/item/reagent_containers/blood/random, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "cF" = ( @@ -925,22 +925,22 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/scalpel{ +/obj/item/circular_saw, +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/hemostat, -/obj/item/weapon/surgicaldrill, -/obj/item/weapon/cautery{ +/obj/item/hemostat, +/obj/item/surgicaldrill, +/obj/item/cautery{ pixel_x = 4 }, -/obj/item/weapon/retractor, +/obj/item/retractor, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "cG" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/crowbar, +/obj/item/storage/firstaid/fire, +/obj/item/crowbar, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 4 @@ -962,14 +962,14 @@ /obj/item/clothing/suit/apron/surgical, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/razor, +/obj/item/surgical_drapes, +/obj/item/razor, /turf/open/floor/plasteel/whiteblue, /area/shuttle/escape) "cK" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/o2, -/obj/item/weapon/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2, +/obj/item/storage/firstaid/toxin, /turf/open/floor/plasteel/whiteblue/side{ icon_state = "whiteblue"; dir = 10 @@ -1098,7 +1098,7 @@ /area/shuttle/escape) "dc" = ( /obj/structure/table, -/obj/item/weapon/storage/box/metalfoam, +/obj/item/storage/box/metalfoam, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 1 @@ -1151,7 +1151,7 @@ /area/shuttle/escape) "dj" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/yellow/side{ icon_state = "yellow"; dir = 10 @@ -1159,8 +1159,8 @@ /area/shuttle/escape) "dk" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/electrical, -/obj/item/weapon/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, +/obj/item/storage/toolbox/electrical, /turf/open/floor/plasteel/yellow/side, /area/shuttle/escape) "dl" = ( diff --git a/_maps/shuttles/emergency_clown.dmm b/_maps/shuttles/emergency_clown.dmm index f9f4cc136ab..f359441eabc 100644 --- a/_maps/shuttles/emergency_clown.dmm +++ b/_maps/shuttles/emergency_clown.dmm @@ -16,7 +16,7 @@ /area/shuttle/escape) "ae" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/noslip, /area/shuttle/escape) "af" = ( @@ -31,11 +31,11 @@ /area/shuttle/escape) "ah" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/noslip, /area/shuttle/escape) "ai" = ( @@ -122,16 +122,16 @@ /area/shuttle/escape) "ay" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/noslip, /area/shuttle/escape) "az" = ( -/obj/item/weapon/greentext/quiet{ +/obj/item/greentext/quiet{ anchored = 1 }, /turf/open/floor/mineral/plastitanium/brig, @@ -217,7 +217,7 @@ /area/shuttle/escape) "aM" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/random, +/obj/item/bedsheet/random, /turf/open/floor/noslip, /area/shuttle/escape) "aN" = ( @@ -225,7 +225,7 @@ dir = 4 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/random, +/obj/item/bedsheet/random, /turf/open/floor/noslip, /area/shuttle/escape) "aO" = ( @@ -233,12 +233,12 @@ dir = 8 }, /obj/structure/bed, -/obj/item/weapon/bedsheet/random, +/obj/item/bedsheet/random, /turf/open/floor/noslip, /area/shuttle/escape) "aP" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/random, +/obj/item/bedsheet/random, /obj/structure/window/reinforced{ dir = 8 }, @@ -311,12 +311,12 @@ /area/shuttle/escape) "bb" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, diff --git a/_maps/shuttles/emergency_cramped.dmm b/_maps/shuttles/emergency_cramped.dmm index f998b1cc555..5814018781d 100644 --- a/_maps/shuttles/emergency_cramped.dmm +++ b/_maps/shuttles/emergency_cramped.dmm @@ -30,8 +30,8 @@ "g" = ( /obj/structure/window/reinforced, /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/book/manual/random, +/obj/item/storage/firstaid/regular, +/obj/item/book/manual/random, /obj/structure/extinguisher_cabinet{ pixel_x = -30 }, diff --git a/_maps/shuttles/emergency_delta.dmm b/_maps/shuttles/emergency_delta.dmm index b426bf09534..a9b58c9f5b9 100644 --- a/_maps/shuttles/emergency_delta.dmm +++ b/_maps/shuttles/emergency_delta.dmm @@ -56,19 +56,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -121,7 +121,7 @@ }, /area/shuttle/escape) "aj" = ( -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/structure/table/reinforced, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) @@ -131,18 +131,18 @@ /area/shuttle/escape) "al" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "am" = ( -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -151,7 +151,7 @@ /turf/open/floor/plasteel/cmo, /area/shuttle/escape) "an" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -166,7 +166,7 @@ /turf/open/floor/plasteel/neutral, /area/shuttle/escape) "ap" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -184,33 +184,33 @@ /turf/closed/wall/mineral/titanium, /area/shuttle/escape) "ar" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -285,8 +285,8 @@ }, /area/shuttle/escape) "aB" = ( -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -319,8 +319,8 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "aG" = ( -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -468,14 +468,14 @@ /area/shuttle/escape) "aZ" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -5 }, @@ -510,12 +510,12 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -4; pixel_y = 3 }, @@ -523,7 +523,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -561,8 +561,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -571,8 +571,8 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -597,7 +597,7 @@ "bl" = ( /obj/structure/rack, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /obj/effect/turf_decal/bot, @@ -631,9 +631,9 @@ /area/shuttle/escape) "bq" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/hand_labeler_refill, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -646,7 +646,7 @@ "bs" = ( /obj/structure/table, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, /area/shuttle/escape) @@ -690,7 +690,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bz" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -704,7 +704,7 @@ }, /area/shuttle/escape) "bA" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1 }, @@ -714,7 +714,7 @@ /area/shuttle/escape) "bB" = ( /obj/structure/table, -/obj/item/weapon/clipboard, +/obj/item/clipboard, /obj/item/toy/figure/ninja, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -798,7 +798,7 @@ /area/shuttle/escape) "bO" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/lockbox/loyalty, +/obj/item/storage/lockbox/loyalty, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "bP" = ( @@ -841,7 +841,7 @@ /area/shuttle/escape) "bV" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/box/zipties, +/obj/item/storage/box/zipties, /obj/item/device/radio/intercom{ name = "Station Intercom"; pixel_y = -26 @@ -850,8 +850,8 @@ /area/shuttle/escape) "bW" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/red/corner{ dir = 8 }, @@ -883,7 +883,7 @@ }, /area/shuttle/escape) "cb" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -905,7 +905,7 @@ /area/shuttle/escape) "cd" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -972,13 +972,13 @@ /area/shuttle/escape) "cm" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "cn" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/blue, -/obj/item/weapon/pen, +/obj/item/folder/blue, +/obj/item/pen, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "co" = ( @@ -996,16 +996,16 @@ /area/shuttle/escape) "cq" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/plasteel/vault{ dir = 4 }, /area/shuttle/escape) "cr" = ( /obj/structure/table/reinforced, -/obj/item/weapon/folder/red, -/obj/item/weapon/restraints/handcuffs, +/obj/item/folder/red, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash/handheld, /turf/open/floor/plasteel/vault, /area/shuttle/escape) @@ -1031,13 +1031,13 @@ /area/shuttle/escape) "cw" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "cx" = ( /obj/structure/table/reinforced, /obj/machinery/cell_charger, -/obj/item/weapon/stock_parts/cell/high, +/obj/item/stock_parts/cell/high, /turf/open/floor/plasteel/vault{ dir = 4 }, @@ -1059,7 +1059,7 @@ }, /area/shuttle/escape) "cA" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -1092,7 +1092,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "cE" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; diff --git a/_maps/shuttles/emergency_goon.dmm b/_maps/shuttles/emergency_goon.dmm index c405a2df6bc..1b41f6ef9b5 100644 --- a/_maps/shuttles/emergency_goon.dmm +++ b/_maps/shuttles/emergency_goon.dmm @@ -126,7 +126,7 @@ /area/shuttle/escape) "y" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/machinery/light/small{ dir = 1 }, @@ -213,13 +213,13 @@ /area/shuttle/escape) "L" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/machinery/light/small, /turf/open/floor/mineral/titanium/yellow, /area/shuttle/escape) "M" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 diff --git a/_maps/shuttles/emergency_imfedupwiththisworld.dmm b/_maps/shuttles/emergency_imfedupwiththisworld.dmm index 3aaa1e5de3a..4bb10cef927 100644 --- a/_maps/shuttles/emergency_imfedupwiththisworld.dmm +++ b/_maps/shuttles/emergency_imfedupwiththisworld.dmm @@ -42,7 +42,7 @@ /area/shuttle/escape) "i" = ( /obj/structure/table/reinforced, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/carpet, /area/shuttle/escape) "j" = ( @@ -71,12 +71,12 @@ /area/shuttle/escape) "o" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/snacks/store/cake/birthday, +/obj/item/reagent_containers/food/snacks/store/cake/birthday, /turf/open/floor/carpet, /area/shuttle/escape) "p" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /turf/open/floor/plasteel/bar, /area/shuttle/escape) "q" = ( @@ -85,10 +85,10 @@ /area/shuttle/escape) "r" = ( /obj/structure/table/reinforced, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, +/obj/item/reagent_containers/food/drinks/drinkingglass/shotglass, /turf/open/floor/plasteel/bar, /area/shuttle/escape) "s" = ( @@ -116,26 +116,26 @@ /obj/effect/decal/cleanable/blood/drip, /obj/effect/decal/cleanable/blood/gibs, /obj/effect/mob_spawn/human/corpse, -/obj/item/weapon/gun/ballistic/automatic/pistol/m1911, +/obj/item/gun/ballistic/automatic/pistol/m1911, /obj/machinery/light/small{ dir = 8 }, -/obj/item/weapon/reagent_containers/food/snacks/cakeslice/birthday, +/obj/item/reagent_containers/food/snacks/cakeslice/birthday, /turf/open/floor/carpet, /area/shuttle/escape) "x" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/red, -/obj/item/weapon/paper/fluff/shuttles/daniel, +/obj/item/bedsheet/red, +/obj/item/paper/fluff/shuttles/daniel, /turf/open/floor/carpet, /area/shuttle/escape) "y" = ( -/obj/item/weapon/twohanded/required/kirbyplants, +/obj/item/twohanded/required/kirbyplants, /turf/open/floor/wood, /area/shuttle/escape) "z" = ( /obj/structure/table/wood, -/obj/item/weapon/papercutter, +/obj/item/papercutter, /turf/open/floor/wood, /area/shuttle/escape) "A" = ( @@ -146,8 +146,8 @@ "B" = ( /obj/machinery/light, /obj/structure/table/wood, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen, +/obj/item/paper_bin, +/obj/item/pen, /turf/open/floor/wood, /area/shuttle/escape) "C" = ( diff --git a/_maps/shuttles/emergency_luxury.dmm b/_maps/shuttles/emergency_luxury.dmm index 00739b62e85..e6ab6ef49de 100644 --- a/_maps/shuttles/emergency_luxury.dmm +++ b/_maps/shuttles/emergency_luxury.dmm @@ -57,7 +57,7 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "ak" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" }, /turf/open/floor/mineral/gold, @@ -129,77 +129,77 @@ /area/shuttle/escape) "ax" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/meatballspaghetti, +/obj/item/reagent_containers/food/snacks/meatballspaghetti, /turf/open/floor/carpet, /area/shuttle/escape) "ay" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/notasandwich, +/obj/item/reagent_containers/food/snacks/notasandwich, /turf/open/floor/carpet, /area/shuttle/escape) "az" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/pastatomato, +/obj/item/reagent_containers/food/snacks/pastatomato, /turf/open/floor/carpet, /area/shuttle/escape) "aA" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/kebab/tofu, +/obj/item/reagent_containers/food/snacks/kebab/tofu, /turf/open/floor/carpet, /area/shuttle/escape) "aB" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/honkdae, +/obj/item/reagent_containers/food/snacks/honkdae, /turf/open/floor/carpet, /area/shuttle/escape) "aC" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/enchiladas, +/obj/item/reagent_containers/food/snacks/enchiladas, /turf/open/floor/carpet, /area/shuttle/escape) "aD" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/candiedapple, +/obj/item/reagent_containers/food/snacks/candiedapple, /turf/open/floor/carpet, /area/shuttle/escape) "aE" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/burger/baconburger, +/obj/item/reagent_containers/food/snacks/burger/baconburger, /turf/open/floor/carpet, /area/shuttle/escape) "aF" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/benedict, +/obj/item/reagent_containers/food/snacks/benedict, /turf/open/floor/carpet, /area/shuttle/escape) "aG" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/cakeslice/chocolate, +/obj/item/reagent_containers/food/snacks/cakeslice/chocolate, /turf/open/floor/carpet, /area/shuttle/escape) "aH" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/chowmein, +/obj/item/reagent_containers/food/snacks/chowmein, /turf/open/floor/carpet, /area/shuttle/escape) "aI" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/dulcedebatataslice, +/obj/item/reagent_containers/food/snacks/dulcedebatataslice, /turf/open/floor/carpet, /area/shuttle/escape) "aJ" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/salad/validsalad, +/obj/item/reagent_containers/food/snacks/salad/validsalad, /turf/open/floor/carpet, /area/shuttle/escape) "aK" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/carneburrito, +/obj/item/reagent_containers/food/snacks/carneburrito, /turf/open/floor/carpet, /area/shuttle/escape) "aL" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/chawanmushi, +/obj/item/reagent_containers/food/snacks/chawanmushi, /turf/open/floor/carpet, /area/shuttle/escape) "aM" = ( @@ -208,77 +208,77 @@ /area/shuttle/escape) "aN" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/melonfruitbowl, +/obj/item/reagent_containers/food/snacks/melonfruitbowl, /turf/open/floor/carpet, /area/shuttle/escape) "aO" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/khachapuri, +/obj/item/reagent_containers/food/snacks/khachapuri, /turf/open/floor/carpet, /area/shuttle/escape) "aP" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/grilledcheese, +/obj/item/reagent_containers/food/snacks/grilledcheese, /turf/open/floor/carpet, /area/shuttle/escape) "aQ" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/jelliedtoast/cherry, +/obj/item/reagent_containers/food/snacks/jelliedtoast/cherry, /turf/open/floor/carpet, /area/shuttle/escape) "aR" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/honeybun, +/obj/item/reagent_containers/food/snacks/honeybun, /turf/open/floor/carpet, /area/shuttle/escape) "aS" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/eggplantparm, +/obj/item/reagent_containers/food/snacks/eggplantparm, /turf/open/floor/carpet, /area/shuttle/escape) "aT" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/copypasta, +/obj/item/reagent_containers/food/snacks/copypasta, /turf/open/floor/carpet, /area/shuttle/escape) "aU" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/bearsteak, +/obj/item/reagent_containers/food/snacks/bearsteak, /turf/open/floor/carpet, /area/shuttle/escape) "aV" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/boiledspaghetti, +/obj/item/reagent_containers/food/snacks/boiledspaghetti, /turf/open/floor/carpet, /area/shuttle/escape) "aW" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/cherrycupcake, +/obj/item/reagent_containers/food/snacks/cherrycupcake, /turf/open/floor/carpet, /area/shuttle/escape) "aX" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/customizable/pizza, +/obj/item/reagent_containers/food/snacks/customizable/pizza, /turf/open/floor/carpet, /area/shuttle/escape) "aY" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/hotdog, +/obj/item/reagent_containers/food/snacks/hotdog, /turf/open/floor/carpet, /area/shuttle/escape) "aZ" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/pie/grapetart, +/obj/item/reagent_containers/food/snacks/pie/grapetart, /turf/open/floor/carpet, /area/shuttle/escape) "ba" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/burger/superbite, +/obj/item/reagent_containers/food/snacks/burger/superbite, /turf/open/floor/carpet, /area/shuttle/escape) "bb" = ( /obj/structure/table/wood/fancy, -/obj/item/weapon/reagent_containers/food/snacks/cakeslice/slimecake, +/obj/item/reagent_containers/food/snacks/cakeslice/slimecake, /turf/open/floor/carpet, /area/shuttle/escape) "bc" = ( @@ -302,7 +302,7 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "bg" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -330,7 +330,7 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "bl" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-10" }, /obj/machinery/light{ @@ -357,7 +357,7 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "bp" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; @@ -367,7 +367,7 @@ /turf/open/floor/mineral/gold, /area/shuttle/escape) "bq" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-21"; layer = 4.1; pixel_x = -3; diff --git a/_maps/shuttles/emergency_meta.dmm b/_maps/shuttles/emergency_meta.dmm index 3395fb8f123..bb37b86827d 100644 --- a/_maps/shuttles/emergency_meta.dmm +++ b/_maps/shuttles/emergency_meta.dmm @@ -63,11 +63,11 @@ /area/shuttle/escape) "al" = ( /obj/structure/table, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -83,7 +83,7 @@ /area/shuttle/escape) "ao" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ap" = ( @@ -130,19 +130,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -207,7 +207,7 @@ /area/shuttle/escape) "aw" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "ax" = ( @@ -218,7 +218,7 @@ /area/shuttle/escape) "ay" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ pixel_y = 3 }, /obj/machinery/light{ @@ -308,7 +308,7 @@ /area/shuttle/escape) "aO" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_y = 3 }, /turf/open/floor/mineral/titanium/blue, @@ -325,7 +325,7 @@ /area/shuttle/escape) "aQ" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -2; pixel_y = 8 }, @@ -338,7 +338,7 @@ /area/shuttle/escape) "aR" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/structure/extinguisher_cabinet{ dir = 4; pixel_y = -27 @@ -455,7 +455,7 @@ /area/shuttle/escape) "bj" = ( /obj/structure/table, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bk" = ( @@ -470,10 +470,10 @@ /area/shuttle/escape) "bm" = ( /obj/structure/rack, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, -/obj/item/weapon/weldingtool, -/obj/item/weapon/wirecutters, +/obj/item/crowbar, +/obj/item/wrench, +/obj/item/weldingtool, +/obj/item/wirecutters, /obj/item/stack/cable_coil, /obj/effect/turf_decal/stripes/line{ dir = 4 @@ -520,33 +520,33 @@ /area/shuttle/escape) "bu" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -554,14 +554,14 @@ /area/shuttle/escape) "bv" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = -3; pixel_y = 1 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_y = -1 }, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -5 }, @@ -571,7 +571,7 @@ /turf/open/floor/plasteel, /area/shuttle/escape) "bw" = ( -/obj/item/weapon/cigbutt, +/obj/item/cigbutt, /turf/open/floor/plasteel/floorgrime, /area/shuttle/escape) "bx" = ( @@ -583,7 +583,7 @@ /area/shuttle/escape) "bz" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/machinery/light{ dir = 8 }, @@ -607,10 +607,10 @@ /area/shuttle/escape) "bD" = ( /obj/structure/table, -/obj/item/weapon/folder/red{ +/obj/item/folder/red{ pixel_x = 3 }, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = -4; pixel_y = 2 }, @@ -619,7 +619,7 @@ name = "Station Intercom (General)"; pixel_y = -31 }, -/obj/item/weapon/book/manual/wiki/security_space_law{ +/obj/item/book/manual/wiki/security_space_law{ pixel_x = -4; pixel_y = 4 }, @@ -627,7 +627,7 @@ /area/shuttle/escape) "bE" = ( /obj/structure/table, -/obj/item/weapon/restraints/handcuffs{ +/obj/item/restraints/handcuffs{ pixel_y = 3 }, /turf/open/floor/mineral/plastitanium/brig, @@ -643,7 +643,7 @@ /area/shuttle/escape) "bG" = ( /obj/structure/table, -/obj/item/weapon/storage/box/handcuffs{ +/obj/item/storage/box/handcuffs{ pixel_x = 2; pixel_y = 2 }, @@ -651,14 +651,14 @@ /area/shuttle/escape) "bH" = ( /obj/structure/table, -/obj/item/weapon/scalpel{ +/obj/item/scalpel{ pixel_y = 12 }, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor{ +/obj/item/circular_saw, +/obj/item/retractor{ pixel_x = 4 }, -/obj/item/weapon/hemostat{ +/obj/item/hemostat{ pixel_x = -4 }, /obj/item/clothing/gloves/color/latex, @@ -676,8 +676,8 @@ /area/shuttle/escape) "bJ" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -685,8 +685,8 @@ /area/shuttle/escape) "bK" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -700,7 +700,7 @@ /obj/structure/rack{ dir = 1 }, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/suit/fire/firefighter, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, @@ -722,8 +722,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -732,8 +732,8 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/item/device/radio, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -742,12 +742,12 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/firstaid/toxin{ +/obj/item/storage/firstaid/toxin{ pixel_x = -4; pixel_y = 3 }, @@ -755,7 +755,7 @@ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/lazarus_injector, +/obj/item/lazarus_injector, /obj/effect/turf_decal/bot, /mob/living/simple_animal/bot/medbot{ name = "\improper emergency medibot"; @@ -776,9 +776,9 @@ /area/shuttle/escape) "bR" = ( /obj/structure/table, -/obj/item/weapon/clipboard, -/obj/item/weapon/folder/yellow, -/obj/item/weapon/pen, +/obj/item/clipboard, +/obj/item/folder/yellow, +/obj/item/pen, /obj/item/hand_labeler_refill, /obj/effect/turf_decal/bot, /turf/open/floor/plasteel, @@ -825,19 +825,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ diff --git a/_maps/shuttles/emergency_meteor.dmm b/_maps/shuttles/emergency_meteor.dmm index 1f27a939164..dcfd38acf8c 100644 --- a/_maps/shuttles/emergency_meteor.dmm +++ b/_maps/shuttles/emergency_meteor.dmm @@ -42,7 +42,7 @@ luminosity = 0 }) "h" = ( -/obj/item/weapon/pickaxe, +/obj/item/pickaxe, /turf/open/floor/plating/asteroid, /area/shuttle/escape{ luminosity = 0 diff --git a/_maps/shuttles/emergency_mini.dmm b/_maps/shuttles/emergency_mini.dmm index b5caf8aad05..14b9fa99be5 100644 --- a/_maps/shuttles/emergency_mini.dmm +++ b/_maps/shuttles/emergency_mini.dmm @@ -19,11 +19,11 @@ /turf/open/floor/plating/airless, /area/shuttle/escape) "e" = ( -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 6 }, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = -2; pixel_y = 4 }, @@ -182,13 +182,13 @@ /area/shuttle/escape) "D" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/extinguisher, +/obj/item/crowbar, +/obj/item/extinguisher, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "E" = ( @@ -201,13 +201,13 @@ dir = 2 }, /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/extinguisher, +/obj/item/crowbar, +/obj/item/extinguisher, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "G" = ( @@ -263,8 +263,8 @@ /area/shuttle/escape) "Q" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/extinguisher, +/obj/item/storage/firstaid/fire, +/obj/item/extinguisher, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "R" = ( @@ -277,11 +277,11 @@ /area/shuttle/escape) "T" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) diff --git a/_maps/shuttles/emergency_narnar.dmm b/_maps/shuttles/emergency_narnar.dmm index f7fc4e16b9c..1a94ca7dd18 100644 --- a/_maps/shuttles/emergency_narnar.dmm +++ b/_maps/shuttles/emergency_narnar.dmm @@ -11,7 +11,7 @@ /area/shuttle/escape) "d" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "e" = ( @@ -26,11 +26,11 @@ /area/shuttle/escape) "g" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "h" = ( @@ -99,12 +99,12 @@ /area/shuttle/escape) "u" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "v" = ( @@ -164,7 +164,7 @@ /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, -/obj/item/weapon/extinguisher{ +/obj/item/extinguisher{ safety = 0 }, /turf/open/floor/plasteel/cult, @@ -218,12 +218,12 @@ /turf/open/floor/plasteel/cult, /area/shuttle/escape) "Q" = ( -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/extinguisher_cabinet{ pixel_x = 27 }, @@ -236,12 +236,12 @@ /area/shuttle/escape) "S" = ( /obj/structure/table/wood, -/obj/item/weapon/tome, +/obj/item/tome, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "T" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/cult, +/obj/item/bedsheet/cult, /turf/open/floor/plasteel/cult, /area/shuttle/escape) "U" = ( diff --git a/_maps/shuttles/emergency_pubby.dmm b/_maps/shuttles/emergency_pubby.dmm index d92b77a2946..597acce8849 100644 --- a/_maps/shuttles/emergency_pubby.dmm +++ b/_maps/shuttles/emergency_pubby.dmm @@ -12,7 +12,7 @@ /area/shuttle/escape) "ad" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, @@ -169,7 +169,7 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aF" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/mineral/titanium/blue, @@ -293,12 +293,12 @@ /area/shuttle/escape) "aZ" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /obj/structure/sign/nosmoking_2{ pixel_x = 32 }, @@ -314,7 +314,7 @@ /area/shuttle/escape) "bb" = ( /obj/structure/table, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "bc" = ( diff --git a/_maps/shuttles/emergency_raven.dmm b/_maps/shuttles/emergency_raven.dmm index 856a1185219..eb705f7e38a 100644 --- a/_maps/shuttles/emergency_raven.dmm +++ b/_maps/shuttles/emergency_raven.dmm @@ -32,7 +32,7 @@ /area/shuttle/escape) "af" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "ag" = ( @@ -53,13 +53,13 @@ /area/shuttle/escape) "ak" = ( /obj/structure/table/reinforced, -/obj/item/weapon/restraints/handcuffs, +/obj/item/restraints/handcuffs, /obj/item/device/assembly/flash, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "al" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/vault, /area/shuttle/escape) "am" = ( @@ -93,7 +93,7 @@ /area/shuttle/escape) "as" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, +/obj/item/surgical_drapes, /obj/item/clothing/gloves/color/latex, /obj/item/clothing/mask/surgical, /turf/open/floor/plasteel/darkpurple/side{ @@ -144,10 +144,10 @@ /area/shuttle/escape) "aB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/scalpel, -/obj/item/weapon/circular_saw, -/obj/item/weapon/retractor, -/obj/item/weapon/hemostat, +/obj/item/scalpel, +/obj/item/circular_saw, +/obj/item/retractor, +/obj/item/hemostat, /turf/open/floor/plasteel/darkpurple/side{ dir = 8 }, @@ -163,7 +163,7 @@ /area/shuttle/escape) "aE" = ( /obj/structure/table/reinforced, -/obj/item/weapon/defibrillator/loaded, +/obj/item/defibrillator/loaded, /obj/machinery/light{ dir = 4 }, @@ -278,8 +278,8 @@ /area/shuttle/escape) "aT" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/toxin, +/obj/item/storage/firstaid/o2{ pixel_x = 4; pixel_y = 4 }, @@ -287,8 +287,8 @@ /area/shuttle/escape) "aU" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/brute{ pixel_x = 3; pixel_y = 4 }, @@ -354,19 +354,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -448,7 +448,7 @@ /area/shuttle/escape) "bg" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/open/floor/plasteel/darkpurple/side{ dir = 8 }, @@ -481,33 +481,33 @@ }, /area/shuttle/escape) "bl" = ( -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = -3; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = 6; pixel_y = 8 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 3; pixel_y = -2 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 4; pixel_y = 1 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = -2; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/syringe/epinephrine{ +/obj/item/reagent_containers/syringe/epinephrine{ pixel_x = 2; pixel_y = 8 }, @@ -604,8 +604,8 @@ /area/shuttle/escape) "bB" = ( /obj/structure/table/reinforced, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen/blue, +/obj/item/paper_bin, +/obj/item/pen/blue, /turf/open/floor/plasteel/darkpurple/side, /area/shuttle/escape) "bC" = ( @@ -643,12 +643,12 @@ /area/shuttle/escape) "bH" = ( /obj/structure/rack, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = 3; pixel_y = -6 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/electrical{ pixel_x = -2; pixel_y = 5 }, @@ -660,7 +660,7 @@ "bI" = ( /obj/structure/rack, /obj/item/clothing/suit/fire/firefighter, -/obj/item/weapon/tank/internals/oxygen/red, +/obj/item/tank/internals/oxygen/red, /obj/item/clothing/mask/gas, /obj/item/clothing/head/hardhat/red, /turf/open/floor/plasteel/darkgreen/side{ @@ -687,7 +687,7 @@ /area/shuttle/escape) "bM" = ( /obj/structure/table/reinforced, -/obj/item/weapon/dice/d20, +/obj/item/dice/d20, /turf/open/floor/plasteel/darkgreen/side{ dir = 10 }, @@ -728,19 +728,19 @@ desc = "A high-visibility lifejacket complete with whistle and slot for oxygen tanks."; name = "emergency lifejacket" }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, -/obj/item/weapon/tank/internals/emergency_oxygen/double{ +/obj/item/tank/internals/emergency_oxygen/double{ pixel_x = 3 }, /obj/item/clothing/mask/breath{ @@ -814,7 +814,7 @@ }, /area/shuttle/escape) "bV" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkgreen/side{ @@ -823,7 +823,7 @@ }, /area/shuttle/escape) "bW" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkgreen/side{ @@ -876,7 +876,7 @@ /turf/open/floor/plasteel/darkgreen/side, /area/shuttle/escape) "cd" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkgreen/side{ @@ -884,7 +884,7 @@ }, /area/shuttle/escape) "ce" = ( -/obj/item/weapon/twohanded/required/kirbyplants{ +/obj/item/twohanded/required/kirbyplants{ icon_state = "plant-22" }, /turf/open/floor/plasteel/darkgreen/side{ diff --git a/_maps/shuttles/emergency_russiafightpit.dmm b/_maps/shuttles/emergency_russiafightpit.dmm index 6d02bd568b6..2391cdeace2 100644 --- a/_maps/shuttles/emergency_russiafightpit.dmm +++ b/_maps/shuttles/emergency_russiafightpit.dmm @@ -15,7 +15,7 @@ /area/shuttle/escape) "ae" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "af" = ( @@ -30,11 +30,11 @@ /area/shuttle/escape) "ah" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "ai" = ( @@ -56,8 +56,8 @@ /area/shuttle/escape) "am" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka/badminka{ +/obj/item/storage/fancy/cigarettes/cigars/cohiba, +/obj/item/reagent_containers/food/drinks/bottle/vodka/badminka{ pixel_x = 5; pixel_y = 18 }, @@ -150,7 +150,7 @@ /turf/open/floor/engine, /area/shuttle/escape) "az" = ( -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/engine, /area/shuttle/escape) "aA" = ( @@ -161,7 +161,7 @@ /turf/open/floor/engine, /area/shuttle/escape) "aC" = ( -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/knife, /turf/open/floor/engine, /area/shuttle/escape) "aD" = ( @@ -213,7 +213,7 @@ /area/shuttle/escape) "aL" = ( /obj/effect/decal/cleanable/blood/old, -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /turf/open/floor/engine, /area/shuttle/escape) "aM" = ( @@ -268,7 +268,7 @@ /turf/open/floor/engine, /area/shuttle/escape) "aV" = ( -/obj/item/weapon/kitchen/fork, +/obj/item/kitchen/fork, /mob/living/simple_animal/hostile/bear/fightpit, /turf/open/floor/engine, /area/shuttle/escape) @@ -333,7 +333,7 @@ /area/shuttle/escape) "be" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bf" = ( @@ -383,7 +383,7 @@ /area/shuttle/escape) "bm" = ( /obj/structure/table, -/obj/item/weapon/hatchet, +/obj/item/hatchet, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bn" = ( @@ -397,21 +397,21 @@ /area/shuttle/escape) "bo" = ( /obj/structure/table, -/obj/item/weapon/melee/baseball_bat{ +/obj/item/melee/baseball_bat{ pixel_x = -5 }, -/obj/item/weapon/crowbar/large{ +/obj/item/crowbar/large{ pixel_x = 6 }, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bp" = ( /obj/structure/table, -/obj/item/weapon/shovel, +/obj/item/shovel, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bq" = ( -/obj/item/weapon/broken_bottle, +/obj/item/broken_bottle, /obj/effect/decal/cleanable/blood/old, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) @@ -432,7 +432,7 @@ pixel_x = 27 }, /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/bottle/vodka, +/obj/item/reagent_containers/food/drinks/bottle/vodka, /turf/open/floor/mineral/plastitanium, /area/shuttle/escape) "bu" = ( @@ -496,12 +496,12 @@ /area/shuttle/escape) "bF" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/brute, -/obj/item/weapon/storage/firstaid{ +/obj/item/storage/firstaid/brute, +/obj/item/storage/firstaid{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/plasteel/floorgrime, /area/shuttle/escape) "bG" = ( @@ -510,12 +510,12 @@ /area/shuttle/escape) "bH" = ( /obj/structure/closet, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, -/obj/item/weapon/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, +/obj/item/reagent_containers/food/drinks/beer, /turf/open/floor/plating, /area/shuttle/escape) "bI" = ( diff --git a/_maps/shuttles/emergency_scrapheap.dmm b/_maps/shuttles/emergency_scrapheap.dmm index 1830bdc95f3..968cfdadd0a 100644 --- a/_maps/shuttles/emergency_scrapheap.dmm +++ b/_maps/shuttles/emergency_scrapheap.dmm @@ -170,8 +170,8 @@ pixel_y = -30 }, /obj/structure/table, -/obj/item/weapon/extinguisher, -/obj/item/weapon/crowbar, +/obj/item/extinguisher, +/obj/item/crowbar, /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aE" = ( @@ -181,7 +181,7 @@ /turf/open/floor/mineral/plastitanium/brig, /area/shuttle/escape) "aF" = ( -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aG" = ( @@ -190,7 +190,7 @@ /area/shuttle/escape) "aH" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aI" = ( @@ -260,7 +260,7 @@ /area/shuttle/escape) "aS" = ( /obj/structure/table/wood, -/obj/item/weapon/storage/firstaid/fire, +/obj/item/storage/firstaid/fire, /turf/open/floor/mineral/titanium/blue, /area/shuttle/escape) "aT" = ( diff --git a/_maps/shuttles/emergency_supermatter.dmm b/_maps/shuttles/emergency_supermatter.dmm index 2075969a4c2..25a7fffac51 100644 --- a/_maps/shuttles/emergency_supermatter.dmm +++ b/_maps/shuttles/emergency_supermatter.dmm @@ -155,9 +155,9 @@ /area/shuttle/escape) "aD" = ( /obj/structure/table/reinforced, -/obj/item/weapon/storage/firstaid/toxin, -/obj/item/weapon/crowbar/red, -/obj/item/weapon/storage/box/snappops{ +/obj/item/storage/firstaid/toxin, +/obj/item/crowbar/red, +/obj/item/storage/box/snappops{ pixel_x = 4; pixel_y = -4 }, diff --git a/_maps/shuttles/emergency_wabbajack.dmm b/_maps/shuttles/emergency_wabbajack.dmm index 96ceb67871f..25beffd5aeb 100644 --- a/_maps/shuttles/emergency_wabbajack.dmm +++ b/_maps/shuttles/emergency_wabbajack.dmm @@ -69,12 +69,12 @@ /area/shuttle/escape) "ar" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/fire, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/fire, +/obj/item/storage/firstaid/regular{ pixel_x = 2; pixel_y = 3 }, -/obj/item/weapon/crowbar, +/obj/item/crowbar, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "as" = ( @@ -121,8 +121,8 @@ /area/shuttle/escape) "ay" = ( /obj/structure/table, -/obj/item/weapon/paper_bin, -/obj/item/weapon/pen{ +/obj/item/paper_bin, +/obj/item/pen{ pixel_x = -2; pixel_y = 4 }, @@ -134,7 +134,7 @@ /area/shuttle/escape) "aA" = ( /obj/structure/table, -/obj/item/weapon/coin/mythril, +/obj/item/coin/mythril, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aB" = ( @@ -170,11 +170,11 @@ pixel_x = 27 }, /obj/structure/table/glass, -/obj/item/weapon/storage/box/syringes{ +/obj/item/storage/box/syringes{ pixel_x = 3; pixel_y = 3 }, -/obj/item/weapon/storage/box/beakers, +/obj/item/storage/box/beakers, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aH" = ( @@ -215,12 +215,12 @@ /area/shuttle/escape) "aN" = ( /obj/structure/table, -/obj/item/weapon/storage/toolbox/mechanical, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/toolbox/mechanical, +/obj/item/storage/firstaid/regular{ pixel_x = -1; pixel_y = 1 }, -/obj/item/weapon/wrench/medical, +/obj/item/wrench/medical, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aO" = ( @@ -246,11 +246,11 @@ /area/shuttle/escape) "aT" = ( /obj/structure/table/glass, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 2; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal, +/obj/item/reagent_containers/glass/bottle/charcoal, /turf/open/floor/mineral/titanium, /area/shuttle/escape) "aU" = ( diff --git a/_maps/shuttles/ferry_lighthouse.dmm b/_maps/shuttles/ferry_lighthouse.dmm index 12a8fb0a045..c18f39df0c3 100644 --- a/_maps/shuttles/ferry_lighthouse.dmm +++ b/_maps/shuttles/ferry_lighthouse.dmm @@ -158,7 +158,7 @@ /area/shuttle/transport) "aI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/wiz, +/obj/item/bedsheet/wiz, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "aJ" = ( @@ -219,12 +219,12 @@ /area/shuttle/transport) "aT" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/centcom, +/obj/item/bedsheet/centcom, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "aU" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/rainbow, +/obj/item/bedsheet/rainbow, /turf/open/floor/mineral/titanium/blue, /area/shuttle/transport) "aV" = ( @@ -269,11 +269,11 @@ /obj/structure/window/reinforced{ dir = 4 }, -/obj/item/weapon/vending_refill/snack, +/obj/item/vending_refill/snack, /turf/open/floor/wood, /area/shuttle/transport) "bd" = ( -/obj/item/weapon/twohanded/required/kirbyplants/dead{ +/obj/item/twohanded/required/kirbyplants/dead{ desc = "It doesn't look very healthy..."; name = "potted plant" }, diff --git a/_maps/shuttles/ferry_meat.dmm b/_maps/shuttles/ferry_meat.dmm index bf71346f921..e1582807fb7 100644 --- a/_maps/shuttles/ferry_meat.dmm +++ b/_maps/shuttles/ferry_meat.dmm @@ -32,35 +32,35 @@ /obj/structure/closet/secure_closet/freezer/meat{ name = "\"meat\" fridge" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/bear, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/goliath, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/killertomato, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/pug, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/spider, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human{ +/obj/item/reagent_containers/food/snacks/meat/slab/bear, +/obj/item/reagent_containers/food/snacks/meat/slab/corgi, +/obj/item/reagent_containers/food/snacks/meat/slab/goliath, +/obj/item/reagent_containers/food/snacks/meat/slab/killertomato, +/obj/item/reagent_containers/food/snacks/meat/slab/pug, +/obj/item/reagent_containers/food/snacks/meat/slab/spider, +/obj/item/reagent_containers/food/snacks/meat/slab/xeno, +/obj/item/reagent_containers/food/snacks/meat/slab/human{ name = "human meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/fly{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/fly{ name = "flyman meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/golem/adamantine{ name = "golem meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/lizard{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/lizard{ name = "lizard meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/plant{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/plant{ name = "podperson meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/shadow{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/shadow{ name = "shadowling meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/slime{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/slime{ name = "slimeperson meat" }, -/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant/zombie{ +/obj/item/reagent_containers/food/snacks/meat/slab/human/mutant/zombie{ name = "rotten meat" }, /turf/open/floor/plasteel/freezer, diff --git a/_maps/shuttles/whiteship_box.dmm b/_maps/shuttles/whiteship_box.dmm index e5e272c1b9b..1008d27ed1f 100644 --- a/_maps/shuttles/whiteship_box.dmm +++ b/_maps/shuttles/whiteship_box.dmm @@ -67,7 +67,7 @@ /area/shuttle/abandoned) "al" = ( /obj/structure/table, -/obj/item/weapon/screwdriver, +/obj/item/screwdriver, /obj/structure/light_construct{ dir = 1 }, @@ -174,7 +174,7 @@ /turf/open/floor/plating, /area/shuttle/abandoned) "aE" = ( -/obj/item/weapon/stock_parts/cell{ +/obj/item/stock_parts/cell{ charge = 100; maxcharge = 15000 }, @@ -187,11 +187,11 @@ /area/shuttle/abandoned) "aG" = ( /obj/structure/rack, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/tank/internals/emergency_oxygen, -/obj/item/weapon/storage/toolbox/mechanical, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/tank/internals/emergency_oxygen, +/obj/item/storage/toolbox/mechanical, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aH" = ( @@ -213,7 +213,7 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aK" = ( -/obj/item/weapon/shard{ +/obj/item/shard{ icon_state = "medium" }, /turf/open/floor/mineral/titanium, @@ -234,7 +234,7 @@ /area/shuttle/abandoned) "aO" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced, /obj/structure/window/reinforced{ dir = 4 @@ -247,7 +247,7 @@ /area/shuttle/abandoned) "aQ" = ( /obj/structure/table, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aR" = ( @@ -271,7 +271,7 @@ /area/shuttle/abandoned) "aV" = ( /obj/structure/table, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aW" = ( @@ -284,7 +284,7 @@ /area/shuttle/abandoned) "aY" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet, +/obj/item/bedsheet, /obj/structure/window/reinforced{ dir = 1 }, @@ -321,12 +321,12 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bf" = ( -/obj/item/weapon/scalpel, +/obj/item/scalpel, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bg" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular{ +/obj/item/storage/firstaid/regular{ pixel_x = 6; pixel_y = -5 }, diff --git a/_maps/shuttles/whiteship_cere.dmm b/_maps/shuttles/whiteship_cere.dmm index 1832f02588f..5e256915aa0 100644 --- a/_maps/shuttles/whiteship_cere.dmm +++ b/_maps/shuttles/whiteship_cere.dmm @@ -239,9 +239,9 @@ name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/pickaxe, -/obj/item/weapon/pickaxe, -/obj/item/weapon/storage/toolbox/emergency/old, +/obj/item/pickaxe, +/obj/item/pickaxe, +/obj/item/storage/toolbox/emergency/old, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -289,8 +289,8 @@ name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/storage/bag/ore, -/obj/item/weapon/pickaxe, +/obj/item/storage/bag/ore, +/obj/item/pickaxe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -382,7 +382,7 @@ /obj/structure/closet/crate{ name = "spare equipment crate" }, -/obj/item/weapon/storage/toolbox/mechanical/old, +/obj/item/storage/toolbox/mechanical/old, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -530,7 +530,7 @@ "aT" = ( /obj/structure/table, /obj/effect/decal/cleanable/cobweb/cobweb2, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -585,7 +585,7 @@ /area/space) "aZ" = ( /obj/structure/table, -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, @@ -605,7 +605,7 @@ /area/shuttle/abandoned) "bb" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, diff --git a/_maps/shuttles/whiteship_meta.dmm b/_maps/shuttles/whiteship_meta.dmm index 40ca9e23cfe..4e0324f278e 100644 --- a/_maps/shuttles/whiteship_meta.dmm +++ b/_maps/shuttles/whiteship_meta.dmm @@ -146,7 +146,7 @@ /area/shuttle/abandoned) "ar" = ( /obj/structure/table, -/obj/item/weapon/storage/pill_bottle/dice{ +/obj/item/storage/pill_bottle/dice{ pixel_y = 3 }, /obj/effect/decal/cleanable/dirt{ @@ -160,7 +160,7 @@ /obj/item/stack/sheet/metal{ amount = 50 }, -/obj/item/weapon/stock_parts/cell/high{ +/obj/item/stock_parts/cell/high{ charge = 100; maxcharge = 15000; pixel_y = 2 @@ -228,7 +228,7 @@ /obj/structure/closet/crate/medical{ name = "medical crate" }, -/obj/item/weapon/storage/firstaid/o2{ +/obj/item/storage/firstaid/o2{ pixel_x = 3; pixel_y = 3 }, @@ -247,8 +247,8 @@ /obj/structure/closet/crate{ name = "spare equipment crate" }, -/obj/item/weapon/grenade/chem_grenade/metalfoam, -/obj/item/weapon/relic, +/obj/item/grenade/chem_grenade/metalfoam, +/obj/item/relic, /obj/item/device/t_scanner, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 3; @@ -262,15 +262,15 @@ /turf/open/floor/plasteel, /area/shuttle/abandoned) "aA" = ( -/obj/item/weapon/storage/box/lights/mixed, -/obj/item/weapon/cigbutt, +/obj/item/storage/box/lights/mixed, +/obj/item/cigbutt, /obj/structure/closet/crate{ icon_state = "crateopen"; name = "spare equipment crate"; opened = 1 }, -/obj/item/weapon/tank/internals/oxygen/red, -/obj/item/weapon/tank/internals/air, +/obj/item/tank/internals/oxygen/red, +/obj/item/tank/internals/air, /obj/effect/spawner/lootdrop/maintenance{ lootcount = 2; name = "2maintenance loot spawner" @@ -288,8 +288,8 @@ /obj/structure/closet/crate{ name = "emergency supplies crate" }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency, /obj/item/device/flashlight/flare{ pixel_x = 3; pixel_y = 3 @@ -298,11 +298,11 @@ pixel_x = -6; pixel_y = -2 }, -/obj/item/weapon/crowbar, -/obj/item/weapon/wrench, +/obj/item/crowbar, +/obj/item/wrench, /obj/effect/spawner/lootdrop/maintenance, -/obj/item/weapon/extinguisher, -/obj/item/weapon/extinguisher, +/obj/item/extinguisher, +/obj/item/extinguisher, /obj/effect/decal/cleanable/cobweb/cobweb2, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -364,12 +364,12 @@ icon_state = "remains"; name = "remains" }, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "aI" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/centcom, +/obj/item/bedsheet/centcom, /obj/effect/decal/cleanable/blood/old, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; @@ -388,8 +388,8 @@ /area/shuttle/abandoned) "aJ" = ( /obj/structure/table, -/obj/item/weapon/storage/belt/utility, -/obj/item/weapon/storage/belt/utility, +/obj/item/storage/belt/utility, +/obj/item/storage/belt/utility, /obj/item/device/radio/off, /obj/item/device/radio/off, /obj/item/device/radio/off, @@ -505,7 +505,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/soap/nanotrasen, +/obj/item/soap/nanotrasen, /obj/effect/decal/cleanable/ash{ desc = "They look like human remains, and have clearly been gnawed at."; icon = 'icons/effects/blood.dmi'; @@ -544,7 +544,7 @@ /area/shuttle/abandoned) "aV" = ( /obj/structure/bed, -/obj/item/weapon/bedsheet/centcom, +/obj/item/bedsheet/centcom, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -565,7 +565,7 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/wrench, +/obj/item/wrench, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "aX" = ( @@ -574,11 +574,11 @@ layer = 2.9; pixel_y = 2 }, -/obj/item/weapon/storage/toolbox/electrical{ +/obj/item/storage/toolbox/electrical{ pixel_x = 1; pixel_y = 6 }, -/obj/item/weapon/storage/toolbox/mechanical{ +/obj/item/storage/toolbox/mechanical{ pixel_x = -2; pixel_y = -1 }, @@ -786,12 +786,12 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/storage/photo_album, +/obj/item/storage/photo_album, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bu" = ( /obj/structure/table, -/obj/item/weapon/paper_bin{ +/obj/item/paper_bin{ pixel_x = -1; pixel_y = 6 }, @@ -883,7 +883,7 @@ /area/shuttle/abandoned) "bD" = ( /obj/structure/table, -/obj/item/weapon/folder/blue, +/obj/item/folder/blue, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -917,7 +917,7 @@ /area/shuttle/abandoned) "bG" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/drinks/shaker, +/obj/item/reagent_containers/food/drinks/shaker, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -926,11 +926,11 @@ /area/shuttle/abandoned) "bH" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/peppermill{ +/obj/item/reagent_containers/food/condiment/peppermill{ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/food/condiment/saltshaker{ +/obj/item/reagent_containers/food/condiment/saltshaker{ pixel_x = -3; pixel_y = 4 }, @@ -942,7 +942,7 @@ /area/shuttle/abandoned) "bI" = ( /obj/structure/table, -/obj/item/weapon/storage/fancy/donut_box, +/obj/item/storage/fancy/donut_box, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -982,7 +982,7 @@ pixel_x = 3; pixel_y = 4 }, -/obj/item/weapon/reagent_containers/spray/cleaner, +/obj/item/reagent_containers/spray/cleaner, /obj/structure/table, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) @@ -1041,12 +1041,12 @@ /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "bQ" = ( -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/storage/toolbox/emergency, -/obj/item/weapon/storage/toolbox/emergency{ +/obj/item/storage/toolbox/emergency, +/obj/item/storage/toolbox/emergency{ pixel_x = 3; pixel_y = -3 }, @@ -1165,11 +1165,11 @@ /turf/open/floor/mineral/titanium/blue, /area/shuttle/abandoned) "cb" = ( -/obj/item/weapon/phone{ +/obj/item/phone{ pixel_x = -3; pixel_y = 3 }, -/obj/item/weapon/cigbutt/cigarbutt{ +/obj/item/cigbutt/cigarbutt{ pixel_x = 5; pixel_y = -1 }, @@ -1294,16 +1294,16 @@ }, /area/shuttle/abandoned) "cq" = ( -/obj/item/weapon/storage/bag/plants/portaseeder, +/obj/item/storage/bag/plants/portaseeder, /obj/structure/table, -/obj/item/weapon/reagent_containers/spray/plantbgone{ +/obj/item/reagent_containers/spray/plantbgone{ pixel_x = 13; pixel_y = 5 }, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez, -/obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh{ +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/ez, +/obj/item/reagent_containers/glass/bottle/nutrient/rh{ pixel_x = -2; pixel_y = 3 }, @@ -1358,7 +1358,7 @@ pixel_x = -3; pixel_y = 6 }, -/obj/item/weapon/storage/box/donkpockets, +/obj/item/storage/box/donkpockets, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1376,7 +1376,7 @@ /area/shuttle/abandoned) "cx" = ( /obj/structure/fluff/empty_sleeper/nanotrasen, -/obj/item/weapon/circuitboard/machine/autolathe, +/obj/item/circuitboard/machine/autolathe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1396,12 +1396,12 @@ /area/shuttle/abandoned) "cz" = ( /obj/structure/closet/crate/freezer, -/obj/item/weapon/reagent_containers/blood/empty{ +/obj/item/reagent_containers/blood/empty{ pixel_x = -3; pixel_y = -3 }, -/obj/item/weapon/reagent_containers/blood/OMinus, -/obj/item/weapon/reagent_containers/blood/random, +/obj/item/reagent_containers/blood/OMinus, +/obj/item/reagent_containers/blood/random, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1411,8 +1411,8 @@ /area/shuttle/abandoned) "cA" = ( /obj/structure/table/optable, -/obj/item/weapon/surgical_drapes, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/surgical_drapes, +/obj/item/storage/firstaid/regular, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1424,18 +1424,18 @@ /area/shuttle/abandoned) "cB" = ( /obj/structure/table, -/obj/item/weapon/wrench, -/obj/item/weapon/crowbar, +/obj/item/wrench, +/obj/item/crowbar, /obj/item/clothing/suit/apron, -/obj/item/weapon/shovel/spade, -/obj/item/weapon/cultivator, +/obj/item/shovel/spade, +/obj/item/cultivator, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/wirecutters, +/obj/item/wirecutters, /obj/item/device/plant_analyzer, -/obj/item/weapon/reagent_containers/glass/bucket, +/obj/item/reagent_containers/glass/bucket, /obj/structure/light_construct/small{ dir = 8 }, @@ -1481,8 +1481,8 @@ /area/shuttle/abandoned) "cG" = ( /obj/structure/table, -/obj/item/weapon/kitchen/rollingpin, -/obj/item/weapon/kitchen/knife, +/obj/item/kitchen/rollingpin, +/obj/item/kitchen/knife, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1494,7 +1494,7 @@ /area/shuttle/abandoned) "cH" = ( /obj/structure/fluff/empty_sleeper/nanotrasen, -/obj/item/weapon/circuitboard/machine/chem_dispenser, +/obj/item/circuitboard/machine/chem_dispenser, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1616,23 +1616,23 @@ desc = "A thin layer of dust coating the floor."; name = "dust" }, -/obj/item/weapon/storage/box/monkeycubes{ +/obj/item/storage/box/monkeycubes{ pixel_y = 4 }, -/obj/item/weapon/storage/fancy/egg_box{ +/obj/item/storage/fancy/egg_box{ pixel_y = 5 }, /turf/open/floor/mineral/titanium, /area/shuttle/abandoned) "cT" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5 }, -/obj/item/weapon/reagent_containers/food/condiment/enzyme{ +/obj/item/reagent_containers/food/condiment/enzyme{ layer = 5 }, -/obj/item/weapon/reagent_containers/dropper, +/obj/item/reagent_containers/dropper, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1641,18 +1641,18 @@ /area/shuttle/abandoned) "cU" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/flour, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/milk, -/obj/item/weapon/reagent_containers/food/condiment/soymilk, -/obj/item/weapon/reagent_containers/food/condiment/soymilk, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, -/obj/item/weapon/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/flour, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/milk, +/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/food/condiment/soymilk, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, +/obj/item/reagent_containers/food/condiment/sugar, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1661,13 +1661,13 @@ /area/shuttle/abandoned) "cV" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/beaker{ +/obj/item/reagent_containers/glass/beaker{ pixel_x = 5; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/glass/beaker, -/obj/item/weapon/reagent_containers/dropper, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/glass/beaker, +/obj/item/reagent_containers/dropper, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1676,7 +1676,7 @@ /area/shuttle/abandoned) "cW" = ( /obj/structure/table, -/obj/item/weapon/folder/white{ +/obj/item/folder/white{ pixel_x = 4; pixel_y = -3 }, @@ -1688,7 +1688,7 @@ /area/shuttle/abandoned) "cX" = ( /obj/structure/table, -/obj/item/weapon/hand_labeler, +/obj/item/hand_labeler, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1697,7 +1697,7 @@ /area/shuttle/abandoned) "cY" = ( /obj/structure/table, -/obj/item/weapon/defibrillator, +/obj/item/defibrillator, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1706,13 +1706,13 @@ /area/shuttle/abandoned) "cZ" = ( /obj/structure/table, -/obj/item/weapon/reagent_containers/glass/bottle/epinephrine{ +/obj/item/reagent_containers/glass/bottle/epinephrine{ pixel_x = 6 }, -/obj/item/weapon/reagent_containers/glass/bottle/charcoal{ +/obj/item/reagent_containers/glass/bottle/charcoal{ pixel_x = -3 }, -/obj/item/weapon/reagent_containers/syringe, +/obj/item/reagent_containers/syringe, /obj/effect/decal/cleanable/dirt{ desc = "A thin layer of dust coating the floor."; name = "dust" @@ -1732,7 +1732,7 @@ /area/shuttle/abandoned) "db" = ( /obj/structure/table, -/obj/item/weapon/storage/backpack/duffelbag/med/surgery{ +/obj/item/storage/backpack/duffelbag/med/surgery{ pixel_y = 4 }, /turf/open/floor/mineral/titanium, diff --git a/_maps/shuttles/whiteship_pubby.dmm b/_maps/shuttles/whiteship_pubby.dmm index 464c77f21e1..49c4f1dde0c 100644 --- a/_maps/shuttles/whiteship_pubby.dmm +++ b/_maps/shuttles/whiteship_pubby.dmm @@ -38,7 +38,7 @@ dir = 8 }, /obj/structure/table/glass, -/obj/item/weapon/gun/medbeam, +/obj/item/gun/medbeam, /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "i" = ( @@ -55,7 +55,7 @@ }, /obj/structure/table/glass, /obj/machinery/recharger, -/obj/item/weapon/gun/energy/laser/retro, +/obj/item/gun/energy/laser/retro, /turf/open/floor/plating/abductor, /area/shuttle/abandoned) "k" = ( @@ -106,7 +106,7 @@ }, /obj/structure/window/reinforced, /obj/structure/table/glass, -/obj/item/weapon/tank/internals/oxygen, +/obj/item/tank/internals/oxygen, /obj/item/clothing/mask/breath, /obj/item/clothing/suit/space/hardsuit/engine/elite, /turf/open/floor/plating/abductor, diff --git a/_maps/templates/medium_shuttle1.dmm b/_maps/templates/medium_shuttle1.dmm index edd7df2a677..227409cf369 100644 --- a/_maps/templates/medium_shuttle1.dmm +++ b/_maps/templates/medium_shuttle1.dmm @@ -74,7 +74,7 @@ }) "l" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkblue, /area/ruin/powered{ name = "Shuttle" diff --git a/_maps/templates/medium_shuttle2.dmm b/_maps/templates/medium_shuttle2.dmm index ec569a13f19..17e715c37e7 100644 --- a/_maps/templates/medium_shuttle2.dmm +++ b/_maps/templates/medium_shuttle2.dmm @@ -120,7 +120,7 @@ }) "s" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid/regular, +/obj/item/storage/firstaid/regular, /turf/open/floor/plasteel/darkblue, /area/ruin/powered{ name = "Shuttle" diff --git a/_maps/templates/medium_shuttle3.dmm b/_maps/templates/medium_shuttle3.dmm index c151b4bb39f..dafd85bf554 100644 --- a/_maps/templates/medium_shuttle3.dmm +++ b/_maps/templates/medium_shuttle3.dmm @@ -205,7 +205,7 @@ }) "D" = ( /obj/structure/table, -/obj/item/weapon/storage/firstaid, +/obj/item/storage/firstaid, /turf/open/floor/plasteel/darkblue, /area/ruin/powered{ name = "Shuttle" diff --git a/_maps/templates/shelter_1.dmm b/_maps/templates/shelter_1.dmm index 2237e82dda4..42e8ec75404 100644 --- a/_maps/templates/shelter_1.dmm +++ b/_maps/templates/shelter_1.dmm @@ -35,7 +35,7 @@ /area/survivalpod) "i" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/pod, /area/survivalpod) "j" = ( diff --git a/_maps/templates/shelter_2.dmm b/_maps/templates/shelter_2.dmm index fd8dab33c36..9f3827e5c37 100644 --- a/_maps/templates/shelter_2.dmm +++ b/_maps/templates/shelter_2.dmm @@ -31,7 +31,7 @@ /area/survivalpod) "h" = ( /obj/machinery/shower, -/obj/item/weapon/soap/deluxe, +/obj/item/soap/deluxe, /obj/structure/curtain{ alpha = 240; color = "#454545"; @@ -42,7 +42,7 @@ /area/survivalpod) "i" = ( /obj/structure/toilet/secret{ - secret_type = /obj/item/weapon/kitchen/knife/combat/survival + secret_type = /obj/item/kitchen/knife/combat/survival }, /turf/open/floor/pod, /area/survivalpod) @@ -61,7 +61,7 @@ /area/survivalpod) "m" = ( /obj/structure/bed/pod, -/obj/item/weapon/bedsheet/black, +/obj/item/bedsheet/black, /turf/open/floor/pod, /area/survivalpod) "n" = ( @@ -91,15 +91,15 @@ /area/survivalpod) "p" = ( /obj/structure/table/survival_pod, -/obj/item/weapon/storage/firstaid/regular, -/obj/item/weapon/storage/firstaid/brute{ +/obj/item/storage/firstaid/regular, +/obj/item/storage/firstaid/brute{ pixel_x = 5 }, /turf/open/floor/pod, /area/survivalpod) "q" = ( /obj/structure/tubes, -/obj/item/weapon/twohanded/required/kirbyplants/random, +/obj/item/twohanded/required/kirbyplants/random, /turf/open/floor/pod, /area/survivalpod) "r" = ( @@ -115,11 +115,11 @@ light_color = "#DDFFD3" }, /obj/structure/table/wood/fancy/black, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = 2 }, -/obj/item/weapon/reagent_containers/food/drinks/bottle/wine{ +/obj/item/reagent_containers/food/drinks/bottle/wine{ pixel_x = -6; pixel_y = 10 }, @@ -169,7 +169,7 @@ /area/survivalpod) "x" = ( /obj/structure/table/wood/fancy/black, -/obj/item/weapon/reagent_containers/food/drinks/drinkingglass{ +/obj/item/reagent_containers/food/drinks/drinkingglass{ pixel_x = 7; pixel_y = 2 }, diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index c615370a44d..16b2a8f4fb5 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -137,10 +137,10 @@ #define isorgan(A) (istype(A, /obj/item/organ)) GLOBAL_LIST_INIT(pointed_types, typecacheof(list( - /obj/item/weapon/pen, - /obj/item/weapon/screwdriver, - /obj/item/weapon/reagent_containers/syringe, - /obj/item/weapon/kitchen/fork))) + /obj/item/pen, + /obj/item/screwdriver, + /obj/item/reagent_containers/syringe, + /obj/item/kitchen/fork))) #define is_pointed(W) (is_type_in_typecache(W, GLOB.pointed_types)) diff --git a/code/__HELPERS/priority_announce.dm b/code/__HELPERS/priority_announce.dm index a617437ac32..d3b9580f372 100644 --- a/code/__HELPERS/priority_announce.dm +++ b/code/__HELPERS/priority_announce.dm @@ -40,7 +40,7 @@ for(var/obj/machinery/computer/communications/C in GLOB.machines) if(!(C.stat & (BROKEN|NOPOWER)) && C.z == ZLEVEL_STATION) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper(C.loc) + var/obj/item/paper/P = new /obj/item/paper(C.loc) P.name = "paper - '[title]'" P.info = text C.messagetitle.Add("[title]") diff --git a/code/__HELPERS/unsorted.dm b/code/__HELPERS/unsorted.dm index 8cb34e23b5f..86fad8f4fff 100644 --- a/code/__HELPERS/unsorted.dm +++ b/code/__HELPERS/unsorted.dm @@ -797,7 +797,7 @@ GLOBAL_LIST_INIT(WALLITEMS, typecacheof(list( /obj/machinery/status_display, /obj/machinery/requests_console, /obj/machinery/light_switch, /obj/structure/sign, /obj/machinery/newscaster, /obj/machinery/firealarm, /obj/structure/noticeboard, /obj/machinery/button, /obj/machinery/computer/security/telescreen, /obj/machinery/embedded_controller/radio/simple_vent_controller, - /obj/item/weapon/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth, + /obj/item/storage/secure/safe, /obj/machinery/door_timer, /obj/machinery/flasher, /obj/machinery/keycard_auth, /obj/structure/mirror, /obj/structure/fireaxecabinet, /obj/machinery/computer/security/telescreen/entertainment, /obj/structure/sign/picture_frame ))) diff --git a/code/_globalvars/lists/maintenance_loot.dm b/code/_globalvars/lists/maintenance_loot.dm index 59885b34322..f16e9a16ede 100644 --- a/code/_globalvars/lists/maintenance_loot.dm +++ b/code/_globalvars/lists/maintenance_loot.dm @@ -45,7 +45,7 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/device/multitool = 2, /obj/item/device/radio/off = 2, /obj/item/device/t_scanner = 5, - /obj/item/weapon/airlock_painter = 1, + /obj/item/airlock_painter = 1, /obj/item/stack/cable_coil/random = 4, /obj/item/stack/cable_coil/random/five = 6, /obj/item/stack/medical/bruise_pack = 1, @@ -56,54 +56,54 @@ GLOBAL_LIST_INIT(maintenance_loot, list( /obj/item/stack/sheet/metal/twenty = 1, /obj/item/stack/sheet/mineral/plasma = 1, /obj/item/stack/sheet/rglass = 1, - /obj/item/weapon/book/manual/wiki/engineering_construction = 1, - /obj/item/weapon/book/manual/wiki/engineering_hacking = 1, + /obj/item/book/manual/wiki/engineering_construction = 1, + /obj/item/book/manual/wiki/engineering_hacking = 1, /obj/item/clothing/head/cone = 1, - /obj/item/weapon/coin/silver = 1, - /obj/item/weapon/coin/twoheaded = 1, - /obj/item/weapon/poster/random_contraband = 1, - /obj/item/weapon/poster/random_official = 1, - /obj/item/weapon/crowbar = 1, - /obj/item/weapon/crowbar/red = 1, - /obj/item/weapon/extinguisher = 11, - //obj/item/weapon/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc. - /obj/item/weapon/hand_labeler = 1, - /obj/item/weapon/paper/crumpled = 1, - /obj/item/weapon/pen = 1, - /obj/item/weapon/reagent_containers/spray/pestspray = 1, - /obj/item/weapon/reagent_containers/glass/rag = 3, - /obj/item/weapon/stock_parts/cell = 3, - /obj/item/weapon/storage/belt/utility = 2, - /obj/item/weapon/storage/box = 2, - /obj/item/weapon/storage/box/cups = 1, - /obj/item/weapon/storage/box/donkpockets = 1, - /obj/item/weapon/storage/box/lights/mixed = 3, - /obj/item/weapon/storage/box/hug/medical = 1, - /obj/item/weapon/storage/fancy/cigarettes/dromedaryco = 1, - /obj/item/weapon/storage/toolbox/mechanical = 1, - /obj/item/weapon/screwdriver = 3, - /obj/item/weapon/tank/internals/emergency_oxygen = 2, - /obj/item/weapon/vending_refill/cola = 1, - /obj/item/weapon/weldingtool = 3, - /obj/item/weapon/wirecutters = 1, - /obj/item/weapon/wrench = 4, - /obj/item/weapon/relic = 3, + /obj/item/coin/silver = 1, + /obj/item/coin/twoheaded = 1, + /obj/item/poster/random_contraband = 1, + /obj/item/poster/random_official = 1, + /obj/item/crowbar = 1, + /obj/item/crowbar/red = 1, + /obj/item/extinguisher = 11, + //obj/item/gun/ballistic/revolver/russian = 1, //disabled until lootdrop is a proper world proc. + /obj/item/hand_labeler = 1, + /obj/item/paper/crumpled = 1, + /obj/item/pen = 1, + /obj/item/reagent_containers/spray/pestspray = 1, + /obj/item/reagent_containers/glass/rag = 3, + /obj/item/stock_parts/cell = 3, + /obj/item/storage/belt/utility = 2, + /obj/item/storage/box = 2, + /obj/item/storage/box/cups = 1, + /obj/item/storage/box/donkpockets = 1, + /obj/item/storage/box/lights/mixed = 3, + /obj/item/storage/box/hug/medical = 1, + /obj/item/storage/fancy/cigarettes/dromedaryco = 1, + /obj/item/storage/toolbox/mechanical = 1, + /obj/item/screwdriver = 3, + /obj/item/tank/internals/emergency_oxygen = 2, + /obj/item/vending_refill/cola = 1, + /obj/item/weldingtool = 3, + /obj/item/wirecutters = 1, + /obj/item/wrench = 4, + /obj/item/relic = 3, /obj/item/weaponcrafting/receiver = 2, /obj/item/clothing/head/cone = 2, - /obj/item/weapon/grenade/smokebomb = 2, + /obj/item/grenade/smokebomb = 2, /obj/item/device/geiger_counter = 3, - /obj/item/weapon/reagent_containers/food/snacks/grown/citrus/orange = 1, + /obj/item/reagent_containers/food/snacks/grown/citrus/orange = 1, /obj/item/device/radio/headset = 1, /obj/item/device/assembly/infra = 1, /obj/item/device/assembly/igniter = 2, /obj/item/device/assembly/signaler = 2, /obj/item/device/assembly/mousetrap = 2, - /obj/item/weapon/reagent_containers/syringe = 2, + /obj/item/reagent_containers/syringe = 2, /obj/item/clothing/gloves/color/random = 8, /obj/item/clothing/shoes/laceup = 1, - /obj/item/weapon/storage/secure/briefcase = 3, - /obj/item/weapon/storage/toolbox/artistic = 2, + /obj/item/storage/secure/briefcase = 3, + /obj/item/storage/toolbox/artistic = 2, /obj/item/toy/eightball = 1, - /obj/item/weapon/storage/daki = 3, + /obj/item/storage/daki = 3, "" = 3 )) diff --git a/code/_onclick/autoclick.dm b/code/_onclick/autoclick.dm index 29a704ee7a3..7a5ba0a1899 100644 --- a/code/_onclick/autoclick.dm +++ b/code/_onclick/autoclick.dm @@ -55,10 +55,10 @@ /obj/item var/canMouseDown = FALSE -/obj/item/weapon/gun +/obj/item/gun var/automatic = 0 //can gun use it, 0 is no, anything above 0 is the delay between clicks in ds -/obj/item/weapon/gun/CanItemAutoclick(object, location, params) +/obj/item/gun/CanItemAutoclick(object, location, params) . = automatic /atom/proc/IsAutoclickable() diff --git a/code/_onclick/click.dm b/code/_onclick/click.dm index 037ae47d98d..4688e348b82 100644 --- a/code/_onclick/click.dm +++ b/code/_onclick/click.dm @@ -180,7 +180,7 @@ /atom/proc/CanReachStorage(atom/target,user,depth) return FALSE -/obj/item/weapon/storage/CanReachStorage(atom/target,user,depth) +/obj/item/storage/CanReachStorage(atom/target,user,depth) while(target && depth > 0) target = target.loc depth-- diff --git a/code/_onclick/hud/robot.dm b/code/_onclick/hud/robot.dm index 60df60b3804..05a291bad7a 100644 --- a/code/_onclick/hud/robot.dm +++ b/code/_onclick/hud/robot.dm @@ -13,7 +13,7 @@ if(..()) return var/mob/living/silicon/robot/R = usr - if(R.module.type != /obj/item/weapon/robot_module) + if(R.module.type != /obj/item/robot_module) R.hud_used.toggle_show_robot_modules() return 1 R.pick_module() diff --git a/code/_onclick/hud/screen_objects.dm b/code/_onclick/hud/screen_objects.dm index 13717b576f9..2d94f41ba9e 100644 --- a/code/_onclick/hud/screen_objects.dm +++ b/code/_onclick/hud/screen_objects.dm @@ -182,8 +182,8 @@ name = "close" /obj/screen/close/Click() - if(istype(master, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = master + if(istype(master, /obj/item/storage)) + var/obj/item/storage/S = master S.close(usr) return 1 @@ -262,27 +262,27 @@ to_chat(C, "You are not wearing an internals mask!") return - var/obj/item/I = C.is_holding_item_of_type(/obj/item/weapon/tank) + var/obj/item/I = C.is_holding_item_of_type(/obj/item/tank) if(I) to_chat(C, "You are now running on internals from the [I] on your [C.get_held_index_name(C.get_held_index_of_item(I))].") C.internal = I else if(ishuman(C)) var/mob/living/carbon/human/H = C - if(istype(H.s_store, /obj/item/weapon/tank)) + if(istype(H.s_store, /obj/item/tank)) to_chat(H, "You are now running on internals from the [H.s_store] on your [H.wear_suit].") H.internal = H.s_store - else if(istype(H.belt, /obj/item/weapon/tank)) + else if(istype(H.belt, /obj/item/tank)) to_chat(H, "You are now running on internals from the [H.belt] on your belt.") H.internal = H.belt - else if(istype(H.l_store, /obj/item/weapon/tank)) + else if(istype(H.l_store, /obj/item/tank)) to_chat(H, "You are now running on internals from the [H.l_store] in your left pocket.") H.internal = H.l_store - else if(istype(H.r_store, /obj/item/weapon/tank)) + else if(istype(H.r_store, /obj/item/tank)) to_chat(H, "You are now running on internals from the [H.r_store] in your right pocket.") H.internal = H.r_store //Separate so CO2 jetpacks are a little less cumbersome. - if(!C.internal && istype(C.back, /obj/item/weapon/tank)) + if(!C.internal && istype(C.back, /obj/item/tank)) to_chat(C, "You are now running on internals from the [C.back] on your back.") C.internal = C.back diff --git a/code/_onclick/observer.dm b/code/_onclick/observer.dm index 9a474b16a81..438b3b5142d 100644 --- a/code/_onclick/observer.dm +++ b/code/_onclick/observer.dm @@ -82,7 +82,7 @@ else to_chat(user, "[src] has no destination.") -/obj/item/weapon/storage/attack_ghost(mob/user) +/obj/item/storage/attack_ghost(mob/user) orient2hud(user) show_to(user) diff --git a/code/citadel/_cit_helpers.dm b/code/citadel/_cit_helpers.dm index e6dca1e3690..f20e59b0b63 100644 --- a/code/citadel/_cit_helpers.dm +++ b/code/citadel/_cit_helpers.dm @@ -57,7 +57,7 @@ GLOBAL_LIST_EMPTY(cock_shapes_icons) //Associated list for names->icon_states fo GLOBAL_LIST_EMPTY(breasts_size_list) GLOBAL_LIST_EMPTY(breasts_shapes_list) GLOBAL_LIST_EMPTY(vagina_shapes_list) -GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/weapon/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc +GLOBAL_LIST_INIT(cum_into_containers_list, list(/obj/item/reagent_containers/food/snacks/pie)) //Yer fuggin snowflake name list jfc GLOBAL_LIST_INIT(dick_nouns, list("dick","cock","member","shaft")) GLOBAL_LIST_INIT(cum_id_list,"semen") GLOBAL_LIST_INIT(milk_id_list,"milk") diff --git a/code/citadel/cit_arousal.dm b/code/citadel/cit_arousal.dm index 60057581441..0c03ffb3991 100644 --- a/code/citadel/cit_arousal.dm +++ b/code/citadel/cit_arousal.dm @@ -287,7 +287,7 @@ setArousalLoss(min_arousal) -/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/G, obj/item/weapon/reagent_containers/container, mb_time = 30) //For beaker-filling, beware the bartender +/mob/living/carbon/human/proc/mob_fill_container(obj/item/organ/genital/G, obj/item/reagent_containers/container, mb_time = 30) //For beaker-filling, beware the bartender var/total_fluids = 0 var/datum/reagents/fluid_source = null @@ -368,11 +368,11 @@ return input(src, "With whom?", "Sexual partner", null) in partners //pick one, default to null /mob/living/carbon/human/proc/pick_climax_container() - var/obj/item/weapon/reagent_containers/SC = null + var/obj/item/reagent_containers/SC = null var/list/containers_list = list() - for(var/obj/item/weapon/reagent_containers/container in held_items) - if(container.is_open_container() || istype(container, /obj/item/weapon/reagent_containers/food/snacks)) + for(var/obj/item/reagent_containers/container in held_items) + if(container.is_open_container() || istype(container, /obj/item/reagent_containers/food/snacks)) containers_list += container if(containers_list.len) @@ -530,7 +530,7 @@ picked_organ = pick_climax_genitals() //Gotta be climaxable, not just masturbation, to fill with fluids. if(picked_organ) //Good, got an organ, time to pick a container - var/obj/item/weapon/reagent_containers/fluid_container = pick_climax_container() + var/obj/item/reagent_containers/fluid_container = pick_climax_container() if(fluid_container) mob_fill_container(picked_organ, fluid_container) return diff --git a/code/citadel/cit_genemods.dm b/code/citadel/cit_genemods.dm index 2279ab972b9..01027f5d871 100644 --- a/code/citadel/cit_genemods.dm +++ b/code/citadel/cit_genemods.dm @@ -1,6 +1,6 @@ //Will include consumable gene mods in the future. -/obj/item/weapon/genemod +/obj/item/genemod name = "genetic modifier" desc = "Microbodies which can grow, morph, or otherwise change an organism into something else." icon = 'icons/obj/items.dmi' @@ -18,5 +18,5 @@ var/used = 0 -/obj/item/weapon/genemod/proc/use(mob/living/carbon/human/target) +/obj/item/genemod/proc/use(mob/living/carbon/human/target) return \ No newline at end of file diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm index 6a51ad4bd24..ae78d1d172a 100644 --- a/code/citadel/cit_guns.dm +++ b/code/citadel/cit_guns.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/gun/energy/laser/carbine +/obj/item/gun/energy/laser/carbine name = "laser carbine" desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun." icon = 'icons/obj/guns/cit_guns.dmi' @@ -8,13 +8,13 @@ force = 10 throwforce = 10 ammo_type = list(/obj/item/ammo_casing/energy/lasergun) - cell_type = /obj/item/weapon/stock_parts/cell/lascarbine + cell_type = /obj/item/stock_parts/cell/lascarbine resistance_flags = FIRE_PROOF | ACID_PROOF -/obj/item/weapon/gun/energy/laser/carbine/nopin +/obj/item/gun/energy/laser/carbine/nopin pin = null -/obj/item/weapon/stock_parts/cell/lascarbine +/obj/item/stock_parts/cell/lascarbine name = "laser carbine power supply" maxcharge = 2500 @@ -25,5 +25,5 @@ req_tech = list("combat" = 5, "magnets" = 5, "powerstorage" = 4) build_type = PROTOLATHE materials = list(MAT_GOLD = 2500, MAT_METAL = 5000, MAT_GLASS = 5000) - build_path = /obj/item/weapon/gun/energy/laser/carbine/nopin + build_path = /obj/item/gun/energy/laser/carbine/nopin category = list("Weapons") \ No newline at end of file diff --git a/code/citadel/cit_vendors.dm b/code/citadel/cit_vendors.dm index 7fee8705f15..d35d11a5f86 100644 --- a/code/citadel/cit_vendors.dm +++ b/code/citadel/cit_vendors.dm @@ -13,15 +13,15 @@ /obj/item/clothing/under/maid = 5, /obj/item/clothing/under/stripper_pink = 5, /obj/item/clothing/under/stripper_green = 5, - /obj/item/weapon/dildo/custom = 5 + /obj/item/dildo/custom = 5 ) - contraband = list(/obj/item/weapon/restraints/handcuffs/fake/kinky = 5, + contraband = list(/obj/item/restraints/handcuffs/fake/kinky = 5, /obj/item/clothing/neck/petcollar = 5, /obj/item/clothing/under/mankini = 1, - /obj/item/weapon/dildo/flared/huge = 1 + /obj/item/dildo/flared/huge = 1 ) premium = list() - refill_canister = /obj/item/weapon/vending_refill/kink + refill_canister = /obj/item/vending_refill/kink /obj/machinery/vending/nazivend name = "Nazivend" @@ -42,11 +42,11 @@ /obj/item/clothing/suit/officercoat = 10, /obj/item/clothing/under/officeruniform = 10, /obj/item/clothing/suit/space/hardsuit/nazi = 3, - /obj/item/weapon/gun/energy/plasma/MP40k = 4 + /obj/item/gun/energy/plasma/MP40k = 4 ) premium = list() - refill_canister = /obj/item/weapon/vending_refill/nazi + refill_canister = /obj/item/vending_refill/nazi /obj/machinery/vending/sovietvend name = "KomradeVendtink" @@ -70,11 +70,11 @@ /obj/item/clothing/suit/russofurcoat = 4, /obj/item/clothing/head/russofurhat = 4, /obj/item/clothing/suit/space/hardsuit/soviet = 3, - /obj/item/weapon/gun/energy/laser/LaserAK = 4 + /obj/item/gun/energy/laser/LaserAK = 4 ) premium = list() - refill_canister = /obj/item/weapon/vending_refill/soviet + refill_canister = /obj/item/vending_refill/soviet #undef STANDARD_CHARGE @@ -82,19 +82,19 @@ #undef COIN_CHARGE -/obj/item/weapon/vending_refill/kink +/obj/item/vending_refill/kink machine_name = "KinkMate" icon_state = "refill_kink" charges = list(8, 5, 0)// of 20 standard, 12 contraband, 0 premium init_charges = list(8, 5, 0) -/obj/item/weapon/vending_refill/nazi +/obj/item/vending_refill/nazi machine_name = "nazivend" icon_state = "refill_nazi" charges = list(33, 13, 0) init_charges = list(33, 13, 0) -/obj/item/weapon/vending_refill/soviet +/obj/item/vending_refill/soviet machine_name = "sovietvend" icon_state = "refill_soviet" charges = list(47, 7, 0) diff --git a/code/citadel/dogborgs.dm b/code/citadel/dogborgs.dm index 351f8aca3b8..a32c4369886 100644 --- a/code/citadel/dogborgs.dm +++ b/code/citadel/dogborgs.dm @@ -1,42 +1,42 @@ -/obj/item/weapon/robot_module/loader +/obj/item/robot_module/loader name = "loader robot module" -/obj/item/weapon/robot_module/loader/New() +/obj/item/robot_module/loader/New() ..() emag = new /obj/item/borg/stun(src) - modules += new /obj/item/weapon/extinguisher(src) - modules += new /obj/item/weapon/weldingtool/largetank/cyborg(src) - modules += new /obj/item/weapon/screwdriver(src) - modules += new /obj/item/weapon/wrench(src) - modules += new /obj/item/weapon/crowbar(src) - modules += new /obj/item/weapon/wirecutters(src) + modules += new /obj/item/extinguisher(src) + modules += new /obj/item/weldingtool/largetank/cyborg(src) + modules += new /obj/item/screwdriver(src) + modules += new /obj/item/wrench(src) + modules += new /obj/item/crowbar(src) + modules += new /obj/item/wirecutters(src) modules += new /obj/item/device/multitool(src) modules += new /obj/item/device/t_scanner(src) modules += new /obj/item/device/analyzer(src) modules += new /obj/item/device/assembly/signaler - modules += new /obj/item/weapon/soap/nanotrasen(src) + modules += new /obj/item/soap/nanotrasen(src) fix_modules() -/obj/item/weapon/robot_module/k9 +/obj/item/robot_module/k9 name = "Security K-9 Unit module" -/obj/item/weapon/robot_module/k9/New() +/obj/item/robot_module/k9/New() ..() - modules += new /obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/dog(src) - modules += new /obj/item/weapon/dogborg/jaws/big(src) - modules += new /obj/item/weapon/dogborg/pounce(src) + modules += new /obj/item/restraints/handcuffs/cable/zipties/cyborg/dog(src) + modules += new /obj/item/dogborg/jaws/big(src) + modules += new /obj/item/dogborg/pounce(src) modules += new /obj/item/clothing/mask/gas/sechailer/cyborg(src) - modules += new /obj/item/weapon/soap/tongue(src) + modules += new /obj/item/soap/tongue(src) modules += new /obj/item/device/analyzer/nose(src) - modules += new /obj/item/weapon/storage/bag/borgdelivery(src) + modules += new /obj/item/storage/bag/borgdelivery(src) //modules += new /obj/item/device/assembly/signaler(src) //modules += new /obj/item/device/detective_scanner(src) - modules += new /obj/item/weapon/gun/energy/disabler/cyborg(src) - emag = new /obj/item/weapon/gun/energy/laser/cyborg(src) + modules += new /obj/item/gun/energy/disabler/cyborg(src) + emag = new /obj/item/gun/energy/laser/cyborg(src) fix_modules() -/obj/item/weapon/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1) +/obj/item/robot_module/security/respawn_consumable(mob/living/silicon/robot/R, coeff = 1) ..() - var/obj/item/weapon/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/weapon/gun/energy/gun/advtaser/cyborg) in get_usable_modules() + var/obj/item/gun/energy/gun/advtaser/cyborg/T = locate(/obj/item/gun/energy/gun/advtaser/cyborg) in get_usable_modules() if(T) if(T.power_supply.charge < T.power_supply.maxcharge) var/obj/item/ammo_casing/energy/S = T.ammo_type[T.select] @@ -46,31 +46,31 @@ T.charge_tick = 0 fix_modules() -/obj/item/weapon/robot_module/borgi +/obj/item/robot_module/borgi name = "Borgi module" -/obj/item/weapon/robot_module/borgi/New() +/obj/item/robot_module/borgi/New() ..() - modules += new /obj/item/weapon/dogborg/jaws/small(src) - modules += new /obj/item/weapon/storage/bag/borgdelivery(src) - modules += new /obj/item/weapon/soap/tongue(src) + modules += new /obj/item/dogborg/jaws/small(src) + modules += new /obj/item/storage/bag/borgdelivery(src) + modules += new /obj/item/soap/tongue(src) modules += new /obj/item/device/healthanalyzer(src) modules += new /obj/item/device/analyzer/nose(src) - emag = new /obj/item/weapon/dogborg/pounce(src) + emag = new /obj/item/dogborg/pounce(src) fix_modules() -/obj/item/weapon/robot_module/medihound +/obj/item/robot_module/medihound name = "MediHound module" -/obj/item/weapon/robot_module/medihound/New() +/obj/item/robot_module/medihound/New() ..() - modules += new /obj/item/weapon/dogborg/jaws/small(src) - modules += new /obj/item/weapon/storage/bag/borgdelivery(src) + modules += new /obj/item/dogborg/jaws/small(src) + modules += new /obj/item/storage/bag/borgdelivery(src) modules += new /obj/item/device/analyzer/nose(src) - modules += new /obj/item/weapon/soap/tongue(src) + modules += new /obj/item/soap/tongue(src) modules += new /obj/item/device/healthanalyzer(src) - modules += new /obj/item/weapon/dogborg/sleeper(src) - modules += new /obj/item/weapon/twohanded/shockpaddles/hound(src) + modules += new /obj/item/dogborg/sleeper(src) + modules += new /obj/item/twohanded/shockpaddles/hound(src) modules += new /obj/item/device/sensor_device(src) - emag = new /obj/item/weapon/dogborg/pounce(src) + emag = new /obj/item/dogborg/pounce(src) fix_modules() \ No newline at end of file diff --git a/code/citadel/dogborgstuff.dm b/code/citadel/dogborgstuff.dm index 8d3a3c02897..4f3eae0fb7e 100644 --- a/code/citadel/dogborgstuff.dm +++ b/code/citadel/dogborgstuff.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/dogborg/jaws/big +/obj/item/dogborg/jaws/big name = "combat jaws" icon = 'icons/mob/dogborg.dmi' icon_state = "jaws" @@ -11,7 +11,7 @@ w_class = 3 sharpness = IS_SHARP -/obj/item/weapon/dogborg/jaws/small +/obj/item/dogborg/jaws/small name = "puppy jaws" icon = 'icons/mob/dogborg.dmi' icon_state = "smalljaws" @@ -25,11 +25,11 @@ sharpness = IS_SHARP var/emagged = 0 -/obj/item/weapon/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user) +/obj/item/dogborg/jaws/attack(atom/A, mob/living/silicon/robot/user) ..() user.do_attack_animation(A, ATTACK_EFFECT_BITE) -/obj/item/weapon/dogborg/jaws/small/attack_self(mob/user) +/obj/item/dogborg/jaws/small/attack_self(mob/user) var/mob/living/silicon/robot.R = user if(R.emagged) emagged = !emagged @@ -62,14 +62,14 @@ //Cuffs -/obj/item/weapon/restraints/handcuffs/cable/zipties/cyborg/dog/attack(mob/living/carbon/C, mob/user) +/obj/item/restraints/handcuffs/cable/zipties/cyborg/dog/attack(mob/living/carbon/C, mob/user) if(!C.handcuffed) playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) C.visible_message("[user] is trying to put zipties on [C]!", \ "[user] is trying to put zipties on [C]!") if(do_mob(user, C, 30)) if(!C.handcuffed) - C.handcuffed = new /obj/item/weapon/restraints/handcuffs/cable/zipties/used(C) + C.handcuffed = new /obj/item/restraints/handcuffs/cable/zipties/used(C) C.update_inv_handcuffed(0) to_chat(user,"You handcuff [C].") playsound(loc, pick('sound/voice/bgod.ogg', 'sound/voice/biamthelaw.ogg', 'sound/voice/bsecureday.ogg', 'sound/voice/bradio.ogg', 'sound/voice/binsult.ogg', 'sound/voice/bcreep.ogg'), 50, 0) @@ -149,7 +149,7 @@ //Delivery -/obj/item/weapon/storage/bag/borgdelivery +/obj/item/storage/bag/borgdelivery name = "fetching storage" desc = "Fetch the thing!" icon = 'icons/mob/dogborg.dmi' @@ -161,12 +161,12 @@ storage_slots = 1 collection_mode = 0 can_hold = list() // any - cant_hold = list(/obj/item/weapon/disk/nuclear) + cant_hold = list(/obj/item/disk/nuclear) //Tongue stuff -/obj/item/weapon/soap/tongue +/obj/item/soap/tongue name = "synthetic tongue" desc = "Useful for slurping mess off the floor before affectionally licking the crew members in the face." icon = 'icons/mob/dogborg.dmi' @@ -175,7 +175,7 @@ cleanspeed = 80 var/emagged = 0 -/obj/item/weapon/soap/tongue/New() +/obj/item/soap/tongue/New() ..() flags_1 |= NOBLUDGEON_1 //No more attack messages @@ -185,7 +185,7 @@ icon = 'icons/mob/dogborg.dmi' icon_state= "kibble" -/obj/item/weapon/soap/tongue/attack_self(mob/user) +/obj/item/soap/tongue/attack_self(mob/user) var/mob/living/silicon/robot.R = user if(R.emagged) emagged = !emagged @@ -203,7 +203,7 @@ cleanspeed = 80 update_icon() -/obj/item/weapon/soap/tongue/afterattack(atom/target, mob/user, proximity) +/obj/item/soap/tongue/afterattack(atom/target, mob/user, proximity) if(!proximity || !check_allowed_items(target)) return if(user.client && (target in user.client.screen)) @@ -228,14 +228,14 @@ var/mob/living/silicon/robot.R = user R.cell.give(250) return - if(istype(target,/obj/item/weapon/stock_parts/cell)) + if(istype(target,/obj/item/stock_parts/cell)) user.visible_message("[user] begins cramming \the [target.name] down its throat.", "You begin cramming \the [target.name] down your throat...") if(do_after(user, 50, target = target)) if(!in_range(src, target)) //Proximity is probably old news by now, do a new check. return //If they moved away, you can't eat them. to_chat(user, "You finish off \the [target.name].") var/mob/living/silicon/robot.R = user - var/obj/item/weapon/stock_parts/cell.C = target + var/obj/item/stock_parts/cell.C = target R.cell.charge = R.cell.charge + (C.charge / 3) //Instant full cell upgrades op idgaf qdel(target) return @@ -298,7 +298,7 @@ //Defibs -/obj/item/weapon/twohanded/shockpaddles/hound +/obj/item/twohanded/shockpaddles/hound name = "defibrillator paws" desc = "MediHound specific shock paws." icon = 'icons/mob/dogborg.dmi' @@ -307,7 +307,7 @@ req_defib = 0 wielded = 1 -/obj/item/weapon/twohanded/shockpaddles/hound/attack(mob/M, mob/user) +/obj/item/twohanded/shockpaddles/hound/attack(mob/M, mob/user) var/mob/living/silicon/robot.R = user if(R.cell.charge < 1000) user.visible_message("You don't have enough charge for this operation!") @@ -336,17 +336,17 @@ var/eject_port = "ingestion" var/list/items_preserved = list() var/list/important_items = list( - /obj/item/weapon/hand_tele, - /obj/item/weapon/card/id/captains_spare, + /obj/item/hand_tele, + /obj/item/card/id/captains_spare, /obj/item/device/aicard, /obj/item/device/paicard, - /obj/item/weapon/gun, - /obj/item/weapon/pinpointer, + /obj/item/gun, + /obj/item/pinpointer, /obj/item/clothing/shoes/magboots, /obj/item/clothing/head/helmet/space, /obj/item/clothing/suit/space, - /obj/item/weapon/reagent_containers/hypospray/CMO, - /obj/item/weapon/tank/jetpack/oxygen/captain, + /obj/item/reagent_containers/hypospray/CMO, + /obj/item/tank/jetpack/oxygen/captain, /obj/item/clothing/accessory/medal/gold/captain, /obj/item/clothing/suit/armor, /obj/item/documents, @@ -354,7 +354,7 @@ /obj/item/nuke_core_container, /obj/item/areaeditor/blueprints, /obj/item/documents/syndicate, - /obj/item/weapon/disk/nuclear) + /obj/item/disk/nuclear) /obj/item/device/dogborg/sleeper/New() ..() @@ -734,8 +734,8 @@ qdel(T) //Special case for IDs to make them digested - //else if (istype(T, /obj/item/weapon/card/id)) - //var/obj/item/weapon/card/id/ID = T + //else if (istype(T, /obj/item/card/id)) + //var/obj/item/card/id/ID = T //ID.digest() //Need the digest proc, first. //Anything not perserved, PDA, or ID @@ -760,7 +760,7 @@ min_health = -100 injection_chems = null //So they don't have all the same chems as the medihound! -/obj/item/weapon/storage/attackby(obj/item/device/dogborg/sleeper/K9, mob/user, proximity) +/obj/item/storage/attackby(obj/item/device/dogborg/sleeper/K9, mob/user, proximity) K9.afterattack(src, user ,1) /obj/item/device/dogborg/sleeper/K9/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity) @@ -806,7 +806,7 @@ injection_chems = null //So they don't have all the same chems as the medihound! var/max_item_count = 32 -/obj/item/weapon/storage/attackby(obj/item/device/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO! +/obj/item/storage/attackby(obj/item/device/dogborg/sleeper/compactor, mob/user, proximity) //GIT CIRCUMVENTED YO! compactor.afterattack(src, user ,1) /obj/item/device/dogborg/sleeper/compactor/afterattack(var/atom/movable/target, mob/living/silicon/user, proximity)//GARBO NOMS @@ -868,7 +868,7 @@ // Pounce stuff for K-9 -/obj/item/weapon/dogborg/pounce +/obj/item/dogborg/pounce name = "pounce" icon = 'icons/mob/dogborg.dmi' icon_state = "pounce" @@ -876,7 +876,7 @@ force = 0 throwforce = 0 -/obj/item/weapon/dogborg/pounce/New() +/obj/item/dogborg/pounce/New() ..() flags_1 |= NOBLUDGEON_1 @@ -892,7 +892,7 @@ #define MAX_K9_LEAP_DIST 4 //because something's definitely borked the pounce functioning from a distance. -/obj/item/weapon/dogborg/pounce/afterattack(atom/A, mob/user) +/obj/item/dogborg/pounce/afterattack(atom/A, mob/user) var/mob/living/silicon/robot.R = user R.leap_at(A) diff --git a/code/citadel/pokemon.dm b/code/citadel/pokemon.dm index b6be0033c0d..c3514719f60 100644 --- a/code/citadel/pokemon.dm +++ b/code/citadel/pokemon.dm @@ -90,7 +90,7 @@ icon = 'icons/mob/pokemon.dmi' var/pokeball pixel_x = -16 - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 5) + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 5) ventcrawler = 2 health = 100 maxHealth = 100 @@ -132,7 +132,7 @@ /mob/living/simple_animal/pokemon/leg icon = 'icons/mob/legendary.dmi' pixel_x = -32 - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 12) + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 12) health = 200 maxHealth = 200 diff --git a/code/citadel/toys/dildos.dm b/code/citadel/toys/dildos.dm index 51b86b2fc29..d216ed86baa 100644 --- a/code/citadel/toys/dildos.dm +++ b/code/citadel/toys/dildos.dm @@ -1,7 +1,7 @@ ////////// //DILDOS// ////////// -obj/item/weapon/dildo +obj/item/dildo name = "dildo" desc = "Floppy!" icon = 'code/citadel/icons/dildo.dmi' @@ -19,7 +19,7 @@ obj/item/weapon/dildo var/random_shape = FALSE //Lists moved to _cit_helpers.dm as globals so they're not instanced individually -obj/item/weapon/dildo/proc/update_appearance() +obj/item/dildo/proc/update_appearance() icon_state = "[dildo_type]_[dildo_shape]_[dildo_size]" var/sizeword = "" switch(dildo_size) @@ -34,7 +34,7 @@ obj/item/weapon/dildo/proc/update_appearance() name = "[sizeword][dildo_shape] [can_customize ? "custom " : ""][dildo_type]" -obj/item/weapon/dildo/AltClick(mob/living/user) +obj/item/dildo/AltClick(mob/living/user) if(QDELETED(src)) return if(!isliving(user)) @@ -45,7 +45,7 @@ obj/item/weapon/dildo/AltClick(mob/living/user) return customize(user) -obj/item/weapon/dildo/proc/customize(mob/living/user) +obj/item/dildo/proc/customize(mob/living/user) if(!can_customize) return FALSE if(src && !user.incapacitated() && in_range(user,src)) @@ -74,7 +74,7 @@ obj/item/weapon/dildo/proc/customize(mob/living/user) update_appearance() return TRUE -obj/item/weapon/dildo/Initialize() +obj/item/dildo/Initialize() . = ..() if(random_color == TRUE) var/randcolor = pick(GLOB.dildo_colors) @@ -90,40 +90,40 @@ obj/item/weapon/dildo/Initialize() pixel_y = rand(-7,7) pixel_x = rand(-7,7) -obj/item/weapon/dildo/examine(mob/user) +obj/item/dildo/examine(mob/user) ..() if(can_customize) user << "Alt-Click \the [src.name] to customize it." -obj/item/weapon/dildo/random//totally random +obj/item/dildo/random//totally random name = "random dildo"//this name will show up in vendors and shit so you know what you're vending(or don't, i guess :^)) random_color = TRUE random_shape = TRUE random_size = TRUE -obj/item/weapon/dildo/knotted +obj/item/dildo/knotted dildo_shape = "knotted" name = "knotted dildo" -obj/item/weapon/dildo/human +obj/item/dildo/human dildo_shape = "human" name = "human dildo" -obj/item/weapon/dildo/plain +obj/item/dildo/plain dildo_shape = "plain" name = "plain dildo" -obj/item/weapon/dildo/flared +obj/item/dildo/flared dildo_shape = "flared" name = "flared dildo" -obj/item/weapon/dildo/flared/huge +obj/item/dildo/flared/huge name = "literal horse cock" desc = "THIS THING IS HUGE!" dildo_size = 4 -obj/item/weapon/dildo/custom +obj/item/dildo/custom name = "customizable dildo" desc = "Thanks to significant advances in synthetic nanomaterials, this dildo is capable of taking on many different forms to fit the user's preferences! Pricy!" can_customize = TRUE diff --git a/code/controllers/hooks-defs.dm b/code/controllers/hooks-defs.dm index 001372b4e3e..42212e266c7 100644 --- a/code/controllers/hooks-defs.dm +++ b/code/controllers/hooks-defs.dm @@ -68,14 +68,14 @@ /** * Employee reassignment hook. * Called in card.dm when someone's card is reassigned at the HoP's desk. - * Parameters: var/obj/item/weapon/card/id + * Parameters: var/obj/item/card/id */ /hook/reassign_employee /** * Employee terminated hook. * Called in card.dm when someone's card is terminated at the HoP's desk. - * Parameters: var/obj/item/weapon/card/id + * Parameters: var/obj/item/card/id */ /hook/terminate_employee diff --git a/code/controllers/subsystem/persistence.dm b/code/controllers/subsystem/persistence.dm index 9261596798f..5dd47ca9990 100644 --- a/code/controllers/subsystem/persistence.dm +++ b/code/controllers/subsystem/persistence.dm @@ -22,7 +22,7 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/proc/LoadSatchels() secret_satchels = new /savefile("data/npc_saves/SecretSatchels.sav") - satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/weapon/crowbar)) + satchel_blacklist = typecacheof(list(/obj/item/stack/tile/plasteel, /obj/item/crowbar)) secret_satchels[SSmapping.config.map_name] >> old_secret_satchels var/list/expanded_old_satchels = list() @@ -38,7 +38,7 @@ SUBSYSTEM_DEF(persistence) var/list/free_satchels = list() for(var/turf/T in shuffle(block(locate(TRANSITIONEDGE,TRANSITIONEDGE,ZLEVEL_STATION), locate(world.maxx-TRANSITIONEDGE,world.maxy-TRANSITIONEDGE,ZLEVEL_STATION)))) //Nontrivially expensive but it's roundstart only if(isfloorturf(T) && !istype(T, /turf/open/floor/plating/)) - free_satchels += new /obj/item/weapon/storage/backpack/satchel/flat/secret(T) + free_satchels += new /obj/item/storage/backpack/satchel/flat/secret(T) if(!isemptylist(free_satchels) && ((free_satchels.len + placed_satchels) >= (50 - expanded_old_satchels.len) * 0.1)) //up to six tiles, more than enough to kill anything that moves break @@ -59,7 +59,7 @@ SUBSYSTEM_DEF(persistence) if(!path) return 0 - var/obj/item/weapon/storage/backpack/satchel/flat/F = new() + var/obj/item/storage/backpack/satchel/flat/F = new() F.x = text2num(chosen_satchel[1]) F.y = text2num(chosen_satchel[2]) F.z = ZLEVEL_STATION @@ -157,7 +157,7 @@ SUBSYSTEM_DEF(persistence) /datum/controller/subsystem/persistence/proc/CollectSecretSatchels() for(var/A in new_secret_satchels) - var/obj/item/weapon/storage/backpack/satchel/flat/F = A + var/obj/item/storage/backpack/satchel/flat/F = A if(QDELETED(F) || F.z != ZLEVEL_STATION || F.invisibility != INVISIBILITY_MAXIMUM) continue var/list/savable_obj = list() diff --git a/code/datums/action.dm b/code/datums/action.dm index ecaa70387bf..5b3a5994cd9 100644 --- a/code/datums/action.dm +++ b/code/datums/action.dm @@ -234,8 +234,8 @@ UpdateButtonIcon() /datum/action/item_action/toggle_unfriendly_fire/UpdateButtonIcon(status_only = FALSE) - if(istype(target, /obj/item/weapon/hierophant_club)) - var/obj/item/weapon/hierophant_club/H = target + if(istype(target, /obj/item/hierophant_club)) + var/obj/item/hierophant_club/H = target if(H.friendly_fire_check) button_icon_state = "vortex_ff_off" name = "Toggle Friendly Fire \[OFF\]" @@ -264,8 +264,8 @@ button_icon_state = "vortex_recall" /datum/action/item_action/vortex_recall/IsAvailable() - if(istype(target, /obj/item/weapon/hierophant_club)) - var/obj/item/weapon/hierophant_club/H = target + if(istype(target, /obj/item/hierophant_club)) + var/obj/item/hierophant_club/H = target if(H.teleporting) return 0 return ..() @@ -351,7 +351,7 @@ name = "Toggle Jetpack Stabilization" /datum/action/item_action/jetpack_stabilization/IsAvailable() - var/obj/item/weapon/tank/jetpack/J = target + var/obj/item/tank/jetpack/J = target if(!istype(J) || !J.on) return 0 return ..() diff --git a/code/datums/antagonists/datum_traitor.dm b/code/datums/antagonists/datum_traitor.dm index d706eff62b5..245c620dd36 100644 --- a/code/datums/antagonists/datum_traitor.dm +++ b/code/datums/antagonists/datum_traitor.dm @@ -320,11 +320,11 @@ //Spawn and equip documents var/mob/living/carbon/human/mob = owner.current - var/obj/item/weapon/folder/syndicate/folder + var/obj/item/folder/syndicate/folder if(owner == SSticker.mode.exchange_red) - folder = new/obj/item/weapon/folder/syndicate/red(mob.loc) + folder = new/obj/item/folder/syndicate/red(mob.loc) else - folder = new/obj/item/weapon/folder/syndicate/blue(mob.loc) + folder = new/obj/item/folder/syndicate/blue(mob.loc) var/list/slots = list ( "backpack" = slot_in_backpack, diff --git a/code/datums/antagonists/devil.dm b/code/datums/antagonists/devil.dm index 077fb94e523..733947fe28e 100644 --- a/code/datums/antagonists/devil.dm +++ b/code/datums/antagonists/devil.dm @@ -437,8 +437,8 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", var/mob/living/carbon/human/H = owner.current H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_hands) - H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), slot_hands) + H.equip_to_slot_or_del(new /obj/item/pen(H), slot_l_store) if(SOULVALUE >= BLOOD_THRESHOLD) H.set_species(/datum/species/lizard, 1) H.underwear = "Nude" diff --git a/code/datums/antagonists/ninja.dm b/code/datums/antagonists/ninja.dm index 4efb17f1540..bd7bb13a1d7 100644 --- a/code/datums/antagonists/ninja.dm +++ b/code/datums/antagonists/ninja.dm @@ -29,7 +29,7 @@ qdel(H.gloves) var/obj/item/clothing/suit/space/space_ninja/theSuit = new(H) - var/obj/item/weapon/dash/energy_katana/EK = new(H) + var/obj/item/dash/energy_katana/EK = new(H) theSuit.energyKatana = EK H.equip_to_slot_or_del(new /obj/item/device/radio/headset(H), slot_ears) @@ -42,12 +42,12 @@ H.equip_to_slot_or_del(new /obj/item/clothing/glasses/night(H), slot_glasses) H.equip_to_slot_or_del(EK, slot_belt) H.equip_to_slot_or_del(new /obj/item/device/flashlight(H), slot_r_store) - H.equip_to_slot_or_del(new /obj/item/weapon/grenade/plastic/x4(H), slot_l_store) - H.equip_to_slot_or_del(new /obj/item/weapon/tank/internals/emergency_oxygen(H), slot_s_store) - H.equip_to_slot_or_del(new /obj/item/weapon/tank/jetpack/carbondioxide(H), slot_back) + H.equip_to_slot_or_del(new /obj/item/grenade/plastic/x4(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/tank/internals/emergency_oxygen(H), slot_s_store) + H.equip_to_slot_or_del(new /obj/item/tank/jetpack/carbondioxide(H), slot_back) theSuit.randomize_param() - var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(H) + var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) E.implant(H) return 1 diff --git a/code/datums/datacore.dm b/code/datums/datacore.dm index e4e7ef0e166..005c02c355e 100644 --- a/code/datums/datacore.dm +++ b/code/datums/datacore.dm @@ -210,8 +210,8 @@ if(!C) C = H.client var/image = get_id_photo(H, C) - var/obj/item/weapon/photo/photo_front = new() - var/obj/item/weapon/photo/photo_side = new() + var/obj/item/photo/photo_front = new() + var/obj/item/photo/photo_side = new() photo_front.photocreate(null, icon(image, dir = SOUTH)) photo_side.photocreate(null, icon(image, dir = WEST)) diff --git a/code/datums/diseases/_MobProcs.dm b/code/datums/diseases/_MobProcs.dm index 6d26246c387..1d3e7f2a12a 100644 --- a/code/datums/diseases/_MobProcs.dm +++ b/code/datums/diseases/_MobProcs.dm @@ -92,7 +92,7 @@ switch(target_zone) if(1) - if(isobj(H.head) && !istype(H.head, /obj/item/weapon/paper)) + if(isobj(H.head) && !istype(H.head, /obj/item/paper)) Cl = H.head passed = prob((Cl.permeability_coefficient*100) - 1) if(passed && isobj(H.wear_mask)) diff --git a/code/datums/diseases/wizarditis.dm b/code/datums/diseases/wizarditis.dm index 4f1e731cfe4..fbdb107c83f 100644 --- a/code/datums/diseases/wizarditis.dm +++ b/code/datums/diseases/wizarditis.dm @@ -78,7 +78,7 @@ STI KALY - blind else var/mob/living/carbon/H = affected_mob if(prob(chance)) - var/obj/item/weapon/staff/S = new(H) + var/obj/item/staff/S = new(H) if(!H.put_in_hands(S)) qdel(S) diff --git a/code/datums/emotes.dm b/code/datums/emotes.dm index 78cbd02e8f2..455ec0f62ae 100644 --- a/code/datums/emotes.dm +++ b/code/datums/emotes.dm @@ -38,7 +38,7 @@ msg = replace_pronoun(user, msg) var/mob/living/L = user - for(var/obj/item/weapon/implant/I in L.implants) + for(var/obj/item/implant/I in L.implants) I.trigger(key, L) if(!msg) diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm index 473df2ec7cf..fc943a80499 100644 --- a/code/datums/helper_datums/teleport.dm +++ b/code/datums/helper_datums/teleport.dm @@ -149,10 +149,10 @@ /datum/teleport/instant/science/setPrecision(aprecision) ..() - if(istype(teleatom, /obj/item/weapon/storage/backpack/holding)) + if(istype(teleatom, /obj/item/storage/backpack/holding)) precision = rand(1,100) - var/list/bagholding = teleatom.search_contents_for(/obj/item/weapon/storage/backpack/holding) + var/list/bagholding = teleatom.search_contents_for(/obj/item/storage/backpack/holding) if(bagholding.len) precision = max(rand(1,100)*bagholding.len,100) if(isliving(teleatom)) diff --git a/code/datums/martial/cqc.dm b/code/datums/martial/cqc.dm index 53e56218e57..d740a4213c8 100644 --- a/code/datums/martial/cqc.dm +++ b/code/datums/martial/cqc.dm @@ -181,13 +181,13 @@ to_chat(usr, "In addition, by having your throw mode on when being attacked, you enter an active defense mode where you have a chance to block and sometimes even counter attacks done to you.") -/obj/item/weapon/cqc_manual +/obj/item/cqc_manual name = "old manual" desc = "A small, black manual. There are drawn instructions of tactical hand-to-hand combat." icon = 'icons/obj/library.dmi' icon_state ="cqcmanual" -/obj/item/weapon/cqc_manual/attack_self(mob/living/carbon/human/user) +/obj/item/cqc_manual/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return to_chat(user, "You remember the basics of CQC.") diff --git a/code/datums/martial/plasma_fist.dm b/code/datums/martial/plasma_fist.dm index c79ef032ee4..ef36719032b 100644 --- a/code/datums/martial/plasma_fist.dm +++ b/code/datums/martial/plasma_fist.dm @@ -93,14 +93,14 @@ to_chat(usr, "Throwback: Disarm Harm Disarm. Throws the target and an item at them.") to_chat(usr, "The Plasma Fist: Harm Disarm Disarm Disarm Harm. Knocks the brain out of the opponent and gibs their body.") -/obj/item/weapon/plasma_fist_scroll +/obj/item/plasma_fist_scroll name = "frayed scroll" desc = "An aged and frayed scrap of paper written in shifting runes. There are hand-drawn illustrations of pugilism." icon = 'icons/obj/wizard.dmi' icon_state ="scroll2" var/used = 0 -/obj/item/weapon/plasma_fist_scroll/attack_self(mob/user) +/obj/item/plasma_fist_scroll/attack_self(mob/user) if(!ishuman(user)) return if(!used) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 421498559ef..469bbb94e80 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -154,13 +154,13 @@ to_chat(usr, "Head Kick: Disarm Harm Harm. Decent damage, forces opponent to drop item in hand.") to_chat(usr, "Elbow Drop: Harm Disarm Harm Disarm Harm. Opponent must be on the ground. Deals huge damage, instantly kills anyone in critical condition.") -/obj/item/weapon/sleeping_carp_scroll +/obj/item/sleeping_carp_scroll name = "mysterious scroll" desc = "A scroll filled with strange markings. It seems to be drawings of some sort of martial art." icon = 'icons/obj/wizard.dmi' icon_state = "scroll2" -/obj/item/weapon/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user) +/obj/item/sleeping_carp_scroll/attack_self(mob/living/carbon/human/user) if(!istype(user) || !user) return var/message = "You have learned the ancient martial art of the Sleeping Carp! Your hand-to-hand combat has become much more effective, and you are now able to deflect any projectiles \ @@ -173,7 +173,7 @@ new /obj/effect/decal/cleanable/ash(get_turf(src)) qdel(src) -/obj/item/weapon/twohanded/bostaff +/obj/item/twohanded/bostaff name = "bo staff" desc = "A long, tall staff made of polished wood. Traditionally used in ancient old-Earth martial arts. Can be wielded to both kill and incapacitate." force = 10 @@ -190,11 +190,11 @@ righthand_file = 'icons/mob/inhands/weapons/staves_righthand.dmi' block_chance = 50 -/obj/item/weapon/twohanded/bostaff/update_icon() +/obj/item/twohanded/bostaff/update_icon() icon_state = "bostaff[wielded]" return -/obj/item/weapon/twohanded/bostaff/attack(mob/target, mob/living/user) +/obj/item/twohanded/bostaff/attack(mob/target, mob/living/user) add_fingerprint(user) if((CLUMSY in user.disabilities) && prob(50)) to_chat(user, "You club yourself over the head with [src].") @@ -243,7 +243,7 @@ else return ..() -/obj/item/weapon/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) +/obj/item/twohanded/bostaff/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(wielded) return ..() return 0 diff --git a/code/datums/martial/wrestling.dm b/code/datums/martial/wrestling.dm index 6216fe4d8c1..02e2d9614db 100644 --- a/code/datums/martial/wrestling.dm +++ b/code/datums/martial/wrestling.dm @@ -438,11 +438,11 @@ add_logs(A, D, "cinched") return 1 -/obj/item/weapon/storage/belt/champion/wrestling +/obj/item/storage/belt/champion/wrestling name = "Wrestling Belt" var/datum/martial_art/wrestling/style = new -/obj/item/weapon/storage/belt/champion/wrestling/equipped(mob/user, slot) +/obj/item/storage/belt/champion/wrestling/equipped(mob/user, slot) if(!ishuman(user)) return if(slot == slot_belt) @@ -450,7 +450,7 @@ style.teach(H,1) return -/obj/item/weapon/storage/belt/champion/wrestling/dropped(mob/user) +/obj/item/storage/belt/champion/wrestling/dropped(mob/user) if(!ishuman(user)) return var/mob/living/carbon/human/H = user diff --git a/code/datums/material_container.dm b/code/datums/material_container.dm index cfc4c13d91d..a8863c70bc1 100644 --- a/code/datums/material_container.dm +++ b/code/datums/material_container.dm @@ -223,7 +223,7 @@ name = "Metal" id = MAT_METAL sheet_type = /obj/item/stack/sheet/metal - coin_type = /obj/item/weapon/coin/iron + coin_type = /obj/item/coin/iron /datum/material/glass name = "Glass" @@ -234,31 +234,31 @@ name = "Silver" id = MAT_SILVER sheet_type = /obj/item/stack/sheet/mineral/silver - coin_type = /obj/item/weapon/coin/silver + coin_type = /obj/item/coin/silver /datum/material/gold name = "Gold" id = MAT_GOLD sheet_type = /obj/item/stack/sheet/mineral/gold - coin_type = /obj/item/weapon/coin/gold + coin_type = /obj/item/coin/gold /datum/material/diamond name = "Diamond" id = MAT_DIAMOND sheet_type = /obj/item/stack/sheet/mineral/diamond - coin_type = /obj/item/weapon/coin/diamond + coin_type = /obj/item/coin/diamond /datum/material/uranium name = "Uranium" id = MAT_URANIUM sheet_type = /obj/item/stack/sheet/mineral/uranium - coin_type = /obj/item/weapon/coin/uranium + coin_type = /obj/item/coin/uranium /datum/material/plasma name = "Solid Plasma" id = MAT_PLASMA sheet_type = /obj/item/stack/sheet/mineral/plasma - coin_type = /obj/item/weapon/coin/plasma + coin_type = /obj/item/coin/plasma /datum/material/bluespace name = "Bluespace Mesh" @@ -269,7 +269,7 @@ name = "Bananium" id = MAT_BANANIUM sheet_type = /obj/item/stack/sheet/mineral/bananium - coin_type = /obj/item/weapon/coin/clown + coin_type = /obj/item/coin/clown /datum/material/titanium name = "Titanium" diff --git a/code/datums/mind.dm b/code/datums/mind.dm index a31aab86074..af44f9c8ae9 100644 --- a/code/datums/mind.dm +++ b/code/datums/mind.dm @@ -271,7 +271,7 @@ var/list/all_contents = traitor_mob.GetAllContents() var/obj/item/device/pda/PDA = locate() in all_contents var/obj/item/device/radio/R = locate() in all_contents - var/obj/item/weapon/pen/P = locate() in all_contents //including your PDA-pen! + var/obj/item/pen/P = locate() in all_contents //including your PDA-pen! var/obj/item/uplink_loc @@ -1038,7 +1038,7 @@ if("takeequip") var/list/L = current.get_contents() - for(var/obj/item/weapon/pen/gang/pen in L) + for(var/obj/item/pen/gang/pen in L) qdel(pen) for(var/obj/item/device/gangtool/gangtool in L) qdel(gangtool) diff --git a/code/datums/outfit.dm b/code/datums/outfit.dm index 1cced13cb42..8d4413171d1 100755 --- a/code/datums/outfit.dm +++ b/code/datums/outfit.dm @@ -101,7 +101,7 @@ H.update_action_buttons_icon() if(implants) for(var/implant_type in implants) - var/obj/item/weapon/implant/I = new implant_type(H) + var/obj/item/implant/I = new implant_type(H) I.implant(H, null, silent=TRUE) H.update_body() diff --git a/code/datums/recipe.dm b/code/datums/recipe.dm index 37a2c1e930e..0ceb4443de1 100644 --- a/code/datums/recipe.dm +++ b/code/datums/recipe.dm @@ -35,8 +35,8 @@ /datum/recipe var/list/reagents_list // example: = list("berryjuice" = 5) // do not list same reagent twice - var/list/items // example: =list(/obj/item/weapon/crowbar, /obj/item/weapon/welder) // place /foo/bar before /foo - var/result //example: = /obj/item/weapon/reagent_containers/food/snacks/donut + var/list/items // example: =list(/obj/item/crowbar, /obj/item/welder) // place /foo/bar before /foo + var/result //example: = /obj/item/reagent_containers/food/snacks/donut var/time = 100 // 1/10 part of second diff --git a/code/datums/riding.dm b/code/datums/riding.dm index e202fda1b80..94e78304eec 100644 --- a/code/datums/riding.dm +++ b/code/datums/riding.dm @@ -255,7 +255,7 @@ ///////////////BOATS//////////// /datum/riding/boat - keytype = /obj/item/weapon/oar + keytype = /obj/item/oar /datum/riding/boat/handle_ride(mob/user, direction) var/turf/next = get_step(ridden, direction) diff --git a/code/datums/status_effects/buffs.dm b/code/datums/status_effects/buffs.dm index c15ede7b3e3..69749475cd0 100644 --- a/code/datums/status_effects/buffs.dm +++ b/code/datums/status_effects/buffs.dm @@ -192,7 +192,7 @@ /datum/status_effect/his_grace/tick() bloodlust = 0 var/graces = 0 - for(var/obj/item/weapon/his_grace/HG in owner.held_items) + for(var/obj/item/his_grace/HG in owner.held_items) if(HG.bloodthirst > bloodlust) bloodlust = HG.bloodthirst if(HG.awakened) diff --git a/code/datums/status_effects/debuffs.dm b/code/datums/status_effects/debuffs.dm index bd46778c190..2c651b77388 100644 --- a/code/datums/status_effects/debuffs.dm +++ b/code/datums/status_effects/debuffs.dm @@ -85,7 +85,7 @@ alerttooltipstyle = "hisgrace" /datum/status_effect/his_wrath/tick() - for(var/obj/item/weapon/his_grace/HG in owner.held_items) + for(var/obj/item/his_grace/HG in owner.held_items) qdel(src) return owner.adjustBruteLoss(0.1) @@ -243,9 +243,9 @@ status_type = STATUS_EFFECT_REPLACE alert_type = null var/mutable_appearance/marked_underlay - var/obj/item/weapon/twohanded/required/kinetic_crusher/hammer_synced + var/obj/item/twohanded/required/kinetic_crusher/hammer_synced -/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/weapon/twohanded/required/kinetic_crusher/new_hammer_synced) +/datum/status_effect/crusher_mark/on_creation(mob/living/new_owner, obj/item/twohanded/required/kinetic_crusher/new_hammer_synced) . = ..() if(.) hammer_synced = new_hammer_synced diff --git a/code/datums/wires/explosive.dm b/code/datums/wires/explosive.dm index 0715867fe62..9de3b04333f 100644 --- a/code/datums/wires/explosive.dm +++ b/code/datums/wires/explosive.dm @@ -13,16 +13,16 @@ /datum/wires/explosive/c4 - holder_type = /obj/item/weapon/grenade/plastic/c4 + holder_type = /obj/item/grenade/plastic/c4 randomize = TRUE //Same behaviour since no wire actually disarms it /datum/wires/explosive/c4/interactable(mob/user) - var/obj/item/weapon/grenade/plastic/c4/P = holder + var/obj/item/grenade/plastic/c4/P = holder if(P.open_panel) return TRUE /datum/wires/explosive/c4/explode() - var/obj/item/weapon/grenade/plastic/c4/P = holder + var/obj/item/grenade/plastic/c4/P = holder P.explode() @@ -73,8 +73,8 @@ /datum/wires/explosive/gibtonite - holder_type = /obj/item/weapon/twohanded/required/gibtonite + holder_type = /obj/item/twohanded/required/gibtonite /datum/wires/explosive/gibtonite/explode() - var/obj/item/weapon/twohanded/required/gibtonite/P = holder + var/obj/item/twohanded/required/gibtonite/P = holder P.GibtoniteReaction(null, 2) \ No newline at end of file diff --git a/code/datums/wires/wires.dm b/code/datums/wires/wires.dm index 51f86270f2a..95267cf9277 100644 --- a/code/datums/wires/wires.dm +++ b/code/datums/wires/wires.dm @@ -3,7 +3,7 @@ /proc/is_wire_tool(obj/item/I) if(istype(I, /obj/item/device/multitool)) return TRUE - if(istype(I, /obj/item/weapon/wirecutters)) + if(istype(I, /obj/item/wirecutters)) return TRUE if(istype(I, /obj/item/device/assembly)) var/obj/item/device/assembly/A = I @@ -227,7 +227,7 @@ var/obj/item/I = L.get_active_held_item() switch(action) if("cut") - if(istype(I, /obj/item/weapon/wirecutters) || IsAdminGhost(usr)) + if(istype(I, /obj/item/wirecutters) || IsAdminGhost(usr)) playsound(holder, I.usesound, 20, 1) cut_color(target_wire) . = TRUE diff --git a/code/game/atoms.dm b/code/game/atoms.dm index be3b904e456..f9eff53aa22 100644 --- a/code/game/atoms.dm +++ b/code/game/atoms.dm @@ -479,13 +479,13 @@ GLOBAL_LIST_EMPTY(blood_splatter_icons) /atom/proc/ratvar_act() return -/atom/proc/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd) +/atom/proc/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) return FALSE -/atom/proc/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode) +/atom/proc/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) return FALSE -/atom/proc/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) +/atom/proc/storage_contents_dump_act(obj/item/storage/src_object, mob/user) return 0 //This proc is called on the location of an atom when the atom is Destroy()'d diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm index 15345ef2f29..b2e2a7a829c 100644 --- a/code/game/atoms_movable.dm +++ b/code/game/atoms_movable.dm @@ -577,8 +577,8 @@ if(ismob(loc)) var/mob/M = loc M.transferItemToLoc(src, targetturf, TRUE) //nodrops disks when? - else if(istype(loc, /obj/item/weapon/storage)) - var/obj/item/weapon/storage/S = loc + else if(istype(loc, /obj/item/storage)) + var/obj/item/storage/S = loc S.remove_from_storage(src, targetturf) else forceMove(targetturf) diff --git a/code/game/data_huds.dm b/code/game/data_huds.dm index 2697df7ba90..ab329dfd292 100644 --- a/code/game/data_huds.dm +++ b/code/game/data_huds.dm @@ -202,18 +202,18 @@ for(var/i in list(IMPTRACK_HUD, IMPLOYAL_HUD, IMPCHEM_HUD)) holder = hud_list[i] holder.icon_state = null - for(var/obj/item/weapon/implant/I in implants) - if(istype(I, /obj/item/weapon/implant/tracking)) + for(var/obj/item/implant/I in implants) + if(istype(I, /obj/item/implant/tracking)) holder = hud_list[IMPTRACK_HUD] var/icon/IC = icon(icon, icon_state, dir) holder.pixel_y = IC.Height() - world.icon_size holder.icon_state = "hud_imp_tracking" - else if(istype(I, /obj/item/weapon/implant/mindshield)) + else if(istype(I, /obj/item/implant/mindshield)) holder = hud_list[IMPLOYAL_HUD] var/icon/IC = icon(icon, icon_state, dir) holder.pixel_y = IC.Height() - world.icon_size holder.icon_state = "hud_imp_loyal" - else if(istype(I, /obj/item/weapon/implant/chem)) + else if(istype(I, /obj/item/implant/chem)) holder = hud_list[IMPCHEM_HUD] var/icon/IC = icon(icon, icon_state, dir) holder.pixel_y = IC.Height() - world.icon_size diff --git a/code/game/gamemodes/antag_spawner.dm b/code/game/gamemodes/antag_spawner.dm index 8a6d0063b9e..a485bc2d1ae 100644 --- a/code/game/gamemodes/antag_spawner.dm +++ b/code/game/gamemodes/antag_spawner.dm @@ -1,25 +1,25 @@ -/obj/item/weapon/antag_spawner +/obj/item/antag_spawner throw_speed = 1 throw_range = 5 w_class = WEIGHT_CLASS_TINY var/used = 0 -/obj/item/weapon/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "") +/obj/item/antag_spawner/proc/spawn_antag(client/C, turf/T, type = "") return -/obj/item/weapon/antag_spawner/proc/equip_antag(mob/target) +/obj/item/antag_spawner/proc/equip_antag(mob/target) return ///////////WIZARD -/obj/item/weapon/antag_spawner/contract +/obj/item/antag_spawner/contract name = "contract" desc = "A magic contract previously signed by an apprentice. In exchange for instruction in the magical arts, they are bound to answer your call for aid." icon = 'icons/obj/wizard.dmi' icon_state ="scroll2" -/obj/item/weapon/antag_spawner/contract/attack_self(mob/user) +/obj/item/antag_spawner/contract/attack_self(mob/user) user.set_machine(src) var/dat if(used) @@ -41,7 +41,7 @@ onclose(user, "radio") return -/obj/item/weapon/antag_spawner/contract/Topic(href, href_list) +/obj/item/antag_spawner/contract/Topic(href, href_list) ..() var/mob/living/carbon/human/H = usr @@ -69,7 +69,7 @@ else to_chat(H, "Unable to reach your apprentice! You can either attack the spellbook with the contract to refund your points, or wait and try again later.") -/obj/item/weapon/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "") +/obj/item/antag_spawner/contract/spawn_antag(client/C, turf/T, type = "") new /obj/effect/particle_effect/smoke(T) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) C.prefs.copy_to(M) @@ -90,7 +90,7 @@ if("healing") M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/charge(null)) M.mind.AddSpell(new /obj/effect/proc_holder/spell/targeted/forcewall(null)) - M.put_in_hands_or_del(new /obj/item/weapon/gun/magic/staff/healing(M)) + M.put_in_hands_or_del(new /obj/item/gun/magic/staff/healing(M)) to_chat(M, "Your service has not gone unrewarded, however. Studying under [wizard_name], you have learned livesaving survival spells. You are able to cast charge and forcewall.") if("robeless") M.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/knock(null)) @@ -120,26 +120,26 @@ M.age = rand(AGE_MIN, WIZARD_AGE_MIN - 1) M.dna.update_dna_identity() -/obj/item/weapon/antag_spawner/contract/equip_antag(mob/target) +/obj/item/antag_spawner/contract/equip_antag(mob/target) target.equip_to_slot_or_del(new /obj/item/device/radio/headset(target), slot_ears) target.equip_to_slot_or_del(new /obj/item/clothing/under/color/lightpurple(target), slot_w_uniform) target.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(target), slot_shoes) target.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(target), slot_wear_suit) target.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(target), slot_head) - target.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(target), slot_back) - target.equip_to_slot_or_del(new /obj/item/weapon/storage/box(target), slot_in_backpack) - target.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll/apprentice(target), slot_r_store) + target.equip_to_slot_or_del(new /obj/item/storage/backpack(target), slot_back) + target.equip_to_slot_or_del(new /obj/item/storage/box(target), slot_in_backpack) + target.equip_to_slot_or_del(new /obj/item/teleportation_scroll/apprentice(target), slot_r_store) ///////////BORGS AND OPERATIVES -/obj/item/weapon/antag_spawner/nuke_ops +/obj/item/antag_spawner/nuke_ops name = "syndicate operative teleporter" desc = "A single-use teleporter designed to quickly reinforce operatives in the field." icon = 'icons/obj/device.dmi' icon_state = "locator" var/borg_to_spawn -/obj/item/weapon/antag_spawner/nuke_ops/proc/check_usability(mob/user) +/obj/item/antag_spawner/nuke_ops/proc/check_usability(mob/user) if(used) to_chat(user, "[src] is out of power!") return FALSE @@ -152,7 +152,7 @@ return TRUE -/obj/item/weapon/antag_spawner/nuke_ops/attack_self(mob/user) +/obj/item/antag_spawner/nuke_ops/attack_self(mob/user) if(!(check_usability(user))) return @@ -169,7 +169,7 @@ else to_chat(user, "Unable to connect to Syndicate command. Please wait and try again later or use the teleporter on your uplink to get your points refunded.") -/obj/item/weapon/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T) +/obj/item/antag_spawner/nuke_ops/spawn_antag(client/C, turf/T) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) C.prefs.copy_to(M) M.key = C.key @@ -184,21 +184,21 @@ M.name = newname //////SYNDICATE BORG -/obj/item/weapon/antag_spawner/nuke_ops/borg_tele +/obj/item/antag_spawner/nuke_ops/borg_tele name = "syndicate cyborg teleporter" desc = "A single-use teleporter designed to quickly reinforce operatives in the field.." icon = 'icons/obj/device.dmi' icon_state = "locator" -/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/assault +/obj/item/antag_spawner/nuke_ops/borg_tele/assault name = "syndicate assault cyborg teleporter" borg_to_spawn = "Assault" -/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/medical +/obj/item/antag_spawner/nuke_ops/borg_tele/medical name = "syndicate medical teleporter" borg_to_spawn = "Medical" -/obj/item/weapon/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T) +/obj/item/antag_spawner/nuke_ops/borg_tele/spawn_antag(client/C, turf/T) var/mob/living/silicon/robot/R switch(borg_to_spawn) if("Medical") @@ -224,7 +224,7 @@ ///////////SLAUGHTER DEMON -/obj/item/weapon/antag_spawner/slaughter_demon //Warning edgiest item in the game +/obj/item/antag_spawner/slaughter_demon //Warning edgiest item in the game name = "vial of blood" desc = "A magically infused bottle of blood, distilled from countless murder victims. Used in unholy rituals to attract horrifying creatures." icon = 'icons/obj/wizard.dmi' @@ -236,7 +236,7 @@ var/mob/living/demon_type = /mob/living/simple_animal/slaughter -/obj/item/weapon/antag_spawner/slaughter_demon/attack_self(mob/user) +/obj/item/antag_spawner/slaughter_demon/attack_self(mob/user) if(user.z != ZLEVEL_STATION) to_chat(user, "You should probably wait until you reach the station.") return @@ -257,7 +257,7 @@ to_chat(user, "You can't seem to work up the nerve to shatter the bottle. Perhaps you should try again later.") -/obj/item/weapon/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "") +/obj/item/antag_spawner/slaughter_demon/spawn_antag(client/C, turf/T, type = "") var /obj/effect/dummy/slaughter/holder = new /obj/effect/dummy/slaughter(T) var/mob/living/simple_animal/slaughter/S = new demon_type(holder) @@ -284,7 +284,7 @@ to_chat(S, "Objective #[1]: [new_objective.explanation_text]") to_chat(S, "Objective #[new_objective ? "[2]":"[1]"]: [new_objective2.explanation_text]") -/obj/item/weapon/antag_spawner/slaughter_demon/laughter +/obj/item/antag_spawner/slaughter_demon/laughter name = "vial of tickles" desc = "A magically infused bottle of clown love, distilled from countless hugging attacks. Used in funny rituals to attract adorable creatures." icon = 'icons/obj/wizard.dmi' diff --git a/code/game/gamemodes/antag_spawner_cit.dm b/code/game/gamemodes/antag_spawner_cit.dm index c65ac11c6b7..34e72d9004a 100644 --- a/code/game/gamemodes/antag_spawner_cit.dm +++ b/code/game/gamemodes/antag_spawner_cit.dm @@ -1,12 +1,12 @@ ////////////Syndicate Cortical Borer -obj/item/weapon/antag_spawner/syndi_borer +obj/item/antag_spawner/syndi_borer name = "syndicate brain-slug container" desc = "Releases a modified cortical borer to assist the user." icon = 'icons/obj/device.dmi' //Temporary? Doesn't really look like a container for xenofauna... but IDK what else could work. icon_state = "locator" var/polling = FALSE -obj/item/weapon/antag_spawner/syndi_borer/spawn_antag(client/C, turf/T, mob/owner) +obj/item/antag_spawner/syndi_borer/spawn_antag(client/C, turf/T, mob/owner) var/mob/living/simple_animal/borer/syndi_borer/B = new /mob/living/simple_animal/borer/syndi_borer(T) B.key = C.key @@ -27,7 +27,7 @@ obj/item/weapon/antag_spawner/syndi_borer/spawn_antag(client/C, turf/T, mob/owne if(new_objective) to_chat(B, "Objective #[1]: [new_objective.explanation_text]") SSticker.mode.update_borer_icons_added(B) -/obj/item/weapon/antag_spawner/syndi_borer/proc/check_usability(mob/user) +/obj/item/antag_spawner/syndi_borer/proc/check_usability(mob/user) if(used) to_chat(user, "[src] appears to be empty!") return 0 @@ -36,7 +36,7 @@ obj/item/weapon/antag_spawner/syndi_borer/spawn_antag(client/C, turf/T, mob/owne return 0 return 1 -/obj/item/weapon/antag_spawner/syndi_borer/attack_self(mob/user) +/obj/item/antag_spawner/syndi_borer/attack_self(mob/user) if(!(check_usability(user))) return polling = TRUE diff --git a/code/game/gamemodes/changeling/powers/mutations.dm b/code/game/gamemodes/changeling/powers/mutations.dm index 76696585220..dc290b8fa99 100644 --- a/code/game/gamemodes/changeling/powers/mutations.dm +++ b/code/game/gamemodes/changeling/powers/mutations.dm @@ -137,10 +137,10 @@ chemical_cost = 20 dna_cost = 2 req_human = 1 - weapon_type = /obj/item/weapon/melee/arm_blade + weapon_type = /obj/item/melee/arm_blade weapon_name_simple = "blade" -/obj/item/weapon/melee/arm_blade +/obj/item/melee/arm_blade name = "arm blade" desc = "A grotesque blade made out of bone and flesh that cleaves through people as a hot knife through butter." icon = 'icons/obj/weapons.dmi' @@ -159,14 +159,14 @@ sharpness = IS_SHARP var/can_drop = FALSE -/obj/item/weapon/melee/arm_blade/Initialize(mapload,silent,synthetic) +/obj/item/melee/arm_blade/Initialize(mapload,silent,synthetic) . = ..() if(ismob(loc) && !silent) loc.visible_message("A grotesque blade forms around [loc.name]\'s arm!", "Our arm twists and mutates, transforming it into a deadly blade.", "You hear organic matter ripping and tearing!") if(synthetic) can_drop = TRUE -/obj/item/weapon/melee/arm_blade/afterattack(atom/target, mob/user, proximity) +/obj/item/melee/arm_blade/afterattack(atom/target, mob/user, proximity) if(!proximity) return if(istype(target, /obj/structure/table)) @@ -197,10 +197,10 @@ "You hear a metal screeching sound.") A.open(2) -/obj/item/weapon/melee/arm_blade/dropped(mob/user) +/obj/item/melee/arm_blade/dropped(mob/user) ..() if(can_drop) - new /obj/item/weapon/melee/synthetic_arm_blade(get_turf(user)) + new /obj/item/melee/synthetic_arm_blade(get_turf(user)) /***************************************\ |***********COMBAT TENTACLES*************| @@ -215,11 +215,11 @@ chemical_cost = 10 dna_cost = 2 req_human = 1 - weapon_type = /obj/item/weapon/gun/magic/tentacle + weapon_type = /obj/item/gun/magic/tentacle weapon_name_simple = "tentacle" silent = TRUE -/obj/item/weapon/gun/magic/tentacle +/obj/item/gun/magic/tentacle name = "tentacle" desc = "A fleshy tentacle that can stretch out and grab things or people." icon = 'icons/obj/weapons.dmi' @@ -237,7 +237,7 @@ throw_range = 0 throw_speed = 0 -/obj/item/weapon/gun/magic/tentacle/Initialize(mapload, silent) +/obj/item/gun/magic/tentacle/Initialize(mapload, silent) . = ..() if(ismob(loc)) if(!silent) @@ -246,10 +246,10 @@ to_chat(loc, "You prepare to extend a tentacle.") -/obj/item/weapon/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) +/obj/item/gun/magic/tentacle/shoot_with_empty_chamber(mob/living/user as mob|obj) to_chat(user, "The [name] is not ready yet.") -/obj/item/weapon/gun/magic/tentacle/suicide_act(mob/user) +/obj/item/gun/magic/tentacle/suicide_act(mob/user) user.visible_message("[user] coils [src] tightly around [user.p_their()] neck! It looks like [user.p_theyre()] trying to commit suicide!") return (OXYLOSS) @@ -261,7 +261,7 @@ caliber = "tentacle" icon_state = "tentacle_end" firing_effect_type = null - var/obj/item/weapon/gun/magic/tentacle/gun //the item that shot it + var/obj/item/gun/magic/tentacle/gun //the item that shot it /obj/item/ammo_casing/magic/tentacle/Initialize() gun = loc @@ -380,7 +380,7 @@ dna_cost = 1 req_human = 1 - weapon_type = /obj/item/weapon/shield/changeling + weapon_type = /obj/item/shield/changeling weapon_name_simple = "shield" /obj/effect/proc_holder/changeling/weapon/shield/sting_action(mob/user) @@ -388,11 +388,11 @@ if(!changeling) return - var/obj/item/weapon/shield/changeling/S = ..(user) + var/obj/item/shield/changeling/S = ..(user) S.remaining_uses = round(changeling.absorbedcount * 3) return TRUE -/obj/item/weapon/shield/changeling +/obj/item/shield/changeling name = "shield-like mass" desc = "A mass of tough, boney tissue. You can still see the fingers as a twisted pattern in the shield." flags_1 = ABSTRACT_1 | NODROP_1 | DROPDEL_1 @@ -404,12 +404,12 @@ var/remaining_uses //Set by the changeling ability. -/obj/item/weapon/shield/changeling/Initialize() +/obj/item/shield/changeling/Initialize() . = ..() if(ismob(loc)) loc.visible_message("The end of [loc.name]\'s hand inflates rapidly, forming a huge shield-like mass!", "We inflate our hand into a strong shield.", "You hear organic matter ripping and tearing!") -/obj/item/weapon/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) +/obj/item/shield/changeling/hit_reaction(mob/living/carbon/human/owner, atom/movable/hitby, attack_text = "the attack", final_block_chance = 0, damage = 0, attack_type = MELEE_ATTACK) if(remaining_uses < 1) if(ishuman(loc)) var/mob/living/carbon/human/H = loc @@ -444,7 +444,7 @@ icon_state = "lingspacesuit" desc = "A huge, bulky mass of pressure and temperature-resistant organic tissue, evolved to facilitate space travel." flags_1 = STOPSPRESSUREDMAGE_1 | NODROP_1 | DROPDEL_1 //Not THICKMATERIAL_1 because it's organic tissue, so if somebody tries to inject something into it, it still ends up in your blood. (also balance but muh fluff) - allowed = list(/obj/item/device/flashlight, /obj/item/weapon/tank/internals/emergency_oxygen, /obj/item/weapon/tank/internals/oxygen) + allowed = list(/obj/item/device/flashlight, /obj/item/tank/internals/emergency_oxygen, /obj/item/tank/internals/oxygen) armor = list(melee = 0, bullet = 0, laser = 0,energy = 0, bomb = 0, bio = 0, rad = 0, fire = 90, acid = 90) //No armor at all. /obj/item/clothing/suit/space/changeling/Initialize() diff --git a/code/game/gamemodes/changeling/powers/tiny_prick.dm b/code/game/gamemodes/changeling/powers/tiny_prick.dm index 8f8e422ea53..6a680f27d69 100644 --- a/code/game/gamemodes/changeling/powers/tiny_prick.dm +++ b/code/game/gamemodes/changeling/powers/tiny_prick.dm @@ -109,11 +109,11 @@ chemical_cost = 20 dna_cost = 1 -/obj/item/weapon/melee/arm_blade/false +/obj/item/melee/arm_blade/false desc = "A grotesque mass of flesh that used to be your arm. Although it looks dangerous at first, you can tell it's actually quite dull and useless." force = 5 //Basically as strong as a punch -/obj/item/weapon/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity) +/obj/item/melee/arm_blade/false/afterattack(atom/target, mob/user, proximity) return /obj/effect/proc_holder/changeling/sting/false_armblade/can_sting(mob/user, mob/target) @@ -134,7 +134,7 @@ if(ismonkey(target)) to_chat(user, "Our genes cry out as we sting [target.name]!") - var/obj/item/weapon/melee/arm_blade/false/blade = new(target,1) + var/obj/item/melee/arm_blade/false/blade = new(target,1) target.put_in_hands(blade) target.visible_message("A grotesque blade forms around [target.name]\'s arm!", "Your arm twists and mutates, transforming into a horrific monstrosity!", "You hear organic matter ripping and tearing!") playsound(target, 'sound/effects/blobattack.ogg', 30, 1) @@ -142,7 +142,7 @@ addtimer(CALLBACK(src, .proc/remove_fake, target, blade), 600) return TRUE -/obj/effect/proc_holder/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/weapon/melee/arm_blade/false/blade) +/obj/effect/proc_holder/changeling/sting/false_armblade/proc/remove_fake(mob/target, obj/item/melee/arm_blade/false/blade) playsound(target, 'sound/effects/blobattack.ogg', 30, 1) target.visible_message("With a sickening crunch, \ [target] reforms their [blade.name] into an arm!", diff --git a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm index 057d4248386..a6eb5fb4e73 100644 --- a/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm +++ b/code/game/gamemodes/clock_cult/clock_effects/spatial_gateway.dm @@ -80,7 +80,7 @@ return TRUE /obj/effect/clockwork/spatial_gateway/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/weapon/nullrod)) + if(istype(I, /obj/item/nullrod)) user.visible_message("[user] dispels [src] with [I]!", "You close [src] with [I]!") qdel(linked_gateway) qdel(src) diff --git a/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm b/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm index 9380e46487a..7658f7e715e 100644 --- a/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm +++ b/code/game/gamemodes/clock_cult/clock_helpers/clock_powerdrain.dm @@ -1,14 +1,14 @@ //horrifying power drain proc made for clockcult's power drain in lieu of six istypes or six for(x in view) loops /atom/movable/proc/power_drain(clockcult_user) - var/obj/item/weapon/stock_parts/cell/cell = get_cell() + var/obj/item/stock_parts/cell/cell = get_cell() if(cell) return cell.power_drain(clockcult_user) return 0 -/obj/item/weapon/melee/baton/power_drain(clockcult_user) //balance memes +/obj/item/melee/baton/power_drain(clockcult_user) //balance memes return 0 -/obj/item/weapon/gun/power_drain(clockcult_user) //balance memes +/obj/item/gun/power_drain(clockcult_user) //balance memes return 0 /obj/machinery/power/apc/power_drain(clockcult_user) @@ -34,7 +34,7 @@ visible_message("[src]'s panel flies open with a flurry of sparks!") update_icon() -/obj/item/weapon/stock_parts/cell/power_drain(clockcult_user) +/obj/item/stock_parts/cell/power_drain(clockcult_user) if(charge) . = min(charge, MIN_CLOCKCULT_POWER*3) charge = use(.) diff --git a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm index 6dec7258f64..06b3ac7885d 100644 --- a/code/game/gamemodes/clock_cult/clock_items/clock_components.dm +++ b/code/game/gamemodes/clock_cult/clock_items/clock_components.dm @@ -15,7 +15,7 @@ to_chat(user, "[cultist_message]") if(user.mind && user.mind.isholy) to_chat(user, "The power of your faith melts away the [src]!") - var/obj/item/weapon/ore/slag/wrath = new /obj/item/weapon/ore/slag + var/obj/item/ore/slag/wrath = new /obj/item/ore/slag qdel(src) user.put_in_active_hand(wrath) if(is_servant_of_ratvar(user) && prob(20)) diff --git a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm index ded8ec4a9c6..3f7e826017a 100644 --- a/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm +++ b/code/game/gamemodes/clock_cult/clock_items/replica_fabricator.dm @@ -144,7 +144,7 @@ to_chat(user, "You use [stored_power ? "some":"all"] of [src]'s power to produce 5 brass sheets. It now stores [get_power()]W/[get_max_power()]W of power.") /obj/item/clockwork/replica_fabricator/pre_attackby(atom/target, mob/living/user, params) - if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/weapon/storage)) + if(!target || !user || !is_servant_of_ratvar(user) || istype(target, /obj/item/storage)) return TRUE return fabricate(target, user) diff --git a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm index 7aebb6987b8..abbc86089d7 100644 --- a/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm +++ b/code/game/gamemodes/clock_cult/clock_mobs/clockwork_marauder.dm @@ -156,7 +156,7 @@ /mob/living/simple_animal/hostile/clockwork/marauder/adjustHealth(amount, updating_health = TRUE, forced = FALSE) if(amount > 0) for(var/mob/living/L in view(2, src)) - if(L.is_holding_item_of_type(/obj/item/weapon/nullrod)) + if(L.is_holding_item_of_type(/obj/item/nullrod)) to_chat(src, "The presence of a brandished holy artifact weakens your armor!") amount *= 4 //if a wielded null rod is nearby, it takes four times the health damage break @@ -258,7 +258,7 @@ return ..() /mob/living/simple_animal/hostile/clockwork/marauder/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/nullrod) || !blockOrCounter(user, I)) + if(istype(I, /obj/item/nullrod) || !blockOrCounter(user, I)) return ..() /mob/living/simple_animal/hostile/clockwork/marauder/proc/blockOrCounter(mob/target, atom/textobject) diff --git a/code/game/gamemodes/clock_cult/clock_structure.dm b/code/game/gamemodes/clock_cult/clock_structure.dm index 6762bb29b89..0c29361e591 100644 --- a/code/game/gamemodes/clock_cult/clock_structure.dm +++ b/code/game/gamemodes/clock_cult/clock_structure.dm @@ -99,7 +99,7 @@ return ..() /obj/structure/destructible/clockwork/attackby(obj/item/I, mob/user, params) - if(is_servant_of_ratvar(user) && istype(I, /obj/item/weapon/wrench) && unanchored_icon) + if(is_servant_of_ratvar(user) && istype(I, /obj/item/wrench) && unanchored_icon) if(default_unfasten_wrench(user, I, 50) == SUCCESSFUL_UNFASTEN) update_anchored(user) return 1 diff --git a/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm b/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm index 154f9c3cec7..5066b2448ac 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/interdiction_lens.dm @@ -126,7 +126,7 @@ if(O.emped || !O.on) continue O.emp_act(EMP_HEAVY) - else if((isliving(A) && !is_servant_of_ratvar(A)) || istype(A, /obj/structure/closet) || istype(A, /obj/item/weapon/storage)) //other things may have radios in them but we don't care + else if((isliving(A) && !is_servant_of_ratvar(A)) || istype(A, /obj/structure/closet) || istype(A, /obj/item/storage)) //other things may have radios in them but we don't care for(var/obj/item/device/radio/O in A.GetAllContents()) successfulprocess = TRUE if(O.emped || !O.on) diff --git a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm index ac0365c1482..7953a7dafd8 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/ocular_warden.dm @@ -102,11 +102,11 @@ /obj/structure/destructible/clockwork/ocular_warden/proc/acquire_nearby_targets() . = list() for(var/mob/living/L in viewers(sight_range, src)) //Doesn't attack the blind - var/obj/item/weapon/storage/book/bible/B = L.bible_check() + var/obj/item/storage/book/bible/B = L.bible_check() if(B) if(!(B.resistance_flags & ON_FIRE)) to_chat(L, "Your [B.name] bursts into flames!") - for(var/obj/item/weapon/storage/book/bible/BI in L.GetAllContents()) + for(var/obj/item/storage/book/bible/BI in L.GetAllContents()) if(!(BI.resistance_flags & ON_FIRE)) BI.fire_act() continue diff --git a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm index f9e763623b3..1463ca6ac0d 100644 --- a/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm +++ b/code/game/gamemodes/clock_cult/clock_structures/wall_gear.dm @@ -24,10 +24,10 @@ return /obj/structure/destructible/clockwork/wall_gear/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/wrench)) + if(istype(I, /obj/item/wrench)) default_unfasten_wrench(user, I, 10) return 1 - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(istype(I, /obj/item/screwdriver)) if(anchored) to_chat(user, "[src] needs to be unsecured to disassemble it!") else diff --git a/code/game/gamemodes/cult/cult.dm b/code/game/gamemodes/cult/cult.dm index 971621eb270..06407079ce7 100644 --- a/code/game/gamemodes/cult/cult.dm +++ b/code/game/gamemodes/cult/cult.dm @@ -125,9 +125,9 @@ mob.dna.remove_mutation(CLOWNMUT) if(tome) - . += cult_give_item(/obj/item/weapon/tome, mob) + . += cult_give_item(/obj/item/tome, mob) else - . += cult_give_item(/obj/item/weapon/paper/talisman/supply, mob) + . += cult_give_item(/obj/item/paper/talisman/supply, mob) to_chat(mob, "These will help you start the cult on this station. Use them well, and remember - you are not the only one.") /datum/game_mode/proc/cult_give_item(obj/item/item_path, mob/living/carbon/human/mob) @@ -146,7 +146,7 @@ else to_chat(mob, "You have a [item_name] in your [where].") if(where == "backpack") - var/obj/item/weapon/storage/B = mob.back + var/obj/item/storage/B = mob.back B.orient2hud(mob) B.show_to(mob) return 1 diff --git a/code/game/gamemodes/cult/cult_items.dm b/code/game/gamemodes/cult/cult_items.dm index 0a99ba516bb..54536db73c7 100644 --- a/code/game/gamemodes/cult/cult_items.dm +++ b/code/game/gamemodes/cult/cult_items.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/melee/cultblade +/obj/item/melee/cultblade name = "eldritch longsword" desc = "A sword humming with unholy energy. It glows with a dim red light." icon_state = "cultblade" @@ -14,7 +14,7 @@ attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "rended") -/obj/item/weapon/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) +/obj/item/melee/cultblade/attack(mob/living/target, mob/living/carbon/human/user) if(!iscultist(user)) user.Knockdown(100) user.dropItemToGround(src, TRUE) @@ -28,12 +28,12 @@ return ..() -/obj/item/weapon/melee/cultblade/ghost +/obj/item/melee/cultblade/ghost name = "eldritch sword" force = 19 //can't break normal airlocks flags_1 = NODROP_1|DROPDEL_1 -/obj/item/weapon/melee/cultblade/pickup(mob/living/user) +/obj/item/melee/cultblade/pickup(mob/living/user) ..() if(!iscultist(user)) if(!is_servant_of_ratvar(user)) @@ -47,7 +47,7 @@ user.apply_damage(30, BRUTE, pick("l_arm", "r_arm")) user.dropItemToGround(src) -/obj/item/weapon/melee/cultblade/dagger +/obj/item/melee/cultblade/dagger name = "sacrificial dagger" desc = "A strange dagger said to be used by sinister groups for \"preparing\" a corpse before sacrificing it to their dark gods." icon = 'icons/obj/wizard.dmi' @@ -57,7 +57,7 @@ throwforce = 25 embed_chance = 75 -/obj/item/weapon/melee/cultblade/dagger/attack(mob/living/target, mob/living/carbon/human/user) +/obj/item/melee/cultblade/dagger/attack(mob/living/target, mob/living/carbon/human/user) ..() if(iscarbon(target)) var/mob/living/carbon/C = target @@ -66,7 +66,7 @@ C.reagents.add_reagent("heparin", 1) -/obj/item/weapon/restraints/legcuffs/bola/cult +/obj/item/restraints/legcuffs/bola/cult name = "nar'sien bola" desc = "A strong bola, bound with dark magic. Throw it to trip and slow your victim." icon_state = "bola_cult" @@ -92,7 +92,7 @@ icon_state = "cultrobes" item_state = "cultrobes" body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/weapon/tome, /obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0, fire = 10, acid = 10) flags_inv = HIDEJUMPSUIT cold_protection = CHEST|GROIN|LEGS|ARMS @@ -135,7 +135,7 @@ icon_state = "magusred" item_state = "magusred" body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/weapon/tome, /obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade) armor = list(melee = 50, bullet = 30, laser = 50,energy = 20, bomb = 25, bio = 10, rad = 0, fire = 10, acid = 10) flags_inv = HIDEGLOVES|HIDESHOES|HIDEJUMPSUIT @@ -154,11 +154,11 @@ item_state = "cult_armor" desc = "A heavily-armored exosuit worn by warriors of the Nar-Sien cult. It can withstand hard vacuum." w_class = WEIGHT_CLASS_SMALL - allowed = list(/obj/item/weapon/tome, /obj/item/weapon/melee/cultblade, /obj/item/weapon/tank/internals/) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade, /obj/item/tank/internals/) armor = list(melee = 70, bullet = 50, laser = 30,energy = 15, bomb = 30, bio = 30, rad = 30, fire = 40, acid = 75) helmettype = /obj/item/clothing/head/helmet/space/hardsuit/cult -/obj/item/weapon/sharpener/cult +/obj/item/sharpener/cult name = "eldritch whetstone" desc = "A block, empowered by dark magic. Sharp weapons will be enhanced when used on the stone." icon_state = "cult_sharpener" @@ -167,7 +167,7 @@ max = 40 prefix = "darkened" -/obj/item/weapon/sharpener/cult/update_icon() +/obj/item/sharpener/cult/update_icon() icon_state = "cult_sharpener[used ? "_used" : ""]" /obj/item/clothing/suit/hooded/cultrobes/cult_shield @@ -178,7 +178,7 @@ w_class = WEIGHT_CLASS_BULKY armor = list(melee = 50, bullet = 40, laser = 50,energy = 30, bomb = 50, bio = 30, rad = 30, fire = 50, acid = 60) body_parts_covered = CHEST|GROIN|LEGS|ARMS - allowed = list(/obj/item/weapon/tome, /obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade) var/current_charges = 3 hoodtype = /obj/item/clothing/head/hooded/cult_hoodie @@ -228,7 +228,7 @@ icon_state = "cultrobes" item_state = "cultrobes" flags_inv = HIDEJUMPSUIT - allowed = list(/obj/item/weapon/tome, /obj/item/weapon/melee/cultblade) + allowed = list(/obj/item/tome, /obj/item/melee/cultblade) body_parts_covered = CHEST|GROIN|LEGS|ARMS armor = list(melee = -50, bullet = -50, laser = -50,energy = -50, bomb = -50, bio = -50, rad = -50, fire = 0, acid = 0) slowdown = -1 @@ -275,7 +275,7 @@ user.Knockdown(100) user.blind_eyes(30) -/obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater +/obj/item/reagent_containers/food/drinks/bottle/unholywater name = "flask of unholy water" desc = "Toxic to nonbelievers; reinvigorating to the faithful - this flask may be sipped or thrown." icon_state = "holyflask" diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm index 08b7c99f33c..0cba943287b 100644 --- a/code/game/gamemodes/cult/cult_structures.dm +++ b/code/game/gamemodes/cult/cult_structures.dm @@ -33,7 +33,7 @@ ..() /obj/structure/destructible/cult/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/weapon/tome) && iscultist(user)) + if(istype(I, /obj/item/tome) && iscultist(user)) anchored = !anchored to_chat(user, "You [anchored ? "":"un"]secure \the [src] [anchored ? "to":"from"] the floor.") if(!anchored) @@ -78,11 +78,11 @@ var/pickedtype switch(choice) if("Eldritch Whetstone") - pickedtype = /obj/item/weapon/sharpener/cult + pickedtype = /obj/item/sharpener/cult if("Zealot's Blindfold") pickedtype = /obj/item/clothing/glasses/night/cultblind if("Flask of Unholy Water") - pickedtype = /obj/item/weapon/reagent_containers/food/drinks/bottle/unholywater + pickedtype = /obj/item/reagent_containers/food/drinks/bottle/unholywater if(src && !QDELETED(src) && anchored && pickedtype && Adjacent(user) && !user.incapacitated() && iscultist(user) && cooldowntime <= world.time) cooldowntime = world.time + 2400 var/obj/item/N = new pickedtype(get_turf(src)) @@ -218,7 +218,7 @@ var/list/pickedtype = list() switch(choice) if("Supply Talisman") - pickedtype += /obj/item/weapon/paper/talisman/supply/weak + pickedtype += /obj/item/paper/talisman/supply/weak if("Shuttle Curse") pickedtype += /obj/item/device/shuttle_curse if("Veil Walker Set") diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm index 049b8fe62bf..06f0910c192 100644 --- a/code/game/gamemodes/cult/ritual.dm +++ b/code/game/gamemodes/cult/ritual.dm @@ -5,7 +5,7 @@ This file contains the arcane tome files. */ -/obj/item/weapon/tome +/obj/item/tome name = "arcane tome" desc = "An old, dusty tome with frayed edges and a sinister-looking cover." icon_state ="tome" @@ -13,7 +13,7 @@ This file contains the arcane tome files. throw_range = 5 w_class = WEIGHT_CLASS_SMALL -/obj/item/weapon/tome/Initialize() +/obj/item/tome/Initialize() . = ..() if(!LAZYLEN(GLOB.rune_types)) GLOB.rune_types = list() @@ -22,7 +22,7 @@ This file contains the arcane tome files. var/obj/effect/rune/R = i_can_do_loops_now_thanks_remie GLOB.rune_types[initial(R.cultist_name)] = R //Uses the cultist name for displaying purposes -/obj/item/weapon/tome/examine(mob/user) +/obj/item/tome/examine(mob/user) ..() if(iscultist(user) || isobserver(user)) to_chat(user, "The scriptures of the Geometer. Allows the scribing of runes and access to the knowledge archives of the cult of Nar-Sie.") @@ -30,7 +30,7 @@ This file contains the arcane tome files. to_chat(user, "Striking another cultist with it will purge holy water from them.") to_chat(user, "Striking a noncultist, however, will sear their flesh.") -/obj/item/weapon/tome/attack(mob/living/M, mob/living/user) +/obj/item/tome/attack(mob/living/M, mob/living/user) if(!istype(M)) return if(!iscultist(user)) @@ -51,13 +51,13 @@ This file contains the arcane tome files. user.do_attack_animation(M) add_logs(user, M, "smacked", src) -/obj/item/weapon/tome/attack_self(mob/user) +/obj/item/tome/attack_self(mob/user) if(!iscultist(user)) to_chat(user, "[src] seems full of unintelligible shapes, scribbles, and notes. Is this some sort of joke?") return open_tome(user) -/obj/item/weapon/tome/proc/open_tome(mob/user) +/obj/item/tome/proc/open_tome(mob/user) var/choice = alert(user,"You open the tome...",,"Scribe Rune","More Information","Cancel") switch(choice) if("More Information") @@ -67,7 +67,7 @@ This file contains the arcane tome files. if("Cancel") return -/obj/item/weapon/tome/proc/read_tome(mob/user) +/obj/item/tome/proc/read_tome(mob/user) var/text = "" text += "
Archives of the Dark One



" text += "A rune's name and effects can be revealed by examining the rune.

" @@ -171,7 +171,7 @@ This file contains the arcane tome files. popup.open() return 1 -/obj/item/weapon/tome/proc/scribe_rune(mob/living/user) +/obj/item/tome/proc/scribe_rune(mob/living/user) var/turf/Turf = get_turf(user) var/chosen_keyword var/obj/effect/rune/rune_to_scribe @@ -248,7 +248,7 @@ This file contains the arcane tome files. to_chat(user, "The [lowertext(R.cultist_name)] rune [R.cultist_desc]") SSblackbox.add_details("cult_runes_scribed", R.cultist_name) -/obj/item/weapon/tome/proc/check_rune_turf(turf/T, mob/user) +/obj/item/tome/proc/check_rune_turf(turf/T, mob/user) if(isspaceturf(T)) to_chat(user, "You cannot scribe runes in space!") return FALSE diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm index 7810df2a9a6..fb6d47f55c0 100644 --- a/code/game/gamemodes/cult/runes.dm +++ b/code/game/gamemodes/cult/runes.dm @@ -56,10 +56,10 @@ To draw a rune, use an arcane tome. to_chat(user, "Keyword: [keyword]") /obj/effect/rune/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/weapon/tome) && iscultist(user)) + if(istype(I, /obj/item/tome) && iscultist(user)) to_chat(user, "You carefully erase the [lowertext(cultist_name)] rune.") qdel(src) - else if(istype(I, /obj/item/weapon/nullrod)) + else if(istype(I, /obj/item/nullrod)) user.say("BEGONE FOUL MAGIKS!!") to_chat(user, "You disrupt the magic of [src] with [I].") qdel(src) @@ -175,13 +175,13 @@ structure_check() searches for nearby cultist structures required for the invoca qdel(src) /mob/proc/null_rod_check() //The null rod, if equipped, will protect the holder from the effects of most runes - var/obj/item/weapon/nullrod/N = locate() in src + var/obj/item/nullrod/N = locate() in src if(N && !GLOB.ratvar_awakens) //If Nar-Sie or Ratvar are alive, null rods won't protect you return N return 0 /mob/proc/bible_check() //The bible, if held, might protect against certain things - var/obj/item/weapon/storage/book/bible/B = locate() in src + var/obj/item/storage/book/bible/B = locate() in src if(is_holding(B)) return B return 0 @@ -198,7 +198,7 @@ structure_check() searches for nearby cultist structures required for the invoca var/mob/living/user = invokers[1] //the first invoker is always the user var/list/papers_on_rune = checkpapers() var/entered_talisman_name - var/obj/item/weapon/paper/talisman/talisman_type + var/obj/item/paper/talisman/talisman_type var/list/possible_talismans = list() if(!papers_on_rune.len) to_chat(user, "There must be a blank paper on top of [src]!") @@ -211,8 +211,8 @@ structure_check() searches for nearby cultist structures required for the invoca log_game("Talisman Creation rune failed - already in use") return - for(var/I in subtypesof(/obj/item/weapon/paper/talisman) - /obj/item/weapon/paper/talisman/malformed - /obj/item/weapon/paper/talisman/supply - /obj/item/weapon/paper/talisman/supply/weak - /obj/item/weapon/paper/talisman/summon_tome) - var/obj/item/weapon/paper/talisman/J = I + for(var/I in subtypesof(/obj/item/paper/talisman) - /obj/item/paper/talisman/malformed - /obj/item/paper/talisman/supply - /obj/item/paper/talisman/supply/weak - /obj/item/paper/talisman/summon_tome) + var/obj/item/paper/talisman/J = I var/talisman_cult_name = initial(J.cultist_name) if(talisman_cult_name) possible_talismans[talisman_cult_name] = J //This is to allow the menu to let cultists select talismans by name @@ -226,7 +226,7 @@ structure_check() searches for nearby cultist structures required for the invoca fail_invoke() log_game("Talisman Creation rune failed - no blank papers on rune") return - var/obj/item/weapon/paper/paper_to_imbue = papers_on_rune[1] + var/obj/item/paper/paper_to_imbue = papers_on_rune[1] ..() visible_message("Dark power begins to channel into the paper!") rune_in_use = TRUE @@ -238,8 +238,8 @@ structure_check() searches for nearby cultist structures required for the invoca /obj/effect/rune/imbue/proc/checkpapers() . = list() - for(var/obj/item/weapon/paper/P in get_turf(src)) - if(!P.info && !istype(P, /obj/item/weapon/paper/talisman)) + for(var/obj/item/paper/P in get_turf(src)) + if(!P.info && !istype(P, /obj/item/paper/talisman)) . |= P /obj/effect/rune/teleport @@ -388,7 +388,7 @@ structure_check() searches for nearby cultist structures required for the invoca [brutedamage || burndamage ? "even as [convertee.p_their()] wounds heal and close" : "as the markings below [convertee.p_them()] glow a bloody red"]!", \ "AAAAAAAAAAAAAA-") SSticker.mode.add_cultist(convertee.mind, 1) - new /obj/item/weapon/tome(get_turf(src)) + new /obj/item/tome(get_turf(src)) convertee.mind.special_role = "Cultist" to_chat(convertee, "Your blood pulses. Your head throbs. The world goes red. All at once you are aware of a horrible, horrible, truth. The veil of reality has been ripped away \ and something evil takes root.") @@ -485,14 +485,14 @@ structure_check() searches for nearby cultist structures required for the invoca new /obj/singularity/narsie/large/cult(T) //Causes Nar-Sie to spawn even if the rune has been removed /obj/effect/rune/narsie/attackby(obj/I, mob/user, params) //Since the narsie rune takes a long time to make, add logging to removal. - if((istype(I, /obj/item/weapon/tome) && iscultist(user))) + if((istype(I, /obj/item/tome) && iscultist(user))) user.visible_message("[user.name] begins erasing the [src]...", "You begin erasing the [src]...") if(do_after(user, 50, target = src)) //Prevents accidental erasures. log_game("Summon Narsie rune erased by [user.mind.key] (ckey) with a tome") message_admins("[key_name_admin(user)] erased a Narsie rune with a tome") ..() else - if(istype(I, /obj/item/weapon/nullrod)) //Begone foul magiks. You cannot hinder me. + if(istype(I, /obj/item/nullrod)) //Begone foul magiks. You cannot hinder me. log_game("Summon Narsie rune erased by [user.mind.key] (ckey) using a null rod") message_admins("[key_name_admin(user)] erased a Narsie rune with a null rod") ..() @@ -842,7 +842,7 @@ structure_check() searches for nearby cultist structures required for the invoca set_light(6, 1, color) for(var/mob/living/L in viewers(T)) if(!iscultist(L) && L.blood_volume) - var/obj/item/weapon/nullrod/N = L.null_rod_check() + var/obj/item/nullrod/N = L.null_rod_check() if(N) to_chat(L, "\The [N] suddenly burns hotly before returning to normal!") continue @@ -871,7 +871,7 @@ structure_check() searches for nearby cultist structures required for the invoca set_light(6, 1, color) for(var/mob/living/L in viewers(T)) if(!iscultist(L) && L.blood_volume) - var/obj/item/weapon/nullrod/N = L.null_rod_check() + var/obj/item/nullrod/N = L.null_rod_check() if(N) continue L.take_overall_damage(tick_damage*multiplier, tick_damage*multiplier) diff --git a/code/game/gamemodes/cult/supply.dm b/code/game/gamemodes/cult/supply.dm index 23270c3d6c4..47807fa93ac 100644 --- a/code/game/gamemodes/cult/supply.dm +++ b/code/game/gamemodes/cult/supply.dm @@ -1,5 +1,5 @@ //Supply Talisman: Has a few unique effects. Granted only to starter cultists. -/obj/item/weapon/paper/talisman/supply +/obj/item/paper/talisman/supply cultist_name = "Supply Talisman" cultist_desc = "A multi-use talisman that can create various objects. Intended to increase the cult's strength early on." invocation = null @@ -15,7 +15,7 @@ /datum/cult_supply/construct_shell ) -/obj/item/weapon/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/supply/invoke(mob/living/user, successfuluse = 1) var/list/dat = list() dat += "There are [uses] bloody runes on the parchment.
" dat += "Please choose the chant to be imbued into the fabric of reality.
" @@ -28,7 +28,7 @@ popup.open() return 0 -/obj/item/weapon/paper/talisman/supply/Topic(href, href_list) +/obj/item/paper/talisman/supply/Topic(href, href_list) if(QDELETED(src) || usr.incapacitated() || !in_range(src, usr)) return @@ -58,11 +58,11 @@ to_chat(usr, "[src] crumbles to dust.") burn() -/obj/item/weapon/paper/talisman/supply/weak +/obj/item/paper/talisman/supply/weak cultist_name = "Lesser Supply Talisman" uses = 2 -/obj/item/weapon/paper/talisman/supply/weak/Initialize(mapload) +/obj/item/paper/talisman/supply/weak/Initialize(mapload) . = ..() // no runed metal from lesser talismans. possible_summons -= /datum/cult_supply/metal @@ -77,7 +77,7 @@ id = "arcane_tome" invocation = "N'ath reth sh'yro eth d'raggathnor!" desc = "Summons an arcane tome, used to scribe runes." - summon_type = /obj/item/weapon/tome + summon_type = /obj/item/tome /datum/cult_supply/metal id = "runed_metal" @@ -89,25 +89,25 @@ id = "teleport_talisman" invocation = "Sas'so c'arta forbici!" desc = "Allows you to move to a selected teleportation rune." - summon_type = /obj/item/weapon/paper/talisman/teleport + summon_type = /obj/item/paper/talisman/teleport /datum/cult_supply/talisman/emp id = "emp_talisman" invocation = "Ta'gh fara'qha fel d'amar det!" desc = "Allows you to destroy technology in a short range." - summon_type = /obj/item/weapon/paper/talisman/emp + summon_type = /obj/item/paper/talisman/emp /datum/cult_supply/talisman/stun id = "stun_talisman" invocation = "Fuu ma'jin!" desc = "Allows you to stun a person by attacking them with the talisman. Does not work on people holding a holy weapon!" - summon_type = /obj/item/weapon/paper/talisman/stun + summon_type = /obj/item/paper/talisman/stun /datum/cult_supply/talisman/veil id = "veil_talisman" invocation = "Kla'atu barada nikt'o!" desc = "Two use talisman, first use makes all nearby runes invisible, secnd use reveals nearby hidden runes." - summon_type = /obj/item/weapon/paper/talisman/true_sight + summon_type = /obj/item/paper/talisman/true_sight /datum/cult_supply/soulstone id = "soulstone" diff --git a/code/game/gamemodes/cult/talisman.dm b/code/game/gamemodes/cult/talisman.dm index f63713aa5f7..2a5f64915be 100644 --- a/code/game/gamemodes/cult/talisman.dm +++ b/code/game/gamemodes/cult/talisman.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/paper/talisman +/obj/item/paper/talisman var/cultist_name = "talisman" var/cultist_desc = "A basic talisman. It serves no purpose." var/invocation = "Naise meam!" @@ -6,7 +6,7 @@ var/health_cost = 0 //The amount of health taken from the user when invoking the talisman var/creation_time = 100 //how long it takes an imbue rune to make this type of talisman -/obj/item/weapon/paper/talisman/examine(mob/user) +/obj/item/paper/talisman/examine(mob/user) if(iscultist(user) || user.stat == DEAD) to_chat(user, "Name: [cultist_name]") to_chat(user, "Effect: [cultist_desc]") @@ -14,7 +14,7 @@ else to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") -/obj/item/weapon/paper/talisman/attack_self(mob/living/user) +/obj/item/paper/talisman/attack_self(mob/living/user) if(!iscultist(user)) to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return @@ -24,7 +24,7 @@ user.drop_item() qdel(src) -/obj/item/weapon/paper/talisman/proc/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/proc/invoke(mob/living/user, successfuluse = 1) . = successfuluse if(successfuluse) //if the calling whatever says we succeed, do the fancy stuff if(invocation) @@ -34,19 +34,19 @@ C.apply_damage(health_cost, BRUTE, pick("l_arm", "r_arm")) //Malformed Talisman: If something goes wrong. -/obj/item/weapon/paper/talisman/malformed +/obj/item/paper/talisman/malformed cultist_name = "malformed talisman" cultist_desc = "A talisman with gibberish scrawlings. No good can come from invoking this." invocation = "Ra'sha yoka!" -/obj/item/weapon/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/malformed/invoke(mob/living/user, successfuluse = 1) to_chat(user, "You feel a pain in your head. The Geometer is displeased.") if(iscarbon(user)) var/mob/living/carbon/C = user C.apply_damage(10, BRUTE, "head") //Rite of Translocation: Same as rune -/obj/item/weapon/paper/talisman/teleport +/obj/item/paper/talisman/teleport cultist_name = "Talisman of Teleportation" cultist_desc = "A single-use talisman that will teleport a user to a random rune of the same keyword." color = RUNE_COLOR_TELEPORT @@ -54,7 +54,7 @@ health_cost = 5 creation_time = 80 -/obj/item/weapon/paper/talisman/teleport/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/teleport/invoke(mob/living/user, successfuluse = 1) var/list/potential_runes = list() var/list/teleportnames = list() for(var/R in GLOB.teleport_runes) @@ -86,7 +86,7 @@ return ..() -/obj/item/weapon/paper/talisman/summon_tome +/obj/item/paper/talisman/summon_tome cultist_name = "Talisman of Tome Summoning" cultist_desc = "A one-use talisman that will call an untranslated tome from the archives of the Geometer." color = "#512727" // red-black @@ -94,15 +94,15 @@ health_cost = 1 creation_time = 30 -/obj/item/weapon/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/summon_tome/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand glows red for a moment.", \ "You speak the words of the talisman!") - new /obj/item/weapon/tome(get_turf(user)) + new /obj/item/tome(get_turf(user)) user.visible_message("A tome appears at [user]'s feet!", \ "An arcane tome materializes at your feet.") -/obj/item/weapon/paper/talisman/true_sight +/obj/item/paper/talisman/true_sight cultist_name = "Talisman of Veiling" cultist_desc = "A multi-use talisman that hides nearby runes. On its second use, will reveal nearby runes." color = "#9c9c9c" // grey @@ -112,7 +112,7 @@ uses = 6 var/revealing = FALSE //if it reveals or not -/obj/item/weapon/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/true_sight/invoke(mob/living/user, successfuluse = 1) . = ..() if(!revealing) user.visible_message("Thin grey dust falls from [user]'s hand!", \ @@ -128,14 +128,14 @@ R.talismanreveal() //Rite of Disruption: Weaker than rune -/obj/item/weapon/paper/talisman/emp +/obj/item/paper/talisman/emp cultist_name = "Talisman of Electromagnetic Pulse" cultist_desc = "A talisman that will cause a moderately-sized electromagnetic pulse." color = "#4d94ff" // light blue invocation = "Ta'gh fara'qha fel d'amar det!" health_cost = 5 -/obj/item/weapon/paper/talisman/emp/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/emp/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("[user]'s hand flashes a bright blue!", \ "You speak the words of the talisman, emitting an EMP blast.") @@ -143,14 +143,14 @@ //Rite of Disorientation: Stuns and inhibit speech on a single target for quite some time -/obj/item/weapon/paper/talisman/stun +/obj/item/paper/talisman/stun cultist_name = "Talisman of Stunning" cultist_desc = "A talisman that will stun and inhibit speech on a single target. To use, attack target directly." color = "#ff0000" // red invocation = "Fuu ma'jin!" health_cost = 10 -/obj/item/weapon/paper/talisman/stun/invoke(mob/living/user, successfuluse = 0) +/obj/item/paper/talisman/stun/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) @@ -159,12 +159,12 @@ to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return 0 -/obj/item/weapon/paper/talisman/stun/attack(mob/living/target, mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/stun/attack(mob/living/target, mob/living/user, successfuluse = 1) if(iscultist(user)) invoke(user, 1) user.visible_message("[user] holds up [src], which explodes in a flash of red light!", \ "You stun [target] with the talisman!") - var/obj/item/weapon/nullrod/N = locate() in target + var/obj/item/nullrod/N = locate() in target if(N) target.visible_message("[target]'s holy weapon absorbs the talisman's light!", \ "Your holy weapon absorbs the blinding light!") @@ -189,26 +189,26 @@ //Rite of Arming: Equips cultist armor on the user, where available -/obj/item/weapon/paper/talisman/armor +/obj/item/paper/talisman/armor cultist_name = "Talisman of Arming" cultist_desc = "A talisman that will equip the invoker with cultist equipment if there is a slot to equip it to." color = "#33cc33" // green invocation = "N'ath reth sh'yro eth draggathnor!" creation_time = 80 -/obj/item/weapon/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) +/obj/item/paper/talisman/armor/invoke(mob/living/user, successfuluse = 1) . = ..() user.visible_message("Otherworldly armor suddenly appears on [user]!", \ "You speak the words of the talisman, arming yourself!") user.equip_to_slot_or_del(new /obj/item/clothing/head/culthood/alt(user), slot_head) user.equip_to_slot_or_del(new /obj/item/clothing/suit/cultrobes/alt(user), slot_wear_suit) user.equip_to_slot_or_del(new /obj/item/clothing/shoes/cult/alt(user), slot_shoes) - user.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack/cultpack(user), slot_back) + user.equip_to_slot_or_del(new /obj/item/storage/backpack/cultpack(user), slot_back) user.drop_item() - user.put_in_hands(new /obj/item/weapon/melee/cultblade(user)) - user.put_in_hands(new /obj/item/weapon/restraints/legcuffs/bola/cult(user)) + user.put_in_hands(new /obj/item/melee/cultblade(user)) + user.put_in_hands(new /obj/item/restraints/legcuffs/bola/cult(user)) -/obj/item/weapon/paper/talisman/armor/attack(mob/living/target, mob/living/user) +/obj/item/paper/talisman/armor/attack(mob/living/target, mob/living/user) if(iscultist(user) && iscultist(target)) user.drop_item() invoke(target) @@ -218,14 +218,14 @@ //Talisman of Horrors: Breaks the mind of the victim with nightmarish hallucinations -/obj/item/weapon/paper/talisman/horror +/obj/item/paper/talisman/horror cultist_name = "Talisman of Horrors" cultist_desc = "A talisman that will break the mind of the victim with nightmarish hallucinations." color = "#ffb366" // light orange invocation = "Lo'Nab Na'Dm!" creation_time = 80 -/obj/item/weapon/paper/talisman/horror/afterattack(mob/living/target, mob/living/user) +/obj/item/paper/talisman/horror/afterattack(mob/living/target, mob/living/user) if(iscultist(user) && (get_dist(user, target) < 7)) to_chat(user, "You disturb [target] with visions of madness!") if(iscarbon(target)) @@ -240,7 +240,7 @@ //Talisman of Fabrication: Creates a construct shell out of 25 metal sheets, or converts plasteel into runed metal up to 25 times -/obj/item/weapon/paper/talisman/construction +/obj/item/paper/talisman/construction cultist_name = "Talisman of Construction" cultist_desc = "Use this talisman on at least twenty-five metal sheets to create an empty construct shell" invocation = "Ethra p'ni dedol!" @@ -248,21 +248,21 @@ uses = 25 creation_time = 80 -/obj/item/weapon/paper/talisman/construction/attack_self(mob/living/user) +/obj/item/paper/talisman/construction/attack_self(mob/living/user) if(iscultist(user)) to_chat(user, "To use this talisman, place it upon a stack of metal sheets.") else to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") -/obj/item/weapon/paper/talisman/construction/attack(obj/M,mob/living/user) +/obj/item/paper/talisman/construction/attack(obj/M,mob/living/user) if(iscultist(user)) to_chat(user, "This talisman will only work on a stack of metal or plasteel sheets!") log_game("Construct talisman failed - not a valid target") else ..() -/obj/item/weapon/paper/talisman/construction/afterattack(obj/item/stack/sheet/target, mob/user, proximity_flag, click_parameters) +/obj/item/paper/talisman/construction/afterattack(obj/item/stack/sheet/target, mob/user, proximity_flag, click_parameters) ..() if(proximity_flag && iscultist(user)) var/turf/T = get_turf(target) @@ -290,14 +290,14 @@ //Talisman of Shackling: Applies special cuffs directly from the talisman -/obj/item/weapon/paper/talisman/shackle +/obj/item/paper/talisman/shackle cultist_name = "Talisman of Shackling" cultist_desc = "Use this talisman on a victim to handcuff them with dark bindings." invocation = "In'totum Lig'abis!" color = "#B27300" // burnt-orange uses = 6 -/obj/item/weapon/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) +/obj/item/paper/talisman/shackle/invoke(mob/living/user, successfuluse = 0) if(successfuluse) //if we're forced to be successful(we normally aren't) then do the normal stuff return ..() if(iscultist(user)) @@ -306,7 +306,7 @@ to_chat(user, "There are indecipherable images scrawled on the paper in what looks to be... blood?") return 0 -/obj/item/weapon/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) +/obj/item/paper/talisman/shackle/attack(mob/living/carbon/target, mob/living/user) if(iscultist(user) && istype(target)) if(target.stat == DEAD) user.visible_message("This talisman's magic does not affect the dead!") @@ -315,7 +315,7 @@ return ..() -/obj/item/weapon/paper/talisman/shackle/proc/CuffAttack(mob/living/carbon/C, mob/living/user) +/obj/item/paper/talisman/shackle/proc/CuffAttack(mob/living/carbon/C, mob/living/user) if(!C.handcuffed) invoke(user, 1) playsound(loc, 'sound/weapons/cablecuff.ogg', 30, 1, -2) @@ -323,7 +323,7 @@ "[user] begins shaping a dark magic around your wrists!") if(do_mob(user, C, 30)) if(!C.handcuffed) - C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/cult/used(C) + C.handcuffed = new /obj/item/restraints/handcuffs/energy/cult/used(C) C.update_handcuffed() to_chat(user, "You shackle [C].") add_logs(user, C, "handcuffed") @@ -338,14 +338,14 @@ user.drop_item() qdel(src) -/obj/item/weapon/restraints/handcuffs/energy/cult //For the talisman of shackling +/obj/item/restraints/handcuffs/energy/cult //For the talisman of shackling name = "cult shackles" desc = "Shackles that bind the wrists with sinister magic." - trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + trashtype = /obj/item/restraints/handcuffs/energy/used origin_tech = "materials=2;magnets=5" flags_1 = DROPDEL_1 -/obj/item/weapon/restraints/handcuffs/energy/cult/used/dropped(mob/user) +/obj/item/restraints/handcuffs/energy/cult/used/dropped(mob/user) user.visible_message("[user]'s shackles shatter in a discharge of dark magic!", \ "Your [src] shatters in a discharge of dark magic!") . = ..() diff --git a/code/game/gamemodes/devil/devil.dm b/code/game/gamemodes/devil/devil.dm index f69b50bc795..8f7c777f466 100644 --- a/code/game/gamemodes/devil/devil.dm +++ b/code/game/gamemodes/devil/devil.dm @@ -26,11 +26,11 @@ src.visible_message("[src] seems to have been harmed by the purity of [attacker]'s clothes.", "Unsullied white clothing is disrupting your form.") return whiteness[U.type] + 1 if(BANE_TOOLBOX) - if(istype(weapon, /obj/item/weapon/storage/toolbox)) + if(istype(weapon, /obj/item/storage/toolbox)) src.visible_message("The [weapon] seems unusually robust this time.", "The [weapon] is your unmaking!") return 2.5 // Will take four hits with a normal toolbox to crit. if(BANE_HARVEST) - if(istype(weapon, /obj/item/weapon/reagent_containers/food/snacks/grown/)) + if(istype(weapon, /obj/item/reagent_containers/food/snacks/grown/)) visible_message("The spirits of the harvest aid in the exorcism.", "The harvest spirits are harming you.") Knockdown(40) qdel(weapon) diff --git a/code/game/gamemodes/devil/devilinfo.dm b/code/game/gamemodes/devil/devilinfo.dm index 0ea5231cfd7..1683aa8a000 100644 --- a/code/game/gamemodes/devil/devilinfo.dm +++ b/code/game/gamemodes/devil/devilinfo.dm @@ -444,8 +444,8 @@ GLOBAL_LIST_INIT(devil_suffix, list(" the Red", " the Soulless", " the Master", var/mob/living/carbon/human/H = owner.current H.equip_to_slot_or_del(new /obj/item/clothing/under/lawyer/black(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/laceup(H), slot_shoes) - H.equip_to_slot_or_del(new /obj/item/weapon/storage/briefcase(H), slot_hands) - H.equip_to_slot_or_del(new /obj/item/weapon/pen(H), slot_l_store) + H.equip_to_slot_or_del(new /obj/item/storage/briefcase(H), slot_hands) + H.equip_to_slot_or_del(new /obj/item/pen(H), slot_l_store) if(SOULVALUE >= BLOOD_THRESHOLD) H.set_species(/datum/species/lizard, 1) H.underwear = "Nude" diff --git a/code/game/gamemodes/gang/gang.dm b/code/game/gamemodes/gang/gang.dm index 37fbfb53366..f18a473d72f 100644 --- a/code/game/gamemodes/gang/gang.dm +++ b/code/game/gamemodes/gang/gang.dm @@ -117,7 +117,7 @@ GLOBAL_LIST_INIT(gang_outfit_pool, list(/obj/item/clothing/suit/jacket/leather, mob.dna.remove_mutation(CLOWNMUT) var/obj/item/device/gangtool/gangtool = new(mob) - var/obj/item/weapon/pen/gang/T = new(mob) + var/obj/item/pen/gang/T = new(mob) var/obj/item/toy/crayon/spraycan/gang/SC = new(mob,gang) var/obj/item/clothing/glasses/hud/security/chameleon/C = new(mob,gang) diff --git a/code/game/gamemodes/gang/gang_items.dm b/code/game/gamemodes/gang/gang_items.dm index 8438385b752..ab3b52ab984 100644 --- a/code/game/gamemodes/gang/gang_items.dm +++ b/code/game/gamemodes/gang/gang_items.dm @@ -174,16 +174,16 @@ name = "Badass Belt" id = "belt" cost = 13 - item_path = /obj/item/weapon/storage/belt/military/gang + item_path = /obj/item/storage/belt/military/gang -/obj/item/weapon/storage/belt/military/gang +/obj/item/storage/belt/military/gang name = "badass belt" icon_state = "gangbelt" item_state = "gang" desc = "The belt buckle simply reads 'BAMF'." storage_slots = 1 -/obj/item/weapon/storage/belt/military/gang/gang_contraband_value() +/obj/item/storage/belt/military/gang/gang_contraband_value() return 4 /////////////////// @@ -202,19 +202,19 @@ name = "Shuriken" id = "shuriken" cost = 3 - item_path = /obj/item/weapon/throwing_star + item_path = /obj/item/throwing_star /datum/gang_item/weapon/switchblade name = "Switchblade" id = "switchblade" cost = 5 - item_path = /obj/item/weapon/switchblade + item_path = /obj/item/switchblade /datum/gang_item/weapon/surplus name = "Surplus Rifle" id = "surplus" cost = 8 - item_path = /obj/item/weapon/gun/ballistic/automatic/surplus + item_path = /obj/item/gun/ballistic/automatic/surplus /datum/gang_item/weapon/ammo/surplus_ammo name = "Surplus Rifle Ammo" @@ -226,19 +226,19 @@ name = "Sawn-Off Improvised Shotgun" id = "sawn" cost = 6 - item_path = /obj/item/weapon/gun/ballistic/revolver/doublebarrel/improvised/sawn + item_path = /obj/item/gun/ballistic/revolver/doublebarrel/improvised/sawn /datum/gang_item/weapon/ammo/improvised_ammo name = "Box of Buckshot" id = "buckshot" cost = 5 - item_path = /obj/item/weapon/storage/box/lethalshot + item_path = /obj/item/storage/box/lethalshot /datum/gang_item/weapon/pistol name = "10mm Pistol" id = "pistol" cost = 30 - item_path = /obj/item/weapon/gun/ballistic/automatic/pistol + item_path = /obj/item/gun/ballistic/automatic/pistol /datum/gang_item/weapon/ammo/pistol_ammo name = "10mm Ammo" @@ -250,7 +250,7 @@ name = "Black Market .50cal Sniper Rifle" id = "sniper" cost = 40 - item_path = /obj/item/weapon/gun/ballistic/automatic/sniper_rifle/gang + item_path = /obj/item/gun/ballistic/automatic/sniper_rifle/gang /datum/gang_item/weapon/ammo/sniper_ammo name = "Smuggled .50cal Sniper Rounds" @@ -277,7 +277,7 @@ name = "Uzi SMG" id = "uzi" cost = 60 - item_path = /obj/item/weapon/gun/ballistic/automatic/mini_uzi + item_path = /obj/item/gun/ballistic/automatic/mini_uzi /datum/gang_item/weapon/ammo/uzi_ammo @@ -304,38 +304,38 @@ name = "Sharpener" id = "whetstone" cost = 3 - item_path = /obj/item/weapon/sharpener + item_path = /obj/item/sharpener /datum/gang_item/equipment/emp name = "EMP Grenade" id = "EMP" cost = 5 - item_path = /obj/item/weapon/grenade/empgrenade + item_path = /obj/item/grenade/empgrenade /datum/gang_item/equipment/c4 name = "C4 Explosive" id = "c4" cost = 7 - item_path = /obj/item/weapon/grenade/plastic/c4 + item_path = /obj/item/grenade/plastic/c4 /datum/gang_item/equipment/frag name = "Fragmentation Grenade" id = "frag nade" cost = 18 - item_path = /obj/item/weapon/grenade/syndieminibomb/concussion/frag + item_path = /obj/item/grenade/syndieminibomb/concussion/frag /datum/gang_item/equipment/stimpack name = "Black Market Stimulants" id = "stimpack" cost = 12 - item_path = /obj/item/weapon/reagent_containers/syringe/stimulants + item_path = /obj/item/reagent_containers/syringe/stimulants /datum/gang_item/equipment/implant_breaker name = "Implant Breaker" id = "implant_breaker" cost = 10 - item_path = /obj/item/weapon/implanter/gang + item_path = /obj/item/implanter/gang spawn_msg = "The implant breaker is a single-use device that destroys all implants within the target before trying to recruit them to your gang. Also works on enemy gangsters." /datum/gang_item/equipment/implant_breaker/spawn_item(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool) @@ -361,7 +361,7 @@ name = "Recruitment Pen" id = "pen" cost = 50 - item_path = /obj/item/weapon/pen/gang + item_path = /obj/item/pen/gang spawn_msg = "More recruitment pens will allow you to recruit gangsters faster. Only gang leaders can recruit with pens." /datum/gang_item/equipment/pen/purchase(mob/living/carbon/user, datum/gang/gang, obj/item/device/gangtool/gangtool) diff --git a/code/game/gamemodes/gang/gang_pen.dm b/code/game/gamemodes/gang/gang_pen.dm index e52db2ec5f5..5df405fa4d0 100644 --- a/code/game/gamemodes/gang/gang_pen.dm +++ b/code/game/gamemodes/gang/gang_pen.dm @@ -1,17 +1,17 @@ /* * Gang Boss Pens */ -/obj/item/weapon/pen/gang +/obj/item/pen/gang origin_tech = "materials=2;syndicate=3" var/cooldown var/last_used = 0 var/charges = 1 -/obj/item/weapon/pen/gang/New() +/obj/item/pen/gang/New() ..() last_used = world.time -/obj/item/weapon/pen/gang/attack(mob/living/M, mob/user, stealth = TRUE) +/obj/item/pen/gang/attack(mob/living/M, mob/user, stealth = TRUE) if(!istype(M)) return if(ishuman(M) && ishuman(user) && M.stat != DEAD) @@ -44,7 +44,7 @@ return ..() -/obj/item/weapon/pen/gang/proc/cooldown(datum/gang/gang) +/obj/item/pen/gang/proc/cooldown(datum/gang/gang) set waitfor = FALSE var/cooldown_time = 600+(600*gang.bosses.len) // 1recruiter=2mins, 2recruiters=3mins, 3recruiters=4mins diff --git a/code/game/gamemodes/malfunction/Malf_Modules.dm b/code/game/gamemodes/malfunction/Malf_Modules.dm index 5bc162ee8f9..5dfd8f73965 100644 --- a/code/game/gamemodes/malfunction/Malf_Modules.dm +++ b/code/game/gamemodes/malfunction/Malf_Modules.dm @@ -310,7 +310,7 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( owner_AI.doomsday_device = DOOM owner_AI.doomsday_device.start() for(var/pinpointer in GLOB.pinpointer_list) - var/obj/item/weapon/pinpointer/P = pinpointer + var/obj/item/pinpointer/P = pinpointer P.switch_mode_to(TRACK_MALF_AI) //Pinpointers start tracking the AI wherever it goes qdel(src) @@ -462,8 +462,8 @@ GLOBAL_LIST_INIT(blacklisted_malf_machines, typecacheof(list( /datum/action/innate/ai/destroy_rcds/Activate() for(var/I in GLOB.rcd_list) - if(!istype(I, /obj/item/weapon/construction/rcd/borg)) //Ensures that cyborg RCDs are spared. - var/obj/item/weapon/construction/rcd/RCD = I + if(!istype(I, /obj/item/construction/rcd/borg)) //Ensures that cyborg RCDs are spared. + var/obj/item/construction/rcd/RCD = I RCD.detonate_pulse() to_chat(owner, "RCD detonation pulse emitted.") owner.playsound_local(owner, 'sound/machines/twobeep.ogg', 50, 0) diff --git a/code/game/gamemodes/meteor/meteors.dm b/code/game/gamemodes/meteor/meteors.dm index 18daea8b31b..0265b371945 100644 --- a/code/game/gamemodes/meteor/meteors.dm +++ b/code/game/gamemodes/meteor/meteors.dm @@ -100,7 +100,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event var/threat = 0 // used for determining which meteors are most interesting var/lifetime = DEFAULT_METEOR_LIFETIME - var/list/meteordrop = list(/obj/item/weapon/ore/iron) + var/list/meteordrop = list(/obj/item/ore/iron) var/dropamt = 2 /obj/effect/meteor/Move() @@ -170,8 +170,8 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event #undef METEOR_MEDAL -/obj/effect/meteor/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/pickaxe)) +/obj/effect/meteor/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pickaxe)) make_debris() qdel(src) else @@ -209,7 +209,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event hits = 1 hitpwr = 3 meteorsound = 'sound/weapons/gunshot_smg.ogg' - meteordrop = list(/obj/item/weapon/ore/glass) + meteordrop = list(/obj/item/ore/glass) threat = 1 //Medium-sized @@ -242,7 +242,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event hits = 5 heavy = 1 meteorsound = 'sound/effects/bamf.ogg' - meteordrop = list(/obj/item/weapon/ore/plasma) + meteordrop = list(/obj/item/ore/plasma) threat = 20 /obj/effect/meteor/flaming/meteor_effect() @@ -254,7 +254,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event name = "glowing meteor" icon_state = "glowing" heavy = 1 - meteordrop = list(/obj/item/weapon/ore/uranium) + meteordrop = list(/obj/item/ore/uranium) threat = 15 @@ -272,13 +272,13 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event hits = 2 heavy = 1 meteorsound = 'sound/effects/blobattack.ogg' - meteordrop = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/human, /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/) + meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/human, /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant, /obj/item/organ/heart, /obj/item/organ/lungs, /obj/item/organ/tongue, /obj/item/organ/appendix/) var/meteorgibs = /obj/effect/gibspawner/generic threat = 2 /obj/effect/meteor/meaty/New() for(var/path in meteordrop) - if(path == /obj/item/weapon/reagent_containers/food/snacks/meat/slab/human/mutant) + if(path == /obj/item/reagent_containers/food/snacks/meat/slab/human/mutant) meteordrop -= path meteordrop += pick(subtypesof(path)) @@ -304,7 +304,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event //Meaty Ore Xeno edition /obj/effect/meteor/meaty/xeno color = "#5EFF00" - meteordrop = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/organ/tongue/alien) + meteordrop = list(/obj/item/reagent_containers/food/snacks/meat/slab/xeno, /obj/item/organ/tongue/alien) meteorgibs = /obj/effect/gibspawner/xeno /obj/effect/meteor/meaty/xeno/New() @@ -324,7 +324,7 @@ GLOBAL_LIST_INIT(meteorsC, list(/obj/effect/meteor/dust)) //for space dust event hitpwr = 1 heavy = 1 meteorsound = 'sound/effects/bamf.ogg' - meteordrop = list(/obj/item/weapon/ore/plasma) + meteordrop = list(/obj/item/ore/plasma) threat = 50 /obj/effect/meteor/tunguska/Move() @@ -355,7 +355,7 @@ GLOBAL_LIST_INIT(meteorsSPOOKY, list(/obj/effect/meteor/pumpkin)) hits = 10 heavy = 1 dropamt = 1 - meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/weapon/reagent_containers/food/snacks/grown/pumpkin) + meteordrop = list(/obj/item/clothing/head/hardhat/pumpkinhead, /obj/item/reagent_containers/food/snacks/grown/pumpkin) threat = 100 /obj/effect/meteor/pumpkin/New() diff --git a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm index 579080894ce..c55b4db4075 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_gear.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_gear.dm @@ -16,10 +16,10 @@ actions_types = list(/datum/action/item_action/hands_free/activate) allowed = list( /obj/item/device/abductor, - /obj/item/weapon/abductor_baton, - /obj/item/weapon/melee/baton, - /obj/item/weapon/gun/energy, - /obj/item/weapon/restraints/handcuffs + /obj/item/abductor_baton, + /obj/item/melee/baton, + /obj/item/gun/energy, + /obj/item/restraints/handcuffs ) var/mode = VEST_STEALTH var/stealth_active = 0 @@ -292,7 +292,7 @@ /obj/item/device/firing_pin/abductor/pin_auth(mob/living/user) . = isabductor(user) -/obj/item/weapon/gun/energy/alien +/obj/item/gun/energy/alien name = "alien pistol" desc = "A complicated gun that fires bursts of high-intensity radiation." ammo_type = list(/obj/item/ammo_casing/energy/declone) @@ -302,7 +302,7 @@ origin_tech = "combat=4;magnets=7;powerstorage=3;abductor=3" trigger_guard = TRIGGER_GUARD_ALLOW_ALL -/obj/item/weapon/paper/guides/antag/abductor +/obj/item/paper/guides/antag/abductor name = "Dissection Guide" icon_state = "alienpaper_words" info = {"Dissection for Dummies
@@ -324,10 +324,10 @@
Congratulations! You are now trained for invasive xenobiology research!"} -/obj/item/weapon/paper/guides/antag/abductor/update_icon() +/obj/item/paper/guides/antag/abductor/update_icon() return -/obj/item/weapon/paper/guides/antag/abductor/AltClick() +/obj/item/paper/guides/antag/abductor/AltClick() return #define BATON_STUN 0 @@ -336,7 +336,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} #define BATON_PROBE 3 #define BATON_MODES 4 -/obj/item/weapon/abductor_baton +/obj/item/abductor_baton name = "advanced baton" desc = "A quad-mode baton used for incapacitation and restraining of specimens." var/mode = BATON_STUN @@ -351,7 +351,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} w_class = WEIGHT_CLASS_NORMAL actions_types = list(/datum/action/item_action/toggle_mode) -/obj/item/weapon/abductor_baton/proc/toggle(mob/living/user=usr) +/obj/item/abductor_baton/proc/toggle(mob/living/user=usr) mode = (mode+1)%BATON_MODES var/txt switch(mode) @@ -367,7 +367,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} to_chat(usr, "You switch the baton to [txt] mode.") update_icon() -/obj/item/weapon/abductor_baton/update_icon() +/obj/item/abductor_baton/update_icon() switch(mode) if(BATON_STUN) icon_state = "wonderprodStun" @@ -382,7 +382,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} icon_state = "wonderprodProbe" item_state = "wonderprodProbe" -/obj/item/weapon/abductor_baton/attack(mob/target, mob/living/user) +/obj/item/abductor_baton/attack(mob/target, mob/living/user) if(!isabductor(user)) return @@ -413,10 +413,10 @@ Congratulations! You are now trained for invasive xenobiology research!"} if(BATON_PROBE) ProbeAttack(L,user) -/obj/item/weapon/abductor_baton/attack_self(mob/living/user) +/obj/item/abductor_baton/attack_self(mob/living/user) toggle(user) -/obj/item/weapon/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/StunAttack(mob/living/L,mob/living/user) user.lastattacked = L L.lastattacker = user @@ -433,7 +433,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} add_logs(user, L, "stunned") -/obj/item/weapon/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/SleepAttack(mob/living/L,mob/living/user) if(L.incapacitated(TRUE, TRUE)) L.visible_message("[user] has induced sleep in [L] with [src]!", \ "You suddenly feel very drowsy!") @@ -446,7 +446,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} L.visible_message("[user] tried to induce sleep in [L] with [src]!", \ "You suddenly feel drowsy!") -/obj/item/weapon/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/CuffAttack(mob/living/L,mob/living/user) if(!iscarbon(L)) return var/mob/living/carbon/C = L @@ -457,7 +457,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} "[user] begins shaping an energy field around your hands!") if(do_mob(user, C, 30) && (C.get_num_arms() >= 2 || C.get_arm_ignore())) if(!C.handcuffed) - C.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(C) + C.handcuffed = new /obj/item/restraints/handcuffs/energy/used(C) C.update_handcuffed() to_chat(user, "You restrain [C].") add_logs(user, C, "handcuffed") @@ -466,7 +466,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} else to_chat(user, "[C] doesn't have two hands...") -/obj/item/weapon/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) +/obj/item/abductor_baton/proc/ProbeAttack(mob/living/L,mob/living/user) L.visible_message("[user] probes [L] with [src]!", \ "[user] probes you!") @@ -487,21 +487,21 @@ Congratulations! You are now trained for invasive xenobiology research!"} to_chat(user, "Probing result:[species]") to_chat(user, "[helptext]") -/obj/item/weapon/restraints/handcuffs/energy +/obj/item/restraints/handcuffs/energy name = "hard-light energy field" desc = "A hard-light field restraining the hands." icon_state = "cuff_white" // Needs sprite lefthand_file = 'icons/mob/inhands/equipment/security_lefthand.dmi' righthand_file = 'icons/mob/inhands/equipment/security_righthand.dmi' breakouttime = 450 - trashtype = /obj/item/weapon/restraints/handcuffs/energy/used + trashtype = /obj/item/restraints/handcuffs/energy/used origin_tech = "materials=4;magnets=5;abductor=2" -/obj/item/weapon/restraints/handcuffs/energy/used +/obj/item/restraints/handcuffs/energy/used desc = "energy discharge" flags_1 = DROPDEL_1 -/obj/item/weapon/restraints/handcuffs/energy/used/dropped(mob/user) +/obj/item/restraints/handcuffs/energy/used/dropped(mob/user) user.visible_message("[user]'s [src] break in a discharge of energy!", \ "[user]'s [src] break in a discharge of energy!") var/datum/effect_system/spark_spread/S = new @@ -509,7 +509,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} S.start() . = ..() -/obj/item/weapon/abductor_baton/examine(mob/user) +/obj/item/abductor_baton/examine(mob/user) ..() switch(mode) if(BATON_STUN) @@ -535,48 +535,48 @@ Congratulations! You are now trained for invasive xenobiology research!"} ..() make_syndie() -/obj/item/device/radio/headset/abductor/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/screwdriver)) +/obj/item/device/radio/headset/abductor/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/screwdriver)) return // Stops humans from disassembling abductor headsets. return ..() -/obj/item/weapon/scalpel/alien +/obj/item/scalpel/alien name = "alien scalpel" desc = "It's a gleaming sharp knife made out of silvery-green metal." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/hemostat/alien +/obj/item/hemostat/alien name = "alien hemostat" desc = "You've never seen this before." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/retractor/alien +/obj/item/retractor/alien name = "alien retractor" desc = "You're not sure if you want the veil pulled back." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/circular_saw/alien +/obj/item/circular_saw/alien name = "alien saw" desc = "Do the aliens also lose this, and need to find an alien hatchet?" icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/surgicaldrill/alien +/obj/item/surgicaldrill/alien name = "alien drill" desc = "Maybe alien surgeons have finally found a use for the drill." icon = 'icons/obj/abductor.dmi' origin_tech = "materials=2;biotech=2;abductor=2" toolspeed = 0.25 -/obj/item/weapon/cautery/alien +/obj/item/cautery/alien name = "alien cautery" desc = "Why would bloodless aliens have a tool to stop bleeding? \ Unless..." @@ -611,7 +611,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} density = TRUE /obj/structure/table_frame/abductor/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/wrench)) + if(istype(I, /obj/item/wrench)) to_chat(user, "You start disassembling [src]...") playsound(src.loc, I.usesound, 50, 1) if(do_after(user, 30*I.toolspeed, target = src)) @@ -706,8 +706,8 @@ Congratulations! You are now trained for invasive xenobiology research!"} state = 1 /obj/structure/door_assembly/door_assembly_abductor/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/weldingtool) && !anchored ) - var/obj/item/weapon/weldingtool/WT = W + if(istype(W, /obj/item/weldingtool) && !anchored ) + var/obj/item/weldingtool/WT = W if(WT.remove_fuel(0,user)) user.visible_message("[user] disassembles the airlock assembly.", \ "You start to disassemble the airlock assembly...") @@ -720,7 +720,7 @@ Congratulations! You are now trained for invasive xenobiology research!"} qdel(src) else return - else if(istype(W, /obj/item/weapon/airlock_painter)) + else if(istype(W, /obj/item/airlock_painter)) return // no repainting else if(istype(W, /obj/item/stack/sheet)) return // no material modding diff --git a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm index 74b4dc7ce1d..aa97d1e2d86 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_outfits.dm @@ -2,7 +2,7 @@ name = "Abductor Basic" uniform = /obj/item/clothing/under/color/grey //they're greys gettit shoes = /obj/item/clothing/shoes/combat - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack ears = /obj/item/device/radio/headset/abductor /datum/outfit/abductor/proc/get_team_console(team_number) @@ -25,7 +25,7 @@ console.AddVest(V) V.flags_1 |= NODROP_1 - var/obj/item/weapon/storage/backpack/B = locate() in H + var/obj/item/storage/backpack/B = locate() in H if(B) for(var/obj/item/device/abductor/gizmo/G in B.contents) console.AddGizmo(G) @@ -40,11 +40,11 @@ name = "Abductor Agent" head = /obj/item/clothing/head/helmet/abductor suit = /obj/item/clothing/suit/armor/abductor/vest - suit_store = /obj/item/weapon/abductor_baton - belt = /obj/item/weapon/storage/belt/military/abductor/full + suit_store = /obj/item/abductor_baton + belt = /obj/item/storage/belt/military/abductor/full backpack_contents = list( - /obj/item/weapon/gun/energy/alien = 1, + /obj/item/gun/energy/alien = 1, /obj/item/device/abductor/silencer = 1 ) @@ -58,5 +58,5 @@ /datum/outfit/abductor/scientist/post_equip(mob/living/carbon/human/H, visualsOnly = FALSE) ..() if(!visualsOnly) - var/obj/item/weapon/implant/abductor/beamplant = new /obj/item/weapon/implant/abductor(H) + var/obj/item/implant/abductor/beamplant = new /obj/item/implant/abductor(H) beamplant.implant(H) diff --git a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm index 06e4a84569c..879f68e960b 100644 --- a/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm +++ b/code/game/gamemodes/miniantags/abduction/abduction_surgery.dm @@ -10,7 +10,7 @@ var/mob/living/carbon/human/H = user if(H.dna.species.id == "abductor") return 1 - for(var/obj/item/weapon/implant/abductor/A in H.implants) + for(var/obj/item/implant/abductor/A in H.implants) return 1 return 0 diff --git a/code/game/gamemodes/miniantags/abduction/gland.dm b/code/game/gamemodes/miniantags/abduction/gland.dm index 21becd3c24d..8c408c007e4 100644 --- a/code/game/gamemodes/miniantags/abduction/gland.dm +++ b/code/game/gamemodes/miniantags/abduction/gland.dm @@ -171,7 +171,7 @@ /obj/item/organ/heart/gland/egg/activate() to_chat(owner, "You lay an egg!") - var/obj/item/weapon/reagent_containers/food/snacks/egg/egg = new(owner.loc) + var/obj/item/reagent_containers/food/snacks/egg/egg = new(owner.loc) egg.reagents.add_reagent("sacid",20) egg.desc += " It smells bad." diff --git a/code/game/gamemodes/miniantags/abduction/machinery/console.dm b/code/game/gamemodes/miniantags/abduction/machinery/console.dm index 4cdebea880a..f3deebc6b74 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/console.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/console.dm @@ -95,7 +95,7 @@ else if(href_list["dispense"]) switch(href_list["dispense"]) if("baton") - Dispense(/obj/item/weapon/abductor_baton,cost=2) + Dispense(/obj/item/abductor_baton,cost=2) if("helmet") Dispense(/obj/item/clothing/head/helmet/abductor) if("silencer") diff --git a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm index 794b1bfa8e0..88bb84fc4a8 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/dispenser.dm @@ -58,7 +58,7 @@ popup.open() return -/obj/machinery/abductor/gland_dispenser/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/abductor/gland_dispenser/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/organ/heart/gland)) if(!user.drop_item()) return diff --git a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm index 9e8a8d974df..58ca8bbea9a 100644 --- a/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm +++ b/code/game/gamemodes/miniantags/abduction/machinery/experiment.dm @@ -98,7 +98,7 @@ var/dat dat += "

Experiment

" if(occupant) - var/obj/item/weapon/photo/P = new + var/obj/item/photo/P = new P.photocreate(null, icon(dissection_icon(occupant), dir = SOUTH)) user << browse_rsc(P.img, "dissection_img") dat += "
" diff --git a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm index c24ab53ef54..bbd78ff76a0 100644 --- a/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm +++ b/code/game/gamemodes/miniantags/bot_swarm/swarmer.dm @@ -38,8 +38,8 @@ /obj/effect/mob_spawn/swarmer/attack_hand(mob/living/user) to_chat(user, "Picking up the swarmer may cause it to activate. You should be careful about this.") -/obj/effect/mob_spawn/swarmer/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/screwdriver) && user.a_intent != INTENT_HARM) +/obj/effect/mob_spawn/swarmer/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/screwdriver) && user.a_intent != INTENT_HARM) user.visible_message("[usr.name] deactivates [src].", "After some fiddling, you find a way to disable [src]'s power source.", "You hear clicking.") @@ -91,7 +91,7 @@ projectiletype = /obj/item/projectile/beam/disabler ranged_cooldown_time = 20 projectilesound = 'sound/weapons/taser2.ogg' - loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/weapon/ore/bluespace_crystal) + loot = list(/obj/effect/decal/cleanable/robot_debris, /obj/item/ore/bluespace_crystal) del_on_death = 1 deathmessage = "explodes with a sharp pop!" light_color = LIGHT_COLOR_CYAN @@ -191,7 +191,7 @@ return 1 return ..() -/obj/item/weapon/gun/swarmer_act()//Stops you from eating the entire armory +/obj/item/gun/swarmer_act()//Stops you from eating the entire armory return FALSE /obj/item/clockwork/alloy_shards/IntegrateAmount() @@ -469,7 +469,7 @@ var/mob/living/carbon/human/H = target if(ishuman(target) && (!H.handcuffed)) - H.handcuffed = new /obj/item/weapon/restraints/handcuffs/energy/used(H) + H.handcuffed = new /obj/item/restraints/handcuffs/energy/used(H) H.update_handcuffed() add_logs(src, H, "handcuffed") diff --git a/code/game/gamemodes/miniantags/hades/hades.dm b/code/game/gamemodes/miniantags/hades/hades.dm index 9b9f1cbf803..948aaeb4224 100644 --- a/code/game/gamemodes/miniantags/hades/hades.dm +++ b/code/game/gamemodes/miniantags/hades/hades.dm @@ -136,7 +136,7 @@ src.visible_message("[src]'s Staff is flung free as their body explodes.") var/obj/structure/ladder/unbreakable/hades/churchLadder = new/obj/structure/ladder/unbreakable/hades(T) var/obj/structure/ladder/unbreakable/hades/bodyLadder = new/obj/structure/ladder/unbreakable/hades(get_turf(src)) - var/obj/item/weapon/hades_staff/HS = new/obj/item/weapon/hades_staff(get_turf(src)) + var/obj/item/hades_staff/HS = new/obj/item/hades_staff(get_turf(src)) HS.throw_at_fast(pick(orange(src,7)),10,1) churchLadder.up = bodyLadder bodyLadder.down = churchLadder @@ -447,8 +447,8 @@ if(isIndulged) sinPerson << "Your stomach growls, you feel hungry." var/list/allTypes = list() - for(var/A in typesof(/obj/item/weapon/reagent_containers/food/snacks)) - var/obj/item/weapon/reagent_containers/food/snacks/O = A + for(var/A in typesof(/obj/item/reagent_containers/food/snacks)) + var/obj/item/reagent_containers/food/snacks/O = A if(initial(O.cooked_type)) allTypes += A for(var/i in 1 to 10) @@ -461,12 +461,12 @@ /proc/sin_Pride(var/mob/living/carbon/human/sinPerson, var/isIndulged) if(isIndulged) sinPerson << "You feel strong enough to take on the world." - var/obj/item/weapon/twohanded/sin_pride/good = new/obj/item/weapon/twohanded/sin_pride(get_turf(sinPerson)) + var/obj/item/twohanded/sin_pride/good = new/obj/item/twohanded/sin_pride(get_turf(sinPerson)) good.name = "Indulged [good.name]" good.pride_direction = FALSE else sinPerson << "You feel small and weak, like the entire world is against you." - var/obj/item/weapon/twohanded/sin_pride/bad = new/obj/item/weapon/twohanded/sin_pride(get_turf(sinPerson)) + var/obj/item/twohanded/sin_pride/bad = new/obj/item/twohanded/sin_pride(get_turf(sinPerson)) bad.name = "Punished [bad.name]" bad.pride_direction = TRUE @@ -550,7 +550,7 @@ icon = 'icons/effects/224x224.dmi' -/obj/item/weapon/twohanded/sin_pride +/obj/item/twohanded/sin_pride icon_state = "mjollnir0" name = "Pride-struck Hammer" desc = "It resonates an aura of Pride." @@ -564,11 +564,11 @@ hitsound = 'sound/weapons/blade1.ogg' var/pride_direction = FALSE -/obj/item/weapon/twohanded/sin_pride/update_icon() +/obj/item/twohanded/sin_pride/update_icon() icon_state = "mjollnir[wielded]" return -/obj/item/weapon/twohanded/sin_pride/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) +/obj/item/twohanded/sin_pride/afterattack(atom/A as mob|obj|turf|area, mob/user, proximity) if(!proximity) return if(wielded) if(istype(A,/mob/living/carbon/human)) @@ -655,7 +655,7 @@ attacktext = "strikes at" attack_sound = 'sound/weapons/bladeslice.ogg' - butcher_results = list(/obj/item/clothing/mask/gas/cyborg/hades = 1,/obj/item/clothing/suit/hooded/chaplain_hoodie/hades = 1,/obj/item/weapon/hades_staff/fake = 1) + butcher_results = list(/obj/item/clothing/mask/gas/cyborg/hades = 1,/obj/item/clothing/suit/hooded/chaplain_hoodie/hades = 1,/obj/item/hades_staff/fake = 1) unsuitable_atmos_damage = 0 del_on_death = 0 diff --git a/code/game/gamemodes/miniantags/hades/hades_chapel.dm b/code/game/gamemodes/miniantags/hades/hades_chapel.dm index cfed1e76beb..df8a2efafd0 100644 --- a/code/game/gamemodes/miniantags/hades/hades_chapel.dm +++ b/code/game/gamemodes/miniantags/hades/hades_chapel.dm @@ -39,14 +39,14 @@ playsound(get_turf(src), 'sound/effects/pope_entry.ogg', 100, 1) sleep(100) playsound(get_turf(src), 'sound/effects/hyperspace_end.ogg', 100, 1) - new/obj/item/weapon/hades_staff/imbued(get_turf(src)) + new/obj/item/hades_staff/imbued(get_turf(src)) src.visible_message("[src] shatters into a thousand shards, a staff falling from it.") qdel(src) -/obj/structure/chair/hades/attackby(obj/item/weapon/W, mob/user, params) +/obj/structure/chair/hades/attackby(obj/item/W, mob/user, params) ..() - if(istype(W, /obj/item/weapon/hades_staff)) - var/obj/item/weapon/hades_staff/HS = W + if(istype(W, /obj/item/hades_staff)) + var/obj/item/hades_staff/HS = W if(!HS.isKey) return src.visible_message("[user] inserts the [W] into the [src], giving it a quick turn.") @@ -74,11 +74,11 @@ /obj/structure/ladder/unbreakable/hades/update_icon() return -/obj/item/weapon/paper/hades_instructions +/obj/item/paper/hades_instructions name = "paper- 'Hastily Scrawled Letter'" info = "The Master has instructed us to collect corpses for the ritual, and told us to deposity them in the Ritual Room, behind a bookcase in the library. The Master has locked the device to only work with his key, so no more accidents happen." -/obj/item/weapon/hades_staff +/obj/item/hades_staff name = "Staff of Hades" desc = "A large, dark staff, with a set of key-like prongs on the end." icon_state = "staffofchange" @@ -93,12 +93,12 @@ block_chance = 25 var/isKey = 1 -/obj/item/weapon/hades_staff/fake +/obj/item/hades_staff/fake name = "Inert Staff of Hades" desc = "A large, dark staff." isKey = 0 -/obj/item/weapon/hades_staff/imbued +/obj/item/hades_staff/imbued name = "Imbued Staff of Hades" desc = " Bestowed with the power of wayward souls, this Staff allows the wielder to judge a target." force = 75 @@ -107,7 +107,7 @@ var/lastJudge = 0 var/judgeCooldown = 150 -/obj/item/weapon/hades_staff/imbued/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) +/obj/item/hades_staff/imbued/attack(mob/living/carbon/human/M, mob/living/carbon/human/user) if(!istype(M)) return ..() diff --git a/code/game/gamemodes/miniantags/morph/morph.dm b/code/game/gamemodes/miniantags/morph/morph.dm index af27833d15e..0eb0882332b 100644 --- a/code/game/gamemodes/miniantags/morph/morph.dm +++ b/code/game/gamemodes/miniantags/morph/morph.dm @@ -30,7 +30,7 @@ wander = 0 attacktext = "glomps" attack_sound = 'sound/effects/blobattack.ogg' - butcher_results = list(/obj/item/weapon/reagent_containers/food/snacks/meat/slab = 2) + butcher_results = list(/obj/item/reagent_containers/food/snacks/meat/slab = 2) var/morphed = 0 var/atom/movable/form = null diff --git a/code/game/gamemodes/miniantags/revenant/revenant.dm b/code/game/gamemodes/miniantags/revenant/revenant.dm index e16c21e2e28..5e1d80e1759 100644 --- a/code/game/gamemodes/miniantags/revenant/revenant.dm +++ b/code/game/gamemodes/miniantags/revenant/revenant.dm @@ -174,7 +174,7 @@ //damage, gibbing, and dying /mob/living/simple_animal/revenant/attackby(obj/item/W, mob/living/user, params) . = ..() - if(istype(W, /obj/item/weapon/nullrod)) + if(istype(W, /obj/item/nullrod)) visible_message("[src] violently flinches!", \ "As \the [W] passes through you, you feel your essence draining away!") adjustBruteLoss(25) //hella effective @@ -218,7 +218,7 @@ alpha = i visible_message("[src]'s body breaks apart into a fine pile of blue dust.") var/reforming_essence = essence_regen_cap //retain the gained essence capacity - var/obj/item/weapon/ectoplasm/revenant/R = new(get_turf(src)) + var/obj/item/ectoplasm/revenant/R = new(get_turf(src)) R.essence = max(reforming_essence - 15 * perfectsouls, 75) //minus any perfect souls R.client_to_revive = client //If the essence reforms, the old revenant is put back in the body R.revenant = src @@ -321,7 +321,7 @@ //reforming -/obj/item/weapon/ectoplasm/revenant +/obj/item/ectoplasm/revenant name = "glimmering residue" desc = "A pile of fine blue dust. Small tendrils of violet mist swirl around it." icon = 'icons/effects/effects.dmi' @@ -333,14 +333,14 @@ var/client/client_to_revive var/mob/living/simple_animal/revenant/revenant -/obj/item/weapon/ectoplasm/revenant/New() +/obj/item/ectoplasm/revenant/New() ..() addtimer(CALLBACK(src, .proc/try_reform), 600) -/obj/item/weapon/ectoplasm/revenant/proc/scatter() +/obj/item/ectoplasm/revenant/proc/scatter() qdel(src) -/obj/item/weapon/ectoplasm/revenant/proc/try_reform() +/obj/item/ectoplasm/revenant/proc/try_reform() if(reforming) reforming = FALSE reform() @@ -348,7 +348,7 @@ inert = TRUE visible_message("[src] settles down and seems lifeless.") -/obj/item/weapon/ectoplasm/revenant/attack_self(mob/user) +/obj/item/ectoplasm/revenant/attack_self(mob/user) if(!reforming || inert) return ..() user.visible_message("[user] scatters [src] in all directions.", \ @@ -356,21 +356,21 @@ user.drop_item() scatter() -/obj/item/weapon/ectoplasm/revenant/throw_impact(atom/hit_atom) +/obj/item/ectoplasm/revenant/throw_impact(atom/hit_atom) ..() if(inert) return visible_message("[src] breaks into particles upon impact, which fade away to nothingness.") scatter() -/obj/item/weapon/ectoplasm/revenant/examine(mob/user) +/obj/item/ectoplasm/revenant/examine(mob/user) ..() if(inert) to_chat(user, "It seems inert.") else if(reforming) to_chat(user, "It is shifting and distorted. It would be wise to destroy this.") -/obj/item/weapon/ectoplasm/revenant/proc/reform() +/obj/item/ectoplasm/revenant/proc/reform() if(QDELETED(src) || QDELETED(revenant) || inert) return var/key_of_revenant @@ -412,7 +412,7 @@ revenant = null qdel(src) -/obj/item/weapon/ectoplasm/revenant/Destroy() +/obj/item/ectoplasm/revenant/Destroy() if(!QDELETED(revenant)) qdel(revenant) ..() diff --git a/code/game/gamemodes/nuclear/nuclear.dm b/code/game/gamemodes/nuclear/nuclear.dm index 16fb1f601dd..59650561a6e 100644 --- a/code/game/gamemodes/nuclear/nuclear.dm +++ b/code/game/gamemodes/nuclear/nuclear.dm @@ -114,9 +114,9 @@ var/obj/item/device/nuclear_challenge/challenge = new /obj/item/device/nuclear_challenge synd_mind.current.put_in_hands_or_del(challenge) - var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/weapon/card/id) + var/list/foundIDs = synd_mind.current.search_contents_for(/obj/item/card/id) if(foundIDs.len) - for(var/obj/item/weapon/card/id/ID in foundIDs) + for(var/obj/item/card/id/ID in foundIDs) ID.name = "lead agent card" ID.access += ACCESS_SYNDICATE_LEADER else @@ -127,7 +127,7 @@ A.command = TRUE if(nuke_code) - var/obj/item/weapon/paper/P = new + var/obj/item/paper/P = new P.info = "The nuclear authorization code is: [nuke_code]" P.name = "nuclear bomb code" var/mob/living/carbon/human/H = synd_mind.current @@ -186,7 +186,7 @@ /datum/game_mode/nuclear/declare_completion() var/disk_rescued = 1 - for(var/obj/item/weapon/disk/nuclear/D in GLOB.poi_list) + for(var/obj/item/disk/nuclear/D in GLOB.poi_list) if(!D.onCentCom()) disk_rescued = 0 break @@ -323,12 +323,12 @@ uniform = /obj/item/clothing/under/syndicate shoes = /obj/item/clothing/shoes/combat gloves = /obj/item/clothing/gloves/combat - back = /obj/item/weapon/storage/backpack + back = /obj/item/storage/backpack ears = /obj/item/device/radio/headset/syndicate/alt - l_pocket = /obj/item/weapon/pinpointer/syndicate - id = /obj/item/weapon/card/id/syndicate - belt = /obj/item/weapon/gun/ballistic/automatic/pistol - backpack_contents = list(/obj/item/weapon/storage/box/syndie=1) + l_pocket = /obj/item/pinpointer/syndicate + id = /obj/item/card/id/syndicate + belt = /obj/item/gun/ballistic/automatic/pistol + backpack_contents = list(/obj/item/storage/box/syndie=1) var/tc = 25 @@ -347,9 +347,9 @@ U.hidden_uplink.telecrystals = tc H.equip_to_slot_or_del(U, slot_in_backpack) - var/obj/item/weapon/implant/weapons_auth/W = new/obj/item/weapon/implant/weapons_auth(H) + var/obj/item/implant/weapons_auth/W = new/obj/item/implant/weapons_auth(H) W.implant(H) - var/obj/item/weapon/implant/explosive/E = new/obj/item/weapon/implant/explosive(H) + var/obj/item/implant/explosive/E = new/obj/item/implant/explosive(H) E.implant(H) H.faction |= "syndicate" H.update_icons() @@ -360,10 +360,10 @@ glasses = /obj/item/clothing/glasses/night mask = /obj/item/clothing/mask/gas/syndicate suit = /obj/item/clothing/suit/space/hardsuit/syndi - r_pocket = /obj/item/weapon/tank/internals/emergency_oxygen/engi + r_pocket = /obj/item/tank/internals/emergency_oxygen/engi internals_slot = slot_r_store - belt = /obj/item/weapon/storage/belt/military - r_hand = /obj/item/weapon/gun/ballistic/automatic/shotgun/bulldog - backpack_contents = list(/obj/item/weapon/storage/box/syndie=1,\ - /obj/item/weapon/tank/jetpack/oxygen/harness=1,\ - /obj/item/weapon/gun/ballistic/automatic/pistol=1) + belt = /obj/item/storage/belt/military + r_hand = /obj/item/gun/ballistic/automatic/shotgun/bulldog + backpack_contents = list(/obj/item/storage/box/syndie=1,\ + /obj/item/tank/jetpack/oxygen/harness=1,\ + /obj/item/gun/ballistic/automatic/pistol=1) diff --git a/code/game/gamemodes/nuclear/nuclear_challenge.dm b/code/game/gamemodes/nuclear/nuclear_challenge.dm index f275db3b0b0..f671d383959 100644 --- a/code/game/gamemodes/nuclear/nuclear_challenge.dm +++ b/code/game/gamemodes/nuclear/nuclear_challenge.dm @@ -49,7 +49,7 @@ to_chat(user, "You've attracted the attention of powerful forces within the syndicate. A bonus bundle of telecrystals has been granted to your team. Great things await you if you complete the mission.") for(var/V in GLOB.syndicate_shuttle_boards) - var/obj/item/weapon/circuitboard/computer/syndicate_shuttle/board = V + var/obj/item/circuitboard/computer/syndicate_shuttle/board = V board.challenge = TRUE var/obj/item/device/radio/uplink/nuclear/U = new(get_turf(user)) @@ -74,7 +74,7 @@ to_chat(user, "It's too late to declare hostilities. Your benefactors are already busy with other schemes. You'll have to make do with what you have on hand.") return 0 for(var/V in GLOB.syndicate_shuttle_boards) - var/obj/item/weapon/circuitboard/computer/syndicate_shuttle/board = V + var/obj/item/circuitboard/computer/syndicate_shuttle/board = V if(board.moved) to_chat(user, "The shuttle has already been moved! You have forfeit the right to declare war.") return 0 diff --git a/code/game/gamemodes/nuclear/nuclearbomb.dm b/code/game/gamemodes/nuclear/nuclearbomb.dm index 941e0bf0813..ee611349f8d 100644 --- a/code/game/gamemodes/nuclear/nuclearbomb.dm +++ b/code/game/gamemodes/nuclear/nuclearbomb.dm @@ -32,7 +32,7 @@ var/r_code = "ADMIN" var/yes_code = FALSE var/safety = TRUE - var/obj/item/weapon/disk/nuclear/auth = null + var/obj/item/disk/nuclear/auth = null use_power = NO_POWER_USE var/previous_level = "" var/obj/item/nuke_core/core = null @@ -90,7 +90,7 @@ tag = "syndienuke" /obj/machinery/nuclearbomb/attackby(obj/item/I, mob/user, params) - if (istype(I, /obj/item/weapon/disk/nuclear)) + if (istype(I, /obj/item/disk/nuclear)) if(!user.drop_item()) return I.forceMove(src) @@ -100,7 +100,7 @@ switch(deconstruction_state) if(NUKESTATE_INTACT) - if(istype(I, /obj/item/weapon/screwdriver/nuke)) + if(istype(I, /obj/item/screwdriver/nuke)) playsound(loc, I.usesound, 100, 1) to_chat(user, "You start removing [src]'s front panel's screws...") if(do_after(user, 60*I.toolspeed,target=src)) @@ -109,7 +109,7 @@ update_icon() return if(NUKESTATE_UNSCREWED) - if(istype(I, /obj/item/weapon/crowbar)) + if(istype(I, /obj/item/crowbar)) to_chat(user, "You start removing [src]'s front panel...") playsound(loc, I.usesound, 100, 1) if(do_after(user,30*I.toolspeed,target=src)) @@ -118,8 +118,8 @@ update_icon() return if(NUKESTATE_PANEL_REMOVED) - if(istype(I, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/welder = I + if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/welder = I playsound(loc, I.usesound, 100, 1) to_chat(user, "You start cutting [src]'s inner plate...") if(welder.remove_fuel(1,user)) @@ -129,7 +129,7 @@ update_icon() return if(NUKESTATE_WELDED) - if(istype(I, /obj/item/weapon/crowbar)) + if(istype(I, /obj/item/crowbar)) to_chat(user, "You start prying off [src]'s inner plate...") playsound(loc, I.usesound, 100, 1) if(do_after(user,50*I.toolspeed,target=src)) @@ -296,7 +296,7 @@ if("insert_disk") if(!auth) var/obj/item/I = usr.get_active_held_item() - if(istype(I, /obj/item/weapon/disk/nuclear)) + if(istype(I, /obj/item/disk/nuclear)) usr.drop_item() I.forceMove(src) auth = I @@ -362,7 +362,7 @@ if(safety) if(timing) set_security_level(previous_level) - for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) S.nuke_warning = FALSE timing = FALSE @@ -381,14 +381,14 @@ bomb_set = TRUE set_security_level("delta") detonation_timer = world.time + (timer_set * 10) - for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(TRACK_INFILTRATOR) countdown.start() else bomb_set = FALSE detonation_timer = null set_security_level(previous_level) - for(var/obj/item/weapon/pinpointer/syndicate/S in GLOB.pinpointer_list) + for(var/obj/item/pinpointer/syndicate/S in GLOB.pinpointer_list) S.switch_mode_to(initial(S.mode)) S.nuke_warning = FALSE countdown.stop() @@ -482,7 +482,7 @@ This is here to make the tiles around the station mininuke change when it's arme SSmapping.remove_nuke_threat(src) //==========DAT FUKKEN DISK=============== -/obj/item/weapon/disk +/obj/item/disk icon = 'icons/obj/module.dmi' w_class = WEIGHT_CLASS_TINY item_state = "card-id" @@ -490,23 +490,23 @@ This is here to make the tiles around the station mininuke change when it's arme righthand_file = 'icons/mob/inhands/equipment/idcards_righthand.dmi' icon_state = "datadisk0" -/obj/item/weapon/disk/nuclear +/obj/item/disk/nuclear name = "nuclear authentication disk" desc = "Better keep this safe." icon_state = "nucleardisk" - persistence_replacement = /obj/item/weapon/disk/fakenucleardisk + persistence_replacement = /obj/item/disk/fakenucleardisk max_integrity = 250 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 30, bio = 0, rad = 0, fire = 100, acid = 100) resistance_flags = INDESTRUCTIBLE | LAVA_PROOF | FIRE_PROOF | ACID_PROOF -/obj/item/weapon/disk/nuclear/New() +/obj/item/disk/nuclear/New() ..() GLOB.poi_list |= src set_stationloving(TRUE, inform_admins=TRUE) -/obj/item/weapon/disk/nuclear/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/weapon/claymore/highlander)) - var/obj/item/weapon/claymore/highlander/H = I +/obj/item/disk/nuclear/attackby(obj/item/I, mob/living/user, params) + if(istype(I, /obj/item/claymore/highlander)) + var/obj/item/claymore/highlander/H = I if(H.nuke_disk) to_chat(user, "Wait... what?") qdel(H.nuke_disk) @@ -518,13 +518,13 @@ This is here to make the tiles around the station mininuke change when it's arme return 1 return ..() -/obj/item/weapon/disk/nuclear/Destroy(force=FALSE) +/obj/item/disk/nuclear/Destroy(force=FALSE) // respawning is handled in /obj/Destroy() if(force) GLOB.poi_list -= src . = ..() -/obj/item/weapon/disk/nuclear/suicide_act(mob/user) +/obj/item/disk/nuclear/suicide_act(mob/user) user.visible_message("[user] is going delta! It looks like [user.p_theyre()] trying to commit suicide!") playsound(user.loc, 'sound/machines/alarm.ogg', 50, -1, 1) var/end_time = world.time + 100 @@ -542,7 +542,7 @@ This is here to make the tiles around the station mininuke change when it's arme user.visible_message("[user] was destroyed by the nuclear blast!") return OXYLOSS -/obj/item/weapon/disk/fakenucleardisk +/obj/item/disk/fakenucleardisk name = "cheap plastic imitation of the nuclear authentication disk" desc = "Broken dreams and a faint odor of cheese." icon_state = "nucleardisk" diff --git a/code/game/gamemodes/nuclear/pinpointer.dm b/code/game/gamemodes/nuclear/pinpointer.dm index f8862fa2243..9f633096431 100644 --- a/code/game/gamemodes/nuclear/pinpointer.dm +++ b/code/game/gamemodes/nuclear/pinpointer.dm @@ -1,5 +1,5 @@ //Pinpointers are used to track atoms from a distance as long as they're on the same z-level. The captain and nuke ops have ones that track the nuclear authentication disk. -/obj/item/weapon/pinpointer +/obj/item/pinpointer name = "pinpointer" desc = "A handheld tracking device that locks onto certain signals." icon = 'icons/obj/device.dmi' @@ -23,16 +23,16 @@ var/nuke_warning = FALSE // If we've set off a miniature alarm about an armed nuke var/mode = TRACK_NUKE_DISK //What are we looking for? -/obj/item/weapon/pinpointer/New() +/obj/item/pinpointer/New() ..() GLOB.pinpointer_list += src -/obj/item/weapon/pinpointer/Destroy() +/obj/item/pinpointer/Destroy() STOP_PROCESSING(SSfastprocess, src) GLOB.pinpointer_list -= src return ..() -/obj/item/weapon/pinpointer/attack_self(mob/living/user) +/obj/item/pinpointer/attack_self(mob/living/user) active = !active user.visible_message("[user] [active ? "" : "de"]activates their pinpointer.", "You [active ? "" : "de"]activate your pinpointer.") playsound(user, 'sound/items/screwdriver2.ogg', 50, 1) @@ -43,14 +43,14 @@ target = null //Restarting the pinpointer forces a target reset STOP_PROCESSING(SSfastprocess, src) -/obj/item/weapon/pinpointer/attackby(obj/item/I, mob/living/user, params) +/obj/item/pinpointer/attackby(obj/item/I, mob/living/user, params) if(mode != TRACK_ATOM) return ..() user.visible_message("[user] tunes [src] to [I].", "You fine-tune [src]'s tracking to track [I].") playsound(src, 'sound/machines/click.ogg', 50, 1) constant_target = I -/obj/item/weapon/pinpointer/examine(mob/user) +/obj/item/pinpointer/examine(mob/user) ..() var/msg = "Its tracking indicator reads " switch(mode) @@ -73,7 +73,7 @@ if(bomb.timing) to_chat(user, "Extreme danger. Arming signal detected. Time remaining: [bomb.get_time_left()]") -/obj/item/weapon/pinpointer/process() +/obj/item/pinpointer/process() if(!active) STOP_PROCESSING(SSfastprocess, src) return @@ -82,7 +82,7 @@ my_god_jc_a_bomb() addtimer(CALLBACK(src, .proc/refresh_target), 50, TIMER_UNIQUE) -/obj/item/weapon/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking +/obj/item/pinpointer/proc/scan_for_target() //Looks for whatever it's tracking if(target) if(isliving(target)) var/mob/living/L = target @@ -91,7 +91,7 @@ return switch(mode) if(TRACK_NUKE_DISK) - var/obj/item/weapon/disk/nuclear/N = locate() in GLOB.poi_list + var/obj/item/disk/nuclear/N = locate() in GLOB.poi_list target = N if(TRACK_MALF_AI) for(var/V in GLOB.ai_list) @@ -121,7 +121,7 @@ var/turf/T = get_turf(src) target = locate(target_x, target_y, T.z) -/obj/item/weapon/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction +/obj/item/pinpointer/proc/point_to_target() //If we found what we're looking for, show the distance and direction if(!active) return if(!target || (mode == TRACK_ATOM && !constant_target)) @@ -144,7 +144,7 @@ if(16 to INFINITY) icon_state = "pinon[nuke_warning ? "alert" : "far"]" -/obj/item/weapon/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship +/obj/item/pinpointer/proc/my_god_jc_a_bomb() //If we should get the hell back to the ship for(var/obj/machinery/nuclearbomb/bomb in GLOB.nuke_list) if(bomb.timing) if(!nuke_warning) @@ -154,7 +154,7 @@ var/mob/living/L = loc to_chat(L, "Your [name] vibrates and lets out a tinny alarm. Uh oh.") -/obj/item/weapon/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are +/obj/item/pinpointer/proc/switch_mode_to(new_mode) //If we shouldn't be tracking what we are if(isliving(loc)) var/mob/living/L = loc to_chat(L, "Your [name] beeps as it reconfigures its tracking algorithms.") @@ -162,14 +162,14 @@ mode = new_mode target = null //Switch modes so we can find the new target -/obj/item/weapon/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies) +/obj/item/pinpointer/proc/refresh_target() //Periodically removes the target to allow the pinpointer to update (i.e. malf AI shunts, an operative dies) target = null -/obj/item/weapon/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active. +/obj/item/pinpointer/syndicate //Syndicate pinpointers automatically point towards the infiltrator once the nuke is active. name = "syndicate pinpointer" desc = "A handheld tracking device that locks onto certain signals. It's configured to switch tracking modes once it detects the activation signal of a nuclear device." -/obj/item/weapon/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative. +/obj/item/pinpointer/syndicate/cyborg //Cyborg pinpointers just look for a random operative. name = "cyborg syndicate pinpointer" desc = "An integrated tracking device, jury-rigged to search for living Syndicate operatives." mode = TRACK_OPERATIVES diff --git a/code/game/gamemodes/objective.dm b/code/game/gamemodes/objective.dm index e6a22cf3d5d..47aa02d9475 100644 --- a/code/game/gamemodes/objective.dm +++ b/code/game/gamemodes/objective.dm @@ -682,11 +682,11 @@ GLOBAL_LIST_EMPTY(possible_items_special) /datum/objective/steal_five_of_type/summon_guns explanation_text = "Steal at least five guns!" - wanted_items = list(/obj/item/weapon/gun) + wanted_items = list(/obj/item/gun) /datum/objective/steal_five_of_type/summon_magic explanation_text = "Steal at least five magical artefacts!" - wanted_items = list(/obj/item/weapon/spellbook, /obj/item/weapon/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/weapon/scrying, /obj/item/weapon/antag_spawner/contract, /obj/item/device/necromantic_stone) + wanted_items = list(/obj/item/spellbook, /obj/item/gun/magic, /obj/item/clothing/suit/space/hardsuit/wizard, /obj/item/scrying, /obj/item/antag_spawner/contract, /obj/item/device/necromantic_stone) /datum/objective/steal_five_of_type/check_completion() if(!isliving(owner.current)) diff --git a/code/game/gamemodes/objective_items.dm b/code/game/gamemodes/objective_items.dm index 43067d4c229..aa964111313 100644 --- a/code/game/gamemodes/objective_items.dm +++ b/code/game/gamemodes/objective_items.dm @@ -2,7 +2,7 @@ /datum/objective_item var/name = "A silly bike horn! Honk!" - var/targetitem = /obj/item/weapon/bikehorn //typepath of the objective item + var/targetitem = /obj/item/bikehorn //typepath of the objective item var/difficulty = 9001 //vaguely how hard it is to do this objective var/list/excludefromjob = list() //If you don't want a job to get a certain objective (no captain stealing his own medal, etcetc) var/list/altitems = list() //Items which can serve as an alternative to the objective (darn you blueprints) @@ -13,25 +13,25 @@ /datum/objective_item/steal/caplaser name = "the captain's antique laser gun." - targetitem = /obj/item/weapon/gun/energy/laser/captain + targetitem = /obj/item/gun/energy/laser/captain difficulty = 5 excludefromjob = list("Captain") /datum/objective_item/steal/hoslaser name = "the head of security's personal laser gun." - targetitem = /obj/item/weapon/gun/energy/e_gun/hos + targetitem = /obj/item/gun/energy/e_gun/hos difficulty = 10 excludefromjob = list("Head Of Security") /datum/objective_item/steal/handtele name = "a hand teleporter." - targetitem = /obj/item/weapon/hand_tele + targetitem = /obj/item/hand_tele difficulty = 5 excludefromjob = list("Captain") /datum/objective_item/steal/jetpack name = "the Captain's jetpack." - targetitem = /obj/item/weapon/tank/jetpack/oxygen/captain + targetitem = /obj/item/tank/jetpack/oxygen/captain difficulty = 5 excludefromjob = list("Captain") @@ -49,13 +49,13 @@ /datum/objective_item/steal/hypo name = "the hypospray." - targetitem = /obj/item/weapon/reagent_containers/hypospray/CMO + targetitem = /obj/item/reagent_containers/hypospray/CMO difficulty = 5 excludefromjob = list("Chief Medical Officer") /datum/objective_item/steal/nukedisc name = "the nuclear authentication disk." - targetitem = /obj/item/weapon/disk/nuclear + targetitem = /obj/item/disk/nuclear difficulty = 5 excludefromjob = list("Captain") @@ -82,7 +82,7 @@ difficulty = 15 /datum/objective_item/steal/nuke_core/New() - special_equipment += /obj/item/weapon/storage/box/syndie_kit/nuke + special_equipment += /obj/item/storage/box/syndie_kit/nuke ..() /datum/objective_item/steal/supermatter @@ -91,17 +91,17 @@ difficulty = 15 /datum/objective_item/steal/supermatter/New() - special_equipment += /obj/item/weapon/storage/box/syndie_kit/supermatter + special_equipment += /obj/item/storage/box/syndie_kit/supermatter ..() //Items with special checks! /datum/objective_item/steal/plasma name = "28 moles of plasma (full tank)." - targetitem = /obj/item/weapon/tank + targetitem = /obj/item/tank difficulty = 3 excludefromjob = list("Chief Engineer","Research Director","Station Engineer","Scientist","Atmospheric Technician") -/datum/objective_item/steal/plasma/check_special_completion(obj/item/weapon/tank/T) +/datum/objective_item/steal/plasma/check_special_completion(obj/item/tank/T) var/target_amount = text2num(name) var/found_amount = 0 found_amount += T.air_contents.gases["plasma"] ? T.air_contents.gases["plasma"][MOLES] : 0 @@ -124,13 +124,13 @@ targetitem = /obj/item/areaeditor/blueprints difficulty = 10 excludefromjob = list("Chief Engineer") - altitems = list(/obj/item/weapon/photo) + altitems = list(/obj/item/photo) /datum/objective_item/steal/blueprints/check_special_completion(obj/item/I) if(istype(I, /obj/item/areaeditor/blueprints)) return 1 - if(istype(I, /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = I + if(istype(I, /obj/item/photo)) + var/obj/item/photo/P = I if(P.blueprints) //if the blueprints are in frame return 1 return 0 @@ -160,27 +160,27 @@ //Old ninja objectives. /datum/objective_item/special/pinpointer name = "the captain's pinpointer." - targetitem = /obj/item/weapon/pinpointer + targetitem = /obj/item/pinpointer difficulty = 10 /datum/objective_item/special/aegun name = "an advanced energy gun." - targetitem = /obj/item/weapon/gun/energy/e_gun/nuclear + targetitem = /obj/item/gun/energy/e_gun/nuclear difficulty = 10 /datum/objective_item/special/ddrill name = "a diamond drill." - targetitem = /obj/item/weapon/pickaxe/drill/diamonddrill + targetitem = /obj/item/pickaxe/drill/diamonddrill difficulty = 10 /datum/objective_item/special/boh name = "a bag of holding." - targetitem = /obj/item/weapon/storage/backpack/holding + targetitem = /obj/item/storage/backpack/holding difficulty = 10 /datum/objective_item/special/hypercell name = "a hyper-capacity power cell." - targetitem = /obj/item/weapon/stock_parts/cell/hyper + targetitem = /obj/item/stock_parts/cell/hyper difficulty = 5 /datum/objective_item/special/laserpointer @@ -190,7 +190,7 @@ /datum/objective_item/special/corgimeat name = "a piece of corgi meat." - targetitem = /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi + targetitem = /obj/item/reagent_containers/food/snacks/meat/slab/corgi difficulty = 5 //Stack objectives get their own subtype diff --git a/code/game/gamemodes/sandbox/h_sandbox.dm b/code/game/gamemodes/sandbox/h_sandbox.dm index 1586cc43b1a..7a17d54b4c4 100644 --- a/code/game/gamemodes/sandbox/h_sandbox.dm +++ b/code/game/gamemodes/sandbox/h_sandbox.dm @@ -26,23 +26,23 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) var/hsbinfo = null //items that shouldn't spawn on the floor because they would bug or act weird var/global/list/spawn_forbidden = list( - /obj/item/tk_grab, /obj/item/weapon/implant, // not implanter, the actual thing that is inside you + /obj/item/tk_grab, /obj/item/implant, // not implanter, the actual thing that is inside you /obj/item/assembly, /obj/item/device/onetankbomb, /obj/item/radio, /obj/item/device/pda/ai, /obj/item/device/uplink, /obj/item/smallDelivery, /obj/item/projectile, - /obj/item/borg/sight, /obj/item/borg/stun, /obj/item/weapon/robot_module) + /obj/item/borg/sight, /obj/item/borg/stun, /obj/item/robot_module) /datum/hSB/proc/update() var/global/list/hrefs = list( "Space Gear", "Suit Up (Space Travel Gear)" = "hsbsuit", "Spawn Gas Mask" = "hsbspawn&path=[/obj/item/clothing/mask/gas]", - "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/weapon/tank/internals/emergency_oxygen/double]", + "Spawn Emergency Air Tank" = "hsbspawn&path=[/obj/item/tank/internals/emergency_oxygen/double]", "Standard Tools", "Spawn Flashlight" = "hsbspawn&path=[/obj/item/device/flashlight]", - "Spawn Toolbox" = "hsbspawn&path=[/obj/item/weapon/storage/toolbox/mechanical]", + "Spawn Toolbox" = "hsbspawn&path=[/obj/item/storage/toolbox/mechanical]", "Spawn Light Replacer" = "hsbspawn&path=[/obj/item/device/lightreplacer]", - "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/weapon/storage/firstaid/regular]", + "Spawn Medical Kit" = "hsbspawn&path=[/obj/item/storage/firstaid/regular]", "Spawn All-Access ID" = "hsbaaid", "Building Supplies", @@ -52,10 +52,10 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) "Spawn 50 Reinforced Glass" = "hsbrglass", "Spawn 50 Glass" = "hsbglass", "Spawn Full Cable Coil" = "hsbspawn&path=[/obj/item/stack/cable_coil]", - "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/weapon/stock_parts/cell/hyper]", - "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/weapon/stock_parts/cell/infinite]", + "Spawn Hyper Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/hyper]", + "Spawn Inf. Capacity Power Cell" = "hsbspawn&path=[/obj/item/stock_parts/cell/infinite]", "Spawn Rapid Construction Device" = "hsbrcd", - "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/weapon/rcd_ammo]", + "Spawn RCD Ammo" = "hsb_safespawn&path=[/obj/item/rcd_ammo]", "Spawn Airlock" = "hsbairlock", "Miscellaneous", @@ -171,7 +171,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) P.back.layer = initial(P.back.layer) P.back.plane = initial(P.back.plane) P.back = null - P.back = new/obj/item/weapon/tank/jetpack/oxygen(P) + P.back = new/obj/item/tank/jetpack/oxygen(P) P.back.layer = ABOVE_HUD_LAYER P.back.plane = ABOVE_HUD_PLANE P.update_inv_back() @@ -205,7 +205,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) // All access ID // if("hsbaaid") - var/obj/item/weapon/card/id/gold/ID = new(usr.loc) + var/obj/item/card/id/gold/ID = new(usr.loc) ID.registered_name = usr.real_name ID.assignment = "Sandbox" ID.access = get_all_accesses() @@ -218,7 +218,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if("hsbrcd") if(!GLOB.hsboxspawn) return - new/obj/item/weapon/construction/rcd/combat(usr.loc) + new/obj/item/construction/rcd/combat(usr.loc) // // New sandbox airlock maker @@ -250,7 +250,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!reaginfo) reaginfo = "Reagent Containers (Clothing) (Other Items)

" - var/list/all_items = subtypesof(/obj/item/weapon/reagent_containers) + var/list/all_items = subtypesof(/obj/item/reagent_containers) for(var/typekey in spawn_forbidden) all_items -= typesof(typekey) for(var/O in reverseRange(all_items)) @@ -264,7 +264,7 @@ GLOBAL_VAR_INIT(hsboxspawn, TRUE) if(!objinfo) objinfo = "Other Items (Clothing) (Reagent Containers)

" - var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/weapon/reagent_containers) + var/list/all_items = subtypesof(/obj/item/) - typesof(/obj/item/clothing) - typesof(/obj/item/reagent_containers) for(var/typekey in spawn_forbidden) all_items -= typesof(typekey) diff --git a/code/game/gamemodes/wizard/artefact.dm b/code/game/gamemodes/wizard/artefact.dm index 460dc04da55..3f7ed4e598d 100644 --- a/code/game/gamemodes/wizard/artefact.dm +++ b/code/game/gamemodes/wizard/artefact.dm @@ -3,7 +3,7 @@ ///////////////////////////Veil Render////////////////////// -/obj/item/weapon/veilrender +/obj/item/veilrender name = "veil render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast city." icon = 'icons/obj/wizard.dmi' @@ -20,7 +20,7 @@ var/rend_desc = "You should run now." var/spawn_fast = 0 //if 1, ignores checking for mobs on loc before spawning -/obj/item/weapon/veilrender/attack_self(mob/user) +/obj/item/veilrender/attack_self(mob/user) if(charges > 0) new /obj/effect/rend(get_turf(user), spawn_type, spawn_amt, rend_desc, spawn_fast) charges-- @@ -57,14 +57,14 @@ qdel(src) /obj/effect/rend/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/nullrod)) + if(istype(I, /obj/item/nullrod)) user.visible_message("[user] seals \the [src] with \the [I].") qdel(src) return else return ..() -/obj/item/weapon/veilrender/vealrender +/obj/item/veilrender/vealrender name = "veal render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast farm." spawn_type = /mob/living/simple_animal/cow @@ -72,7 +72,7 @@ activate_descriptor = "hunger" rend_desc = "Reverberates with the sound of ten thousand moos." -/obj/item/weapon/veilrender/honkrender +/obj/item/veilrender/honkrender name = "honk render" desc = "A wicked curved blade of alien origin, recovered from the ruins of a vast circus." spawn_type = /mob/living/simple_animal/hostile/retaliate/clown @@ -101,7 +101,7 @@ return /////////////////////////////////////////Scrying/////////////////// -/obj/item/weapon/scrying +/obj/item/scrying name = "scrying orb" desc = "An incandescent orb of otherworldly energy, staring into it gives you vision beyond mortal means." icon = 'icons/obj/projectiles.dmi' @@ -113,7 +113,7 @@ force = 15 hitsound = 'sound/items/welder2.ogg' -/obj/item/weapon/scrying/attack_self(mob/user) +/obj/item/scrying/attack_self(mob/user) to_chat(user, "You can see...everything!") visible_message("[user] stares into [src], their eyes glazing over.") user.ghostize(1) @@ -191,15 +191,15 @@ H.equip_to_slot_or_del(new hat(H), slot_head) H.equip_to_slot_or_del(new /obj/item/clothing/under/roman(H), slot_w_uniform) H.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(H), slot_shoes) - H.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(H)) - H.put_in_hands_or_del(new /obj/item/weapon/claymore(H)) - H.equip_to_slot_or_del(new /obj/item/weapon/twohanded/spear(H), slot_back) + H.put_in_hands_or_del(new /obj/item/shield/riot/roman(H)) + H.put_in_hands_or_del(new /obj/item/claymore(H)) + H.equip_to_slot_or_del(new /obj/item/twohanded/spear(H), slot_back) /////////////////////Multiverse Blade//////////////////// -/obj/item/weapon/multisword +/obj/item/multisword name = "multiverse sword" desc = "A weapon capable of conquering the universe and beyond. Activate it to summon copies of yourself from others dimensions to fight by your side." icon = 'icons/obj/weapons.dmi' @@ -220,16 +220,16 @@ var/assigned = "unassigned" var/static/list/multiverse = list() -/obj/item/weapon/multisword/New() +/obj/item/multisword/New() ..() multiverse += src -/obj/item/weapon/multisword/Destroy() +/obj/item/multisword/Destroy() multiverse.Remove(src) return ..() -/obj/item/weapon/multisword/attack_self(mob/user) +/obj/item/multisword/attack_self(mob/user) if(user.mind.special_role == "apprentice") to_chat(user, "You know better than to touch your teacher's stuff.") return @@ -265,7 +265,7 @@ spawn_copy(C, get_turf(user.loc), user) to_chat(user, "The sword flashes, and you find yourself face to face with...you!") cooldown = world.time + 400 - for(var/obj/item/weapon/multisword/M in multiverse) + for(var/obj/item/multisword/M in multiverse) if(M.assigned == assigned) M.cooldown = cooldown @@ -275,7 +275,7 @@ to_chat(user, "[src] is recharging! Keep in mind it shares a cooldown with the swords wielded by your copies.") -/obj/item/weapon/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) +/obj/item/multisword/proc/spawn_copy(var/client/C, var/turf/T, mob/user) var/mob/living/carbon/human/M = new/mob/living/carbon/human(T) C.prefs.copy_to(M, icon_updates=0) M.key = C.key @@ -298,9 +298,9 @@ M.dna.update_dna_identity() equip_copy(M) -/obj/item/weapon/multisword/proc/equip_copy(var/mob/living/carbon/human/M) +/obj/item/multisword/proc/equip_copy(var/mob/living/carbon/human/M) - var/obj/item/weapon/multisword/sword = new /obj/item/weapon/multisword + var/obj/item/multisword/sword = new /obj/item/multisword sword.assigned = assigned sword.faction = list("[assigned]") @@ -321,7 +321,7 @@ M.equip_to_slot_or_del(new hat(M), slot_head) M.equip_to_slot_or_del(new /obj/item/clothing/under/roman(M), slot_w_uniform) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/roman(M), slot_shoes) - M.put_in_hands_or_del(new /obj/item/weapon/shield/riot/roman(M)) + M.put_in_hands_or_del(new /obj/item/shield/riot/roman(M)) M.put_in_hands_or_del(sword) if("wizard") @@ -380,7 +380,7 @@ M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/shoes/clown_shoes(M), slot_shoes) M.equip_to_slot_or_del(new /obj/item/clothing/mask/gas/clown_hat(M), slot_wear_mask) - M.equip_to_slot_or_del(new /obj/item/weapon/bikehorn(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/bikehorn(M), slot_l_store) M.put_in_hands_or_del(sword) if("killer") @@ -391,8 +391,8 @@ M.equip_to_slot_or_del(new /obj/item/clothing/head/welding(M), slot_head) M.equip_to_slot_or_del(new /obj/item/device/radio/headset(M), slot_ears) M.equip_to_slot_or_del(new /obj/item/clothing/suit/apron(M), slot_wear_suit) - M.equip_to_slot_or_del(new /obj/item/weapon/kitchen/knife(M), slot_l_store) - M.equip_to_slot_or_del(new /obj/item/weapon/scalpel(M), slot_r_store) + M.equip_to_slot_or_del(new /obj/item/kitchen/knife(M), slot_l_store) + M.equip_to_slot_or_del(new /obj/item/scalpel(M), slot_r_store) M.put_in_hands_or_del(sword) for(var/obj/item/carried_item in M.get_equipped_items()) carried_item.add_mob_blood(M) @@ -439,7 +439,7 @@ M.update_body_parts() - var/obj/item/weapon/card/id/W = new /obj/item/weapon/card/id + var/obj/item/card/id/W = new /obj/item/card/id W.icon_state = "centcom" W.access += ACCESS_MAINT_TUNNELS W.assignment = "Multiverse Traveller" @@ -474,7 +474,7 @@ to_chat(target, "You feel a stabbing pain in [parse_zone(user.zone_selected)]!") target.Knockdown(40) GiveHint(target) - else if(istype(I, /obj/item/weapon/bikehorn)) + else if(istype(I, /obj/item/bikehorn)) to_chat(target, "HONK") SEND_SOUND(target, 'sound/items/airhorn.ogg') target.adjustEarDamage(0,3) diff --git a/code/game/gamemodes/wizard/spellbook.dm b/code/game/gamemodes/wizard/spellbook.dm index e83e1dedff3..2d18c1f9e94 100644 --- a/code/game/gamemodes/wizard/spellbook.dm +++ b/code/game/gamemodes/wizard/spellbook.dm @@ -19,7 +19,7 @@ /datum/spellbook_entry/proc/IsAvailible() // For config prefs / gamemode restrictions - these are round applied return 1 -/datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) // Specific circumstances +/datum/spellbook_entry/proc/CanBuy(mob/living/carbon/human/user,obj/item/spellbook/book) // Specific circumstances if(book.usesYou have learned [S.name].") return 1 -/datum/spellbook_entry/proc/CanRefund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/proc/CanRefund(mob/living/carbon/human/user,obj/item/spellbook/book) if(!refundable) return 0 if(!S) @@ -75,7 +75,7 @@ return 1 return 0 -/datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) //return point value or -1 for failure +/datum/spellbook_entry/proc/Refund(mob/living/carbon/human/user,obj/item/spellbook/book) //return point value or -1 for failure var/area/wizard_station/A = locate() in GLOB.sortedAreas if(!(user in A.contents)) to_chat(user, "You can only refund spells at the wizard lair") @@ -211,7 +211,7 @@ spell_type = /obj/effect/proc_holder/spell/aimed/lightningbolt cost = 3 -/datum/spellbook_entry/lightningbolt/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) //return 1 on success +/datum/spellbook_entry/lightningbolt/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) //return 1 on success . = ..() user.flags_2 |= TESLA_IGNORE_2 @@ -263,7 +263,7 @@ var/item_path= null -/datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) new item_path(get_turf(user)) SSblackbox.add_details("wizard_spell_learned", name) return 1 @@ -280,45 +280,45 @@ /datum/spellbook_entry/item/staffchange name = "Staff of Change" desc = "An artefact that spits bolts of coruscating energy which cause the target's very form to reshape itself." - item_path = /obj/item/weapon/gun/magic/staff/change + item_path = /obj/item/gun/magic/staff/change /datum/spellbook_entry/item/staffanimation name = "Staff of Animation" desc = "An arcane staff capable of shooting bolts of eldritch energy which cause inanimate objects to come to life. This magic doesn't affect machines." - item_path = /obj/item/weapon/gun/magic/staff/animate + item_path = /obj/item/gun/magic/staff/animate category = "Assistance" /datum/spellbook_entry/item/staffchaos name = "Staff of Chaos" desc = "A caprious tool that can fire all sorts of magic without any rhyme or reason. Using it on people you care about is not recommended." - item_path = /obj/item/weapon/gun/magic/staff/chaos + item_path = /obj/item/gun/magic/staff/chaos /datum/spellbook_entry/item/spellblade name = "Spellblade" desc = "A sword capable of firing blasts of energy which rip targets limb from limb." - item_path = /obj/item/weapon/gun/magic/staff/spellblade + item_path = /obj/item/gun/magic/staff/spellblade /datum/spellbook_entry/item/staffdoor name = "Staff of Door Creation" desc = "A particular staff that can mold solid metal into ornate doors. Useful for getting around in the absence of other transportation. Does not work on glass." - item_path = /obj/item/weapon/gun/magic/staff/door + item_path = /obj/item/gun/magic/staff/door cost = 1 category = "Mobility" /datum/spellbook_entry/item/staffhealing name = "Staff of Healing" desc = "An altruistic staff that can heal the lame and raise the dead." - item_path = /obj/item/weapon/gun/magic/staff/healing + item_path = /obj/item/gun/magic/staff/healing cost = 1 category = "Defensive" /datum/spellbook_entry/item/scryingorb name = "Scrying Orb" desc = "An incandescent orb of crackling energy, using it will allow you to ghost while alive, allowing you to spy upon the station with ease. In addition, buying it will permanently grant you x-ray vision." - item_path = /obj/item/weapon/scrying + item_path = /obj/item/scrying category = "Defensive" -/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/scryingorb/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) if(..()) if (!(user.dna.check_mutation(XRAY))) user.dna.add_mutation(XRAY) @@ -327,10 +327,10 @@ /datum/spellbook_entry/item/soulstones name = "Six Soul Stone Shards and the spell Artificer" desc = "Soul Stone Shards are ancient tools capable of capturing and harnessing the spirits of the dead and dying. The spell Artificer allows you to create arcane machines for the captured souls to pilot." - item_path = /obj/item/weapon/storage/belt/soulstone/full + item_path = /obj/item/storage/belt/soulstone/full category = "Assistance" -/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/soulstones/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) . =..() if(.) user.mind.AddSpell(new /obj/effect/proc_holder/spell/aoe_turf/conjure/construct(null)) @@ -345,7 +345,7 @@ /datum/spellbook_entry/item/wands name = "Wand Assortment" desc = "A collection of wands that allow for a wide variety of utility. Wands have a limited number of charges, so be conservative in use. Comes in a handy belt." - item_path = /obj/item/weapon/storage/belt/wands/full + item_path = /obj/item/storage/belt/wands/full category = "Defensive" /datum/spellbook_entry/item/armor @@ -354,7 +354,7 @@ item_path = /obj/item/clothing/suit/space/hardsuit/wizard category = "Defensive" -/datum/spellbook_entry/item/armor/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/armor/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) . = ..() if(.) new /obj/item/clothing/shoes/sandal/magic(get_turf(user)) //In case they've lost them. @@ -363,25 +363,25 @@ /datum/spellbook_entry/item/contract name = "Contract of Apprenticeship" desc = "A magical contract binding an apprentice wizard to your service, using it will summon them to your side." - item_path = /obj/item/weapon/antag_spawner/contract + item_path = /obj/item/antag_spawner/contract category = "Assistance" /datum/spellbook_entry/item/guardian name = "Guardian Deck" desc = "A deck of guardian tarot cards, capable of binding a personal guardian to your body. There are multiple types of guardian available, but all of them will transfer some amount of damage to you. \ It would be wise to avoid buying these with anything capable of causing you to swap bodies with others." - item_path = /obj/item/weapon/guardiancreator/choose/wizard + item_path = /obj/item/guardiancreator/choose/wizard category = "Assistance" -/datum/spellbook_entry/item/guardian/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/item/guardian/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) . = ..() if(.) - new /obj/item/weapon/paper/guides/antag/guardian/wizard(get_turf(user)) + new /obj/item/paper/guides/antag/guardian/wizard(get_turf(user)) /datum/spellbook_entry/item/bloodbottle name = "Bottle of Blood" desc = "A bottle of magically infused blood, the smell of which will attract extradimensional beings when broken. Be careful though, the kinds of creatures summoned by blood magic are indiscriminate in their killing, and you yourself may become a victim." - item_path = /obj/item/weapon/antag_spawner/slaughter_demon + item_path = /obj/item/antag_spawner/slaughter_demon limit = 3 category = "Assistance" @@ -394,7 +394,7 @@ to be released on the demon's death. Chaotic, but not ultimately \ damaging. The crew's reaction to the other hand could be very \ destructive." - item_path = /obj/item/weapon/antag_spawner/slaughter_demon/laughter + item_path = /obj/item/antag_spawner/slaughter_demon/laughter cost = 1 //non-destructive; it's just a jape, sibling! limit = 3 category = "Assistance" @@ -402,12 +402,12 @@ /datum/spellbook_entry/item/mjolnir name = "Mjolnir" desc = "A mighty hammer on loan from Thor, God of Thunder. It crackles with barely contained power." - item_path = /obj/item/weapon/twohanded/mjollnir + item_path = /obj/item/twohanded/mjollnir /datum/spellbook_entry/item/singularity_hammer name = "Singularity Hammer" desc = "A hammer that creates an intensely powerful field of gravity where it strikes, pulling everything nearby to the point of impact." - item_path = /obj/item/weapon/twohanded/singularityhammer + item_path = /obj/item/twohanded/singularityhammer /datum/spellbook_entry/item/battlemage name = "Battlemage Armour" @@ -437,7 +437,7 @@ buy_word = "Cast" var/active = 0 -/datum/spellbook_entry/summon/CanBuy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/CanBuy(mob/living/carbon/human/user,obj/item/spellbook/book) return ..() && !active /datum/spellbook_entry/summon/GetInfo() @@ -463,7 +463,7 @@ else return TRUE -/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/ghosts/Buy(mob/living/carbon/human/user, obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) new /datum/round_event/wizard/ghost() active = TRUE @@ -480,7 +480,7 @@ return 0 return (!config.no_summon_guns) -/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/guns/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) rightandwrong(0, user, 25) active = 1 @@ -497,7 +497,7 @@ return 0 return (!config.no_summon_magic) -/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/magic/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) rightandwrong(1, user, 25) active = 1 @@ -515,7 +515,7 @@ return 0 return (!config.no_summon_events) -/datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/weapon/spellbook/book) +/datum/spellbook_entry/summon/events/Buy(mob/living/carbon/human/user,obj/item/spellbook/book) SSblackbox.add_details("wizard_spell_learned", name) summonevents() times++ @@ -529,7 +529,7 @@ . += "You cast it [times] times.
" return . -/obj/item/weapon/spellbook +/obj/item/spellbook name = "spell book" desc = "An unearthly tome that glows with power." icon = 'icons/obj/library.dmi' @@ -537,7 +537,7 @@ throw_speed = 2 throw_range = 5 w_class = WEIGHT_CLASS_TINY - persistence_replacement = /obj/item/weapon/spellbook/oneuse/random + persistence_replacement = /obj/item/spellbook/oneuse/random var/uses = 10 var/temp = null var/tab = null @@ -545,18 +545,18 @@ var/list/datum/spellbook_entry/entries = list() var/list/categories = list() -/obj/item/weapon/spellbook/examine(mob/user) +/obj/item/spellbook/examine(mob/user) ..() if(owner) to_chat(user, "There is a small signature on the front cover: \"[owner]\".") else to_chat(user, "It appears to have no author.") -/obj/item/weapon/spellbook/Initialize() +/obj/item/spellbook/Initialize() ..() prepare_spells() -/obj/item/weapon/spellbook/proc/prepare_spells() +/obj/item/spellbook/proc/prepare_spells() var/entry_types = subtypesof(/datum/spellbook_entry) - /datum/spellbook_entry/item - /datum/spellbook_entry/summon for(var/T in entry_types) var/datum/spellbook_entry/E = new T @@ -567,9 +567,9 @@ qdel(E) tab = categories[1] -/obj/item/weapon/spellbook/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/antag_spawner/contract)) - var/obj/item/weapon/antag_spawner/contract/contract = O +/obj/item/spellbook/attackby(obj/item/O, mob/user, params) + if(istype(O, /obj/item/antag_spawner/contract)) + var/obj/item/antag_spawner/contract/contract = O if(contract.used) to_chat(user, "The contract has been used, you can't get your points back now!") else @@ -579,7 +579,7 @@ if(!isnull(CT.limit)) CT.limit++ qdel(O) - else if(istype(O, /obj/item/weapon/antag_spawner/slaughter_demon)) + else if(istype(O, /obj/item/antag_spawner/slaughter_demon)) to_chat(user, "On second thought, maybe summoning a demon is a bad idea. You refund your points.") uses++ for(var/datum/spellbook_entry/item/bloodbottle/BB in entries) @@ -587,7 +587,7 @@ BB.limit++ qdel(O) -/obj/item/weapon/spellbook/proc/GetCategoryHeader(category) +/obj/item/spellbook/proc/GetCategoryHeader(category) var/dat = "" switch(category) if("Offensive") @@ -617,7 +617,7 @@ dat += "These powerful spells change the very fabric of reality. Not always in your favour.
" return dat -/obj/item/weapon/spellbook/proc/wrap(content) +/obj/item/spellbook/proc/wrap(content) var/dat = "" dat +="Spellbook" dat += {" @@ -637,7 +637,7 @@ dat += {"[content]"} return dat -/obj/item/weapon/spellbook/attack_self(mob/user) +/obj/item/spellbook/attack_self(mob/user) if(!owner) to_chat(user, "You bind the spellbook to yourself.") owner = user @@ -682,7 +682,7 @@ onclose(user, "spellbook") return -/obj/item/weapon/spellbook/Topic(href, href_list) +/obj/item/spellbook/Topic(href, href_list) ..() var/mob/living/carbon/human/H = usr @@ -720,7 +720,7 @@ //Single Use Spellbooks// -/obj/item/weapon/spellbook/oneuse +/obj/item/spellbook/oneuse var/spell = /obj/effect/proc_holder/spell/targeted/projectile/magic_missile //just a placeholder to avoid runtimes if someone spawned the generic var/spellname = "sandbox" var/used = 0 @@ -729,10 +729,10 @@ desc = "This template spellbook was never meant for the eyes of man..." persistence_replacement = null -/obj/item/weapon/spellbook/oneuse/prepare_spells() +/obj/item/spellbook/oneuse/prepare_spells() name += spellname -/obj/item/weapon/spellbook/oneuse/attack_self(mob/user) +/obj/item/spellbook/oneuse/attack_self(mob/user) var/obj/effect/proc_holder/spell/S = new spell for(var/obj/effect/proc_holder/spell/knownspell in user.mind.spell_list) if(knownspell.type == S.type) @@ -750,37 +750,37 @@ user.log_message("learned the spell [spellname] ([S]).", INDIVIDUAL_ATTACK_LOG) onlearned(user) -/obj/item/weapon/spellbook/oneuse/proc/recoil(mob/user) +/obj/item/spellbook/oneuse/proc/recoil(mob/user) user.visible_message("[src] glows in a black light!") -/obj/item/weapon/spellbook/oneuse/proc/onlearned(mob/user) +/obj/item/spellbook/oneuse/proc/onlearned(mob/user) used = 1 user.visible_message("[src] glows dark for a second!") -/obj/item/weapon/spellbook/oneuse/attackby() +/obj/item/spellbook/oneuse/attackby() return -/obj/item/weapon/spellbook/oneuse/fireball +/obj/item/spellbook/oneuse/fireball spell = /obj/effect/proc_holder/spell/aimed/fireball spellname = "fireball" icon_state ="bookfireball" desc = "This book feels warm to the touch." -/obj/item/weapon/spellbook/oneuse/fireball/recoil(mob/user) +/obj/item/spellbook/oneuse/fireball/recoil(mob/user) ..() explosion(user.loc, -1, 0, 2, 3, 0, flame_range = 2) qdel(src) -/obj/item/weapon/spellbook/oneuse/smoke +/obj/item/spellbook/oneuse/smoke spell = /obj/effect/proc_holder/spell/targeted/smoke spellname = "smoke" icon_state ="booksmoke" desc = "This book is overflowing with the dank arts." -/obj/item/weapon/spellbook/oneuse/smoke/lesser //Chaplain smoke book +/obj/item/spellbook/oneuse/smoke/lesser //Chaplain smoke book spell = /obj/effect/proc_holder/spell/targeted/smoke/lesser -/obj/item/weapon/spellbook/oneuse/smoke/recoil(mob/user) +/obj/item/spellbook/oneuse/smoke/recoil(mob/user) ..() to_chat(user,"Your stomach rumbles...") if(user.nutrition) @@ -789,31 +789,31 @@ user.nutrition = 0 -/obj/item/weapon/spellbook/oneuse/blind +/obj/item/spellbook/oneuse/blind spell = /obj/effect/proc_holder/spell/targeted/trigger/blind spellname = "blind" icon_state ="bookblind" desc = "This book looks blurry, no matter how you look at it." -/obj/item/weapon/spellbook/oneuse/blind/recoil(mob/user) +/obj/item/spellbook/oneuse/blind/recoil(mob/user) ..() to_chat(user,"You go blind!") user.blind_eyes(10) -/obj/item/weapon/spellbook/oneuse/mindswap +/obj/item/spellbook/oneuse/mindswap spell = /obj/effect/proc_holder/spell/targeted/mind_transfer spellname = "mindswap" icon_state ="bookmindswap" desc = "This book's cover is pristine, though its pages look ragged and torn." var/mob/stored_swap = null //Used in used book recoils to store an identity for mindswaps -/obj/item/weapon/spellbook/oneuse/mindswap/onlearned() +/obj/item/spellbook/oneuse/mindswap/onlearned() spellname = pick("fireball","smoke","blind","forcewall","knock","barnyard","charge") icon_state = "book[spellname]" name = "spellbook of [spellname]" //Note, desc doesn't change by design ..() -/obj/item/weapon/spellbook/oneuse/mindswap/recoil(mob/user) +/obj/item/spellbook/oneuse/mindswap/recoil(mob/user) ..() if(stored_swap in GLOB.dead_mob_list) stored_swap = null @@ -832,36 +832,36 @@ to_chat(user,"Suddenly you're staring at [src] again... where are you, who are you?!") stored_swap = null -/obj/item/weapon/spellbook/oneuse/forcewall +/obj/item/spellbook/oneuse/forcewall spell = /obj/effect/proc_holder/spell/targeted/forcewall spellname = "forcewall" icon_state ="bookforcewall" desc = "This book has a dedication to mimes everywhere inside the front cover." -/obj/item/weapon/spellbook/oneuse/forcewall/recoil(mob/living/user) +/obj/item/spellbook/oneuse/forcewall/recoil(mob/living/user) ..() to_chat(user,"You suddenly feel very solid!") user.Stun(40, ignore_canstun = TRUE) user.petrify(30) -/obj/item/weapon/spellbook/oneuse/knock +/obj/item/spellbook/oneuse/knock spell = /obj/effect/proc_holder/spell/aoe_turf/knock spellname = "knock" icon_state ="bookknock" desc = "This book is hard to hold closed properly." -/obj/item/weapon/spellbook/oneuse/knock/recoil(mob/living/user) +/obj/item/spellbook/oneuse/knock/recoil(mob/living/user) ..() to_chat(user,"You're knocked down!") user.Knockdown(40) -/obj/item/weapon/spellbook/oneuse/barnyard +/obj/item/spellbook/oneuse/barnyard spell = /obj/effect/proc_holder/spell/targeted/barnyardcurse spellname = "barnyard" icon_state ="bookhorses" desc = "This book is more horse than your mind has room for." -/obj/item/weapon/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user) +/obj/item/spellbook/oneuse/barnyard/recoil(mob/living/carbon/user) if(ishuman(user)) to_chat(user,"HOR-SIE HAS RISEN") var/obj/item/clothing/mask/horsehead/magichead = new /obj/item/clothing/mask/horsehead @@ -875,36 +875,36 @@ else to_chat(user,"I say thee neigh") //It still lives here -/obj/item/weapon/spellbook/oneuse/charge +/obj/item/spellbook/oneuse/charge spell = /obj/effect/proc_holder/spell/targeted/charge spellname = "charging" icon_state ="bookcharge" desc = "This book is made of 100% post-consumer wizard." -/obj/item/weapon/spellbook/oneuse/charge/recoil(mob/user) +/obj/item/spellbook/oneuse/charge/recoil(mob/user) ..() to_chat(user,"[src] suddenly feels very warm!") empulse(src, 1, 1) -/obj/item/weapon/spellbook/oneuse/summonitem +/obj/item/spellbook/oneuse/summonitem spell = /obj/effect/proc_holder/spell/targeted/summonitem spellname = "instant summons" icon_state ="booksummons" desc = "This book is bright and garish, very hard to miss." -/obj/item/weapon/spellbook/oneuse/summonitem/recoil(mob/user) +/obj/item/spellbook/oneuse/summonitem/recoil(mob/user) ..() to_chat(user,"[src] suddenly vanishes!") qdel(src) -/obj/item/weapon/spellbook/oneuse/random/Initialize() +/obj/item/spellbook/oneuse/random/Initialize() ..() - var/static/banned_spells = list(/obj/item/weapon/spellbook/oneuse/mimery_blockade, /obj/item/weapon/spellbook/oneuse/mimery_guns) - var/real_type = pick(subtypesof(/obj/item/weapon/spellbook/oneuse) - banned_spells) + var/static/banned_spells = list(/obj/item/spellbook/oneuse/mimery_blockade, /obj/item/spellbook/oneuse/mimery_guns) + var/real_type = pick(subtypesof(/obj/item/spellbook/oneuse) - banned_spells) new real_type(loc) qdel(src) -/obj/item/weapon/spellbook/oneuse/sacredflame +/obj/item/spellbook/oneuse/sacredflame spell = /obj/effect/proc_holder/spell/targeted/sacred_flame spellname = "sacred flame" icon_state ="booksacredflame" diff --git a/code/game/gamemodes/wizard/wizard.dm b/code/game/gamemodes/wizard/wizard.dm index eb53620899f..b342ab40099 100644 --- a/code/game/gamemodes/wizard/wizard.dm +++ b/code/game/gamemodes/wizard/wizard.dm @@ -152,10 +152,10 @@ wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/shoes/sandal/magic(wizard_mob), slot_shoes) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/suit/wizrobe(wizard_mob), slot_wear_suit) wizard_mob.equip_to_slot_or_del(new /obj/item/clothing/head/wizard(wizard_mob), slot_head) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/backpack(wizard_mob), slot_back) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/storage/box/survival(wizard_mob), slot_in_backpack) - wizard_mob.equip_to_slot_or_del(new /obj/item/weapon/teleportation_scroll(wizard_mob), slot_r_store) - var/obj/item/weapon/spellbook/spellbook = new /obj/item/weapon/spellbook(wizard_mob) + wizard_mob.equip_to_slot_or_del(new /obj/item/storage/backpack(wizard_mob), slot_back) + wizard_mob.equip_to_slot_or_del(new /obj/item/storage/box/survival(wizard_mob), slot_in_backpack) + wizard_mob.equip_to_slot_or_del(new /obj/item/teleportation_scroll(wizard_mob), slot_r_store) + var/obj/item/spellbook/spellbook = new /obj/item/spellbook(wizard_mob) spellbook.owner = wizard_mob wizard_mob.put_in_hands_or_del(spellbook) diff --git a/code/game/machinery/PDApainter.dm b/code/game/machinery/PDApainter.dm index 836287c9df8..bd84e7a464f 100644 --- a/code/game/machinery/PDApainter.dm +++ b/code/game/machinery/PDApainter.dm @@ -81,8 +81,8 @@ P.add_fingerprint(user) update_icon() - else if(istype(O, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) - var/obj/item/weapon/weldingtool/WT = O + else if(istype(O, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) + var/obj/item/weldingtool/WT = O if(stat & BROKEN) if(WT.remove_fuel(0,user)) user.visible_message("[user] is repairing [src].", \ diff --git a/code/game/machinery/Sleeper.dm b/code/game/machinery/Sleeper.dm index a14989c199f..16485c1c7b7 100644 --- a/code/game/machinery/Sleeper.dm +++ b/code/game/machinery/Sleeper.dm @@ -13,7 +13,7 @@ density = FALSE anchored = TRUE state_open = TRUE - circuit = /obj/item/weapon/circuitboard/machine/sleeper + circuit = /obj/item/circuitboard/machine/sleeper var/efficiency = 1 var/min_health = -25 var/list/available_chems @@ -34,10 +34,10 @@ /obj/machinery/sleeper/RefreshParts() var/E - for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) + for(var/obj/item/stock_parts/matter_bin/B in component_parts) E += B.rating var/I - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) I += M.rating efficiency = initial(efficiency)* E diff --git a/code/game/machinery/_machinery.dm b/code/game/machinery/_machinery.dm index 9d398fea538..f6eea61c41f 100644 --- a/code/game/machinery/_machinery.dm +++ b/code/game/machinery/_machinery.dm @@ -119,11 +119,11 @@ Class Procs: var/critical_machine = FALSE //If this machine is critical to station operation and should have the area be excempted from power failures. var/list/occupant_typecache = list(/mob/living) // turned into typecache in Initialize var/atom/movable/occupant = null - var/unsecuring_tool = /obj/item/weapon/wrench + var/unsecuring_tool = /obj/item/wrench var/interact_open = FALSE // Can the machine be interacted with when in maint/when the panel is open. var/interact_offline = 0 // Can the machine be interacted with while de-powered. var/speed_process = 0 // Process as fast as possible? - var/obj/item/weapon/circuitboard/circuit // Circuit to be created and inserted when the machinery is created + var/obj/item/circuitboard/circuit // Circuit to be created and inserted when the machinery is created /obj/machinery/Initialize() if(!armor) @@ -131,7 +131,7 @@ Class Procs: . = ..() GLOB.machines += src - if(ispath(circuit, /obj/item/weapon/circuitboard)) + if(ispath(circuit, /obj/item/circuitboard)) circuit = new circuit circuit.apply_default_parts(src) @@ -306,7 +306,7 @@ Class Procs: uid = gl_uid gl_uid++ -/obj/machinery/proc/default_pry_open(obj/item/weapon/crowbar/C) +/obj/machinery/proc/default_pry_open(obj/item/crowbar/C) . = !(state_open || panel_open || is_operational() || (flags_1 & NODECONSTRUCT_1)) && istype(C) if(.) playsound(loc, C.usesound, 50, 1) @@ -314,7 +314,7 @@ Class Procs: open_machine() return 1 -/obj/machinery/proc/default_deconstruction_crowbar(obj/item/weapon/crowbar/C, ignore_panel = 0) +/obj/machinery/proc/default_deconstruction_crowbar(obj/item/crowbar/C, ignore_panel = 0) . = istype(C) && (panel_open || ignore_panel) && !(flags_1 & NODECONSTRUCT_1) if(.) playsound(loc, C.usesound, 50, 1) @@ -353,7 +353,7 @@ Class Procs: update_icon() updateUsrDialog() -/obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/weapon/screwdriver/S) +/obj/machinery/proc/default_deconstruction_screwdriver(mob/user, icon_state_open, icon_state_closed, obj/item/screwdriver/S) if(istype(S) && !(flags_1 & NODECONSTRUCT_1)) playsound(loc, S.usesound, 50, 1) if(!panel_open) @@ -367,7 +367,7 @@ Class Procs: return 1 return 0 -/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/weapon/wrench/W) +/obj/machinery/proc/default_change_direction_wrench(mob/user, obj/item/wrench/W) if(panel_open && istype(W)) playsound(loc, W.usesound, 50, 1) setDir(turn(dir,-90)) @@ -381,7 +381,7 @@ Class Procs: return FAILED_UNFASTEN return SUCCESSFUL_UNFASTEN -/obj/proc/default_unfasten_wrench(mob/user, obj/item/weapon/wrench/W, time = 20) //try to unwrench an object in a WONDERFUL DYNAMIC WAY +/obj/proc/default_unfasten_wrench(mob/user, obj/item/wrench/W, time = 20) //try to unwrench an object in a WONDERFUL DYNAMIC WAY if(istype(W) && !(flags_1 & NODECONSTRUCT_1)) var/can_be_unfasten = can_be_unfasten_wrench(user) if(!can_be_unfasten || can_be_unfasten == FAILED_UNFASTEN) @@ -406,7 +406,7 @@ Class Procs: return FALSE return TRUE -/obj/machinery/proc/exchange_parts(mob/user, obj/item/weapon/storage/part_replacer/W) +/obj/machinery/proc/exchange_parts(mob/user, obj/item/storage/part_replacer/W) if(!istype(W)) return if((flags_1 & NODECONSTRUCT_1) && !W.works_from_distance) @@ -414,16 +414,16 @@ Class Procs: var/shouldplaysound = 0 if(component_parts) if(panel_open || W.works_from_distance) - var/obj/item/weapon/circuitboard/machine/CB = locate(/obj/item/weapon/circuitboard/machine) in component_parts + var/obj/item/circuitboard/machine/CB = locate(/obj/item/circuitboard/machine) in component_parts var/P if(W.works_from_distance) display_parts(user) - for(var/obj/item/weapon/stock_parts/A in component_parts) + for(var/obj/item/stock_parts/A in component_parts) for(var/D in CB.req_components) if(ispath(A.type, D)) P = D break - for(var/obj/item/weapon/stock_parts/B in W.contents) + for(var/obj/item/stock_parts/B in W.contents) if(istype(B, P) && istype(A, P)) if(B.rating > A.rating) W.remove_from_storage(B, src) diff --git a/code/game/machinery/announcement_system.dm b/code/game/machinery/announcement_system.dm index b1fddc8a76b..673591aef14 100644 --- a/code/game/machinery/announcement_system.dm +++ b/code/game/machinery/announcement_system.dm @@ -15,7 +15,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) idle_power_usage = 20 active_power_usage = 50 - circuit = /obj/item/weapon/circuitboard/machine/announcement_system + circuit = /obj/item/circuitboard/machine/announcement_system var/obj/item/device/radio/headset/radio var/arrival = "%PERSON has signed up as %RANK" @@ -60,7 +60,7 @@ GLOBAL_LIST_EMPTY(announcement_systems) update_icon() /obj/machinery/announcement_system/attackby(obj/item/P, mob/user, params) - if(istype(P, /obj/item/weapon/screwdriver)) + if(istype(P, /obj/item/screwdriver)) playsound(src.loc, P.usesound, 50, 1) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance hatch of [src].") diff --git a/code/game/machinery/aug_manipulator.dm b/code/game/machinery/aug_manipulator.dm index a47101b7e62..ff072fd0109 100644 --- a/code/game/machinery/aug_manipulator.dm +++ b/code/game/machinery/aug_manipulator.dm @@ -70,8 +70,8 @@ O.add_fingerprint(user) update_icon() - else if(istype(O, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) - var/obj/item/weapon/weldingtool/WT = O + else if(istype(O, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) + var/obj/item/weldingtool/WT = O if(obj_integrity < max_integrity) if(WT.remove_fuel(0,user)) user.visible_message("[user] begins repairing [src].", \ diff --git a/code/game/machinery/autolathe.dm b/code/game/machinery/autolathe.dm index 53d8acd0a2d..c185a8f7348 100644 --- a/code/game/machinery/autolathe.dm +++ b/code/game/machinery/autolathe.dm @@ -11,7 +11,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/machine/autolathe + circuit = /obj/item/circuitboard/machine/autolathe var/operating = FALSE var/list/L = list() @@ -96,7 +96,7 @@ return if(panel_open) - if(istype(O, /obj/item/weapon/crowbar)) + if(istype(O, /obj/item/crowbar)) default_deconstruction_crowbar(O) return 1 else if(is_wire_tool(O)) @@ -109,12 +109,12 @@ if(stat) return 1 - if(istype(O, /obj/item/weapon/disk/design_disk)) + if(istype(O, /obj/item/disk/design_disk)) user.visible_message("[user] begins to load \the [O] in \the [src]...", "You begin to load a design from \the [O]...", "You hear the chatter of a floppy drive.") busy = TRUE - var/obj/item/weapon/disk/design_disk/D = O + var/obj/item/disk/design_disk/D = O if(do_after(user, 14.4, target = src)) for(var/B in D.blueprints) if(B) @@ -244,11 +244,11 @@ /obj/machinery/autolathe/RefreshParts() var/T = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/MB in component_parts) + for(var/obj/item/stock_parts/matter_bin/MB in component_parts) T += MB.rating*75000 materials.max_amount = T T=1.2 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T -= M.rating*0.2 prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4 diff --git a/code/game/machinery/buttons.dm b/code/game/machinery/buttons.dm index 9a761479303..10e10e878a8 100644 --- a/code/game/machinery/buttons.dm +++ b/code/game/machinery/buttons.dm @@ -6,7 +6,7 @@ var/skin = "doorctrl" power_channel = ENVIRON var/obj/item/device/assembly/device - var/obj/item/weapon/electronics/airlock/board + var/obj/item/electronics/airlock/board var/device_type = null var/id = null var/initialized_button = 0 @@ -57,7 +57,7 @@ icon_state = skin /obj/machinery/button/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/screwdriver)) + if(istype(W, /obj/item/screwdriver)) if(panel_open || allowed(user)) default_deconstruction_screwdriver(user, "button-open", "[skin]",W) update_icon() @@ -74,7 +74,7 @@ device = W to_chat(user, "You add [W] to the button.") - if(!board && istype(W, /obj/item/weapon/electronics/airlock)) + if(!board && istype(W, /obj/item/electronics/airlock)) if(!user.transferItemToLoc(W, src)) to_chat(user, "\The [W] is stuck to you!") return @@ -85,7 +85,7 @@ req_access = board.accesses to_chat(user, "You add [W] to the button.") - if(!device && !board && istype(W, /obj/item/weapon/wrench)) + if(!device && !board && istype(W, /obj/item/wrench)) to_chat(user, "You start unsecuring the button frame...") playsound(loc, W.usesound, 50, 1) if(do_after(user, 40*W.toolspeed, target = src)) diff --git a/code/game/machinery/camera/camera.dm b/code/game/machinery/camera/camera.dm index 37b121cb630..d56837b9ef6 100644 --- a/code/game/machinery/camera/camera.dm +++ b/code/game/machinery/camera/camera.dm @@ -122,14 +122,14 @@ var/msg2 = "[src] already has that upgrade!" // DECONSTRUCTION - if(istype(W, /obj/item/weapon/screwdriver)) + if(istype(W, /obj/item/screwdriver)) panel_open = !panel_open to_chat(user, "You screw the camera's panel [panel_open ? "open" : "closed"].") playsound(src.loc, W.usesound, 50, 1) return if(panel_open) - if(istype(W, /obj/item/weapon/wirecutters)) //enable/disable the camera + if(istype(W, /obj/item/wirecutters)) //enable/disable the camera toggle_cam(user, 1) obj_integrity = max_integrity //this is a pretty simplistic way to heal the camera, but there's no reason for this to be complex. return @@ -139,7 +139,7 @@ to_chat(user, "You [(view_range == initial(view_range)) ? "restore" : "mess up"] the camera's focus.") return - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(istype(W, /obj/item/weldingtool)) if(weld(W, user)) visible_message("[user] unwelds [src], leaving it as just a frame bolted to the wall.", "You unweld [src], leaving it as just a frame bolted to the wall") deconstruct(TRUE) @@ -176,14 +176,14 @@ return // OTHER - if((istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/device/pda)) && isliving(user)) + if((istype(W, /obj/item/paper) || istype(W, /obj/item/device/pda)) && isliving(user)) var/mob/living/U = user - var/obj/item/weapon/paper/X = null + var/obj/item/paper/X = null var/obj/item/device/pda/P = null var/itemname = "" var/info = "" - if(istype(W, /obj/item/weapon/paper)) + if(istype(W, /obj/item/paper)) X = W itemname = X.name info = X.info @@ -222,8 +222,8 @@ bug.bugged_cameras[src.c_tag] = src return - else if(istype(W, /obj/item/weapon/pai_cable)) - var/obj/item/weapon/pai_cable/cable = W + else if(istype(W, /obj/item/pai_cable)) + var/obj/item/pai_cable/cable = W cable.plugin(src, user) return @@ -346,7 +346,7 @@ return null -/obj/machinery/camera/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) +/obj/machinery/camera/proc/weld(obj/item/weldingtool/WT, mob/living/user) if(busy) return FALSE if(!WT.remove_fuel(0, user)) diff --git a/code/game/machinery/camera/camera_assembly.dm b/code/game/machinery/camera/camera_assembly.dm index b460c2ffdd6..340277b441c 100644 --- a/code/game/machinery/camera/camera_assembly.dm +++ b/code/game/machinery/camera/camera_assembly.dm @@ -39,14 +39,14 @@ switch(state) if(1) // State 1 - if(istype(W, /obj/item/weapon/weldingtool)) + if(istype(W, /obj/item/weldingtool)) if(weld(W, user)) to_chat(user, "You weld the assembly securely into place.") anchored = TRUE state = 2 return - else if(istype(W, /obj/item/weapon/wrench)) + else if(istype(W, /obj/item/wrench)) playsound(src.loc, W.usesound, 50, 1) to_chat(user, "You unattach the assembly from its place.") new /obj/item/wallframe/camera(get_turf(src)) @@ -65,7 +65,7 @@ return return - else if(istype(W, /obj/item/weapon/weldingtool)) + else if(istype(W, /obj/item/weldingtool)) if(weld(W, user)) to_chat(user, "You unweld the assembly from its place.") @@ -76,7 +76,7 @@ if(3) // State 3 - if(istype(W, /obj/item/weapon/screwdriver)) + if(istype(W, /obj/item/screwdriver)) playsound(src.loc, W.usesound, 50, 1) var/input = stripped_input(user, "Which networks would you like to connect this camera to? Separate networks with a comma. No Spaces!\nFor example: SS13,Security,Secret ", "Set Network", "SS13") @@ -100,7 +100,7 @@ C.c_tag = "[A.name] ([rand(1, 999)])" - else if(istype(W, /obj/item/weapon/wirecutters)) + else if(istype(W, /obj/item/wirecutters)) new/obj/item/stack/cable_coil(get_turf(src), 2) playsound(src.loc, W.usesound, 50, 1) to_chat(user, "You cut the wires from the circuits.") @@ -117,7 +117,7 @@ return // Taking out upgrades - else if(istype(W, /obj/item/weapon/crowbar) && upgrades.len) + else if(istype(W, /obj/item/crowbar) && upgrades.len) var/obj/U = locate(/obj) in upgrades if(U) to_chat(user, "You unattach an upgrade from the assembly.") @@ -128,7 +128,7 @@ return ..() -/obj/structure/camera_assembly/proc/weld(obj/item/weapon/weldingtool/WT, mob/living/user) +/obj/structure/camera_assembly/proc/weld(obj/item/weldingtool/WT, mob/living/user) if(!WT.remove_fuel(0, user)) return 0 to_chat(user, "You start to weld \the [src]...") diff --git a/code/game/machinery/cell_charger.dm b/code/game/machinery/cell_charger.dm index 2fe15a99d8f..3f95d2a7804 100644 --- a/code/game/machinery/cell_charger.dm +++ b/code/game/machinery/cell_charger.dm @@ -8,7 +8,7 @@ idle_power_usage = 5 active_power_usage = 60 power_channel = EQUIP - var/obj/item/weapon/stock_parts/cell/charging = null + var/obj/item/stock_parts/cell/charging = null var/chargelevel = -1 /obj/machinery/cell_charger/proc/updateicon() @@ -29,8 +29,8 @@ if(charging) to_chat(user, "Current charge: [round(charging.percent(), 1)]%") -/obj/machinery/cell_charger/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/stock_parts/cell)) +/obj/machinery/cell_charger/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/stock_parts/cell)) if(stat & BROKEN) to_chat(user, "[src] is broken!") return @@ -55,7 +55,7 @@ user.visible_message("[user] inserts a cell into the charger.", "You insert a cell into the charger.") chargelevel = -1 updateicon() - else if(istype(W, /obj/item/weapon/wrench)) + else if(istype(W, /obj/item/wrench)) if(charging) to_chat(user, "Remove the cell first!") return diff --git a/code/game/machinery/cloning.dm b/code/game/machinery/cloning.dm index 8e5c83183db..7ea954a6710 100644 --- a/code/game/machinery/cloning.dm +++ b/code/game/machinery/cloning.dm @@ -17,7 +17,7 @@ icon_state = "pod_0" req_access = list(ACCESS_CLONING) //FOR PREMATURE UNLOCKING. verb_say = "states" - circuit = /obj/item/weapon/circuitboard/machine/clonepod + circuit = /obj/item/circuitboard/machine/clonepod var/heal_level //The clone is released once its health reaches this level. var/obj/machinery/computer/cloning/connected = null //So we remember the connected clone machine. @@ -69,9 +69,9 @@ /obj/machinery/clonepod/RefreshParts() speed_coeff = 0 efficiency = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/S in component_parts) + for(var/obj/item/stock_parts/scanning_module/S in component_parts) efficiency += S.rating - for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) + for(var/obj/item/stock_parts/manipulator/P in component_parts) speed_coeff += P.rating heal_level = (efficiency * 15) + 10 if(heal_level < MINIMUM_HEAL_LEVEL) @@ -81,23 +81,23 @@ //The return of data disks?? Just for transferring between genetics machine/cloning machine. //TO-DO: Make the genetics machine accept them. -/obj/item/weapon/disk/data +/obj/item/disk/data name = "cloning data disk" icon_state = "datadisk0" //Gosh I hope syndies don't mistake them for the nuke disk. var/list/fields = list() var/read_only = 0 //Well,it's still a floppy disk //Disk stuff. -/obj/item/weapon/disk/data/New() +/obj/item/disk/data/New() ..() icon_state = "datadisk[rand(0,6)]" add_overlay("datadisk_gene") -/obj/item/weapon/disk/data/attack_self(mob/user) +/obj/item/disk/data/attack_self(mob/user) read_only = !read_only to_chat(user, "You flip the write-protect tab to [read_only ? "protected" : "unprotected"].") -/obj/item/weapon/disk/data/examine(mob/user) +/obj/item/disk/data/examine(mob/user) ..() to_chat(user, "The write-protect tab is set to [read_only ? "protected" : "unprotected"].") @@ -278,7 +278,7 @@ use_power(200) //Let's unlock this early I guess. Might be too early, needs tweaking. -/obj/machinery/clonepod/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/clonepod/attackby(obj/item/W, mob/user, params) if(!(occupant || mess)) if(default_deconstruction_screwdriver(user, "[icon_state]_maintenance", "[initial(icon_state)]",W)) return @@ -468,7 +468,7 @@ * Manual -- A big ol' manual. */ -/obj/item/weapon/paper/guides/jobs/medical/cloning +/obj/item/paper/guides/jobs/medical/cloning name = "paper - 'H-87 Cloning Apparatus Manual" info = {"

Getting Started

Congratulations, your station has purchased the H-87 industrial cloning device!
diff --git a/code/game/machinery/computer/Operating.dm b/code/game/machinery/computer/Operating.dm index ab4eb941b79..2033fd7146f 100644 --- a/code/game/machinery/computer/Operating.dm +++ b/code/game/machinery/computer/Operating.dm @@ -3,7 +3,7 @@ desc = "Used to monitor the vitals of a patient during surgery." icon_screen = "crew" icon_keyboard = "med_key" - circuit = /obj/item/weapon/circuitboard/computer/operating + circuit = /obj/item/circuitboard/computer/operating var/mob/living/carbon/human/patient var/obj/structure/table/optable/table diff --git a/code/game/machinery/computer/_computer.dm b/code/game/machinery/computer/_computer.dm index 2fe7d7b384e..85d8f029708 100644 --- a/code/game/machinery/computer/_computer.dm +++ b/code/game/machinery/computer/_computer.dm @@ -16,7 +16,7 @@ var/icon_screen = "generic" var/clockwork = FALSE -/obj/machinery/computer/Initialize(mapload, obj/item/weapon/circuitboard/C) +/obj/machinery/computer/Initialize(mapload, obj/item/circuitboard/C) . = ..() power_change() @@ -66,7 +66,7 @@ return /obj/machinery/computer/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/screwdriver) && circuit && !(flags_1&NODECONSTRUCT_1)) + if(istype(I, /obj/item/screwdriver) && circuit && !(flags_1&NODECONSTRUCT_1)) playsound(src.loc, I.usesound, 50, 1) to_chat(user, " You start to disconnect the monitor...") if(do_after(user, 20*I.toolspeed, target = src)) @@ -113,8 +113,8 @@ to_chat(user, "The broken glass falls out.") else playsound(src.loc, 'sound/effects/hit_on_shattered_glass.ogg', 70, 1) - new /obj/item/weapon/shard(src.loc) - new /obj/item/weapon/shard(src.loc) + new /obj/item/shard(src.loc) + new /obj/item/shard(src.loc) A.state = 3 A.icon_state = "3" else diff --git a/code/game/machinery/computer/aifixer.dm b/code/game/machinery/computer/aifixer.dm index bc3f1c55461..18a94a6a948 100644 --- a/code/game/machinery/computer/aifixer.dm +++ b/code/game/machinery/computer/aifixer.dm @@ -4,13 +4,13 @@ req_access = list(ACCESS_CAPTAIN, ACCESS_ROBOTICS, ACCESS_HEADS) var/mob/living/silicon/ai/occupier = null var/active = 0 - circuit = /obj/item/weapon/circuitboard/computer/aifixer + circuit = /obj/item/circuitboard/computer/aifixer icon_keyboard = "tech_key" icon_screen = "ai-fixer" light_color = LIGHT_COLOR_PINK /obj/machinery/computer/aifixer/attackby(obj/I, mob/user, params) - if(occupier && istype(I, /obj/item/weapon/screwdriver)) + if(occupier && istype(I, /obj/item/screwdriver)) if(stat & (NOPOWER|BROKEN)) to_chat(user, "The screws on [name]'s screen won't budge.") else diff --git a/code/game/machinery/computer/apc_control.dm b/code/game/machinery/computer/apc_control.dm index 45c4142f098..8b3e9465015 100644 --- a/code/game/machinery/computer/apc_control.dm +++ b/code/game/machinery/computer/apc_control.dm @@ -4,7 +4,7 @@ icon_screen = "solar" icon_keyboard = "power_key" req_access = list(ACCESS_ENGINE) - circuit = /obj/item/weapon/circuitboard/computer/apc_control + circuit = /obj/item/circuitboard/computer/apc_control light_color = LIGHT_COLOR_YELLOW var/list/apcs //APCs the computer has access to var/mob/living/operator //Who's operating the computer right now @@ -97,7 +97,7 @@ if(!usr || !usr.canUseTopic(src) || usr.incapacitated() || stat || QDELETED(src)) return if(href_list["authenticate"]) - var/obj/item/weapon/card/id/ID = usr.get_active_held_item() + var/obj/item/card/id/ID = usr.get_active_held_item() if(!istype(ID)) ID = usr.get_idcard() if(ID && istype(ID)) @@ -106,7 +106,7 @@ auth_id = "[ID.registered_name] ([ID.assignment])" log_activity("logged in") if(!authenticated) //Check for emags - var/obj/item/weapon/card/emag/E = usr.get_active_held_item() + var/obj/item/card/emag/E = usr.get_active_held_item() if(E && istype(E) && usr.Adjacent(src)) to_chat(usr, "You bypass [src]'s access requirements using your emag.") authenticated = TRUE diff --git a/code/game/machinery/computer/arcade.dm b/code/game/machinery/computer/arcade.dm index ad48c9a12ce..fa0008b51be 100644 --- a/code/game/machinery/computer/arcade.dm +++ b/code/game/machinery/computer/arcade.dm @@ -6,15 +6,15 @@ icon_screen = "invaders" clockwork = TRUE //it'd look weird var/list/prizes = list( - /obj/item/weapon/storage/box/snappops = 2, + /obj/item/storage/box/snappops = 2, /obj/item/toy/talking/AI = 2, /obj/item/toy/talking/codex_gigas = 2, /obj/item/clothing/under/syndicate/tacticool = 2, /obj/item/toy/sword = 2, /obj/item/toy/gun = 2, - /obj/item/weapon/gun/ballistic/shotgun/toy/crossbow = 2, - /obj/item/weapon/storage/box/fakesyndiesuit = 2, - /obj/item/weapon/storage/crayons = 2, + /obj/item/gun/ballistic/shotgun/toy/crossbow = 2, + /obj/item/storage/box/fakesyndiesuit = 2, + /obj/item/storage/crayons = 2, /obj/item/toy/spinningtoy = 2, /obj/item/toy/prize/ripley = 1, /obj/item/toy/prize/fireripley = 1, @@ -34,15 +34,15 @@ /obj/item/toy/redbutton = 2, /obj/item/toy/talking/owl = 2, /obj/item/toy/talking/griffin = 2, - /obj/item/weapon/coin/antagtoken = 2, + /obj/item/coin/antagtoken = 2, /obj/item/stack/tile/fakespace/loaded = 2, /obj/item/stack/tile/fakepit/loaded = 2, /obj/item/toy/toy_xeno = 2, - /obj/item/weapon/storage/box/actionfigure = 1, - /obj/item/weapon/restraints/handcuffs/fake = 2, - /obj/item/weapon/grenade/chem_grenade/glitter/pink = 1, - /obj/item/weapon/grenade/chem_grenade/glitter/blue = 1, - /obj/item/weapon/grenade/chem_grenade/glitter/white = 1, + /obj/item/storage/box/actionfigure = 1, + /obj/item/restraints/handcuffs/fake = 2, + /obj/item/grenade/chem_grenade/glitter/pink = 1, + /obj/item/grenade/chem_grenade/glitter/blue = 1, + /obj/item/grenade/chem_grenade/glitter/white = 1, /obj/item/toy/eightball = 2, /obj/item/toy/windupToolbox = 2) @@ -56,8 +56,8 @@ // If it's a generic arcade machine, pick a random arcade // circuit board for it and make the new machine if(!circuit) - var/choice = pick(subtypesof(/obj/item/weapon/circuitboard/computer/arcade)) - var/obj/item/weapon/circuitboard/CB = new choice() + var/choice = pick(subtypesof(/obj/item/circuitboard/computer/arcade)) + var/obj/item/circuitboard/CB = new choice() new CB.build_path(loc, CB) return INITIALIZE_HINT_QDEL Reset() @@ -66,7 +66,7 @@ /obj/machinery/computer/arcade/proc/prizevend() if(prob(0.0001)) //1 in a million - new /obj/item/weapon/gun/energy/pulse/prize(src) + new /obj/item/gun/energy/pulse/prize(src) UnlockMedal(PULSE_MEDAL,usr.client) if(!contents.len) @@ -105,7 +105,7 @@ name = "arcade machine" desc = "Does not support Pinball." icon_state = "arcade" - circuit = /obj/item/weapon/circuitboard/computer/arcade/battle + circuit = /obj/item/circuitboard/computer/arcade/battle var/enemy_name = "Space Villian" var/temp = "Winners don't use space drugs" //Temporary message, for attack messages, etc var/player_hp = 30 //Player health/attack points @@ -335,7 +335,7 @@ name = "The Orion Trail" desc = "Learn how our ancestors got to Orion, and have fun in the process!" icon_state = "arcade" - circuit = /obj/item/weapon/circuitboard/computer/arcade/orion_trail + circuit = /obj/item/circuitboard/computer/arcade/orion_trail var/busy = FALSE //prevent clickspam that allowed people to ~speedrun~ the game. var/engine = 0 var/hull = 0 @@ -1025,7 +1025,7 @@ gameStatus = ORION_STATUS_START say("Congratulations, you made it to Orion!") if(emagged) - new /obj/item/weapon/orion_ship(loc) + new /obj/item/orion_ship(loc) message_admins("[key_name_admin(usr)] made it to Orion on an emagged machine and got an explosive toy ship.") log_game("[key_name(usr)] made it to Orion on an emagged machine and got an explosive toy ship.") else @@ -1050,7 +1050,7 @@ loot = list() del_on_death = TRUE -/obj/item/weapon/orion_ship +/obj/item/orion_ship name = "model settler ship" desc = "A model spaceship, it looks like those used back in the day when travelling to Orion! It even has a miniature FX-293 reactor, which was renowned for its instability and tendency to explode..." icon = 'icons/obj/toy.dmi' @@ -1058,7 +1058,7 @@ w_class = WEIGHT_CLASS_SMALL var/active = 0 //if the ship is on -/obj/item/weapon/orion_ship/examine(mob/user) +/obj/item/orion_ship/examine(mob/user) ..() if(!(in_range(user, src))) return @@ -1067,7 +1067,7 @@ else to_chat(user, "There's a little switch on the bottom. It's flipped up.") -/obj/item/weapon/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse +/obj/item/orion_ship/attack_self(mob/user) //Minibomb-level explosion. Should probably be more because of how hard it is to survive the machine! Also, just over a 5-second fuse if(active) return diff --git a/code/game/machinery/computer/atmos_alert.dm b/code/game/machinery/computer/atmos_alert.dm index 1c282512990..14fc50ee68c 100644 --- a/code/game/machinery/computer/atmos_alert.dm +++ b/code/game/machinery/computer/atmos_alert.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/atmos_alert name = "atmospheric alert console" desc = "Used to monitor the station's air alarms." - circuit = /obj/item/weapon/circuitboard/computer/atmos_alert + circuit = /obj/item/circuitboard/computer/atmos_alert icon_screen = "alert:0" icon_keyboard = "atmos_key" var/list/priority_alarms = list() diff --git a/code/game/machinery/computer/atmos_control.dm b/code/game/machinery/computer/atmos_control.dm index 381b4b3e556..9bdcef6c654 100644 --- a/code/game/machinery/computer/atmos_control.dm +++ b/code/game/machinery/computer/atmos_control.dm @@ -64,7 +64,7 @@ desc = "Used to monitor the station's atmospherics sensors." icon_screen = "tank" icon_keyboard = "atmos_key" - circuit = /obj/item/weapon/circuitboard/computer/atmos_control + circuit = /obj/item/circuitboard/computer/atmos_control var/frequency = 1441 var/list/sensors = list( @@ -139,7 +139,7 @@ var/input_tag var/output_tag frequency = 1441 - circuit = /obj/item/weapon/circuitboard/computer/atmos_control/tank + circuit = /obj/item/circuitboard/computer/atmos_control/tank var/list/input_info var/list/output_info diff --git a/code/game/machinery/computer/buildandrepair.dm b/code/game/machinery/computer/buildandrepair.dm index 94b538a741b..db2bfedd7c7 100644 --- a/code/game/machinery/computer/buildandrepair.dm +++ b/code/game/machinery/computer/buildandrepair.dm @@ -7,7 +7,7 @@ add_fingerprint(user) switch(state) if(0) - if(istype(P, /obj/item/weapon/wrench)) + if(istype(P, /obj/item/wrench)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You start wrenching the frame into place...") if(do_after(user, 20*P.toolspeed, target = src)) @@ -15,8 +15,8 @@ anchored = TRUE state = 1 return - if(istype(P, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = P + if(istype(P, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = P if(!WT.remove_fuel(0, user)) if(!WT.isOn()) to_chat(user, "The welding tool must be on to complete this task!") @@ -31,7 +31,7 @@ qdel(src) return if(1) - if(istype(P, /obj/item/weapon/wrench)) + if(istype(P, /obj/item/wrench)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You start to unfasten the frame...") if(do_after(user, 20*P.toolspeed, target = src)) @@ -39,7 +39,7 @@ anchored = FALSE state = 0 return - if(istype(P, /obj/item/weapon/circuitboard/computer) && !circuit) + if(istype(P, /obj/item/circuitboard/computer) && !circuit) if(!user.drop_item()) return playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) @@ -50,16 +50,16 @@ P.loc = null return - else if(istype(P, /obj/item/weapon/circuitboard) && !circuit) + else if(istype(P, /obj/item/circuitboard) && !circuit) to_chat(user, "This frame does not accept circuit boards of this type!") return - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(istype(P, /obj/item/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You screw the circuit board into place.") state = 2 icon_state = "2" return - if(istype(P, /obj/item/weapon/crowbar) && circuit) + if(istype(P, /obj/item/crowbar) && circuit) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You remove the circuit board.") state = 1 @@ -69,7 +69,7 @@ circuit = null return if(2) - if(istype(P, /obj/item/weapon/screwdriver) && circuit) + if(istype(P, /obj/item/screwdriver) && circuit) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You unfasten the circuit board.") state = 1 @@ -90,7 +90,7 @@ to_chat(user, "You need five lengths of cable to wire the frame!") return if(3) - if(istype(P, /obj/item/weapon/wirecutters)) + if(istype(P, /obj/item/wirecutters)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You remove the cables.") state = 2 @@ -116,7 +116,7 @@ src.icon_state = "4" return if(4) - if(istype(P, /obj/item/weapon/crowbar)) + if(istype(P, /obj/item/crowbar)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You remove the glass panel.") state = 3 @@ -124,7 +124,7 @@ var/obj/item/stack/sheet/glass/G = new (loc, 2) G.add_fingerprint(user) return - if(istype(P, /obj/item/weapon/screwdriver)) + if(istype(P, /obj/item/screwdriver)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You connect the monitor.") var/obj/B = new src.circuit.build_path (src.loc, circuit) @@ -138,8 +138,8 @@ /obj/structure/frame/computer/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) if(state == 4) - new /obj/item/weapon/shard(loc) - new /obj/item/weapon/shard(loc) + new /obj/item/shard(loc) + new /obj/item/shard(loc) if(state >= 3) new /obj/item/stack/cable_coil(loc , 5) ..() \ No newline at end of file diff --git a/code/game/machinery/computer/camera.dm b/code/game/machinery/computer/camera.dm index c8c713bad86..8bab6a9d9af 100644 --- a/code/game/machinery/computer/camera.dm +++ b/code/game/machinery/computer/camera.dm @@ -3,7 +3,7 @@ desc = "Used to access the various cameras on the station." icon_screen = "cameras" icon_keyboard = "security_key" - circuit = /obj/item/weapon/circuitboard/computer/security + circuit = /obj/item/circuitboard/computer/security var/last_pic = 1 var/list/network = list("SS13") var/mapping = 0//For the overview file, interesting bit of code. @@ -186,4 +186,4 @@ icon_screen = "mining" icon_keyboard = "mining_key" network = list("MINE") - circuit = /obj/item/weapon/circuitboard/computer/mining + circuit = /obj/item/circuitboard/computer/mining diff --git a/code/game/machinery/computer/card.dm b/code/game/machinery/computer/card.dm index 480d4468300..d774eff0e00 100644 --- a/code/game/machinery/computer/card.dm +++ b/code/game/machinery/computer/card.dm @@ -10,9 +10,9 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) icon_screen = "id" icon_keyboard = "id_key" req_one_access = list(ACCESS_HEADS, ACCESS_CHANGE_IDS) - circuit = /obj/item/weapon/circuitboard/computer/card - var/obj/item/weapon/card/id/scan = null - var/obj/item/weapon/card/id/modify = null + circuit = /obj/item/circuitboard/computer/card + var/obj/item/card/id/scan = null + var/obj/item/card/id/modify = null var/authenticated = 0 var/mode = 0 var/printing = null @@ -51,8 +51,8 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) change_position_cooldown = config.id_console_jobslot_delay /obj/machinery/computer/card/attackby(obj/O, mob/user, params)//TODO:SANITY - if(istype(O, /obj/item/weapon/card/id)) - var/obj/item/weapon/card/id/idcard = O + if(istype(O, /obj/item/card/id)) + var/obj/item/card/id/idcard = O if(check_access(idcard)) if(!scan) if(!usr.drop_item()) @@ -364,7 +364,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) head_subordinates = null else var/obj/item/I = usr.get_active_held_item() - if (istype(I, /obj/item/weapon/card/id)) + if (istype(I, /obj/item/card/id)) if(!usr.drop_item()) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) @@ -380,7 +380,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) scan = null else var/obj/item/I = usr.get_active_held_item() - if (istype(I, /obj/item/weapon/card/id)) + if (istype(I, /obj/item/card/id)) if(!usr.drop_item()) return playsound(src, 'sound/machines/terminal_insert_disc.ogg', 50, 0) @@ -542,7 +542,7 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) if (!( printing )) printing = 1 sleep(50) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) + var/obj/item/paper/P = new /obj/item/paper( loc ) var/t1 = "Crew Manifest:
" for(var/datum/data/record/t in sortRecord(GLOB.data_core.general)) t1 += t.fields["name"] + " - " + t.fields["rank"] + "
" @@ -562,18 +562,18 @@ GLOBAL_VAR_INIT(time_last_changed_position, 0) /obj/machinery/computer/card/centcom name = "\improper CentCom identification console" - circuit = /obj/item/weapon/circuitboard/computer/card/centcom + circuit = /obj/item/circuitboard/computer/card/centcom req_access = list(ACCESS_CENT_CAPTAIN) /obj/machinery/computer/card/minor name = "department management console" desc = "You can use this to change ID's for specific departments." icon_screen = "idminor" - circuit = /obj/item/weapon/circuitboard/computer/card/minor + circuit = /obj/item/circuitboard/computer/card/minor /obj/machinery/computer/card/minor/Initialize() . = ..() - var/obj/item/weapon/circuitboard/computer/card/minor/typed_circuit = circuit + var/obj/item/circuitboard/computer/card/minor/typed_circuit = circuit if(target_dept) typed_circuit.target_dept = target_dept else diff --git a/code/game/machinery/computer/cloning.dm b/code/game/machinery/computer/cloning.dm index 6b76b3c98e1..ab7a6398184 100644 --- a/code/game/machinery/computer/cloning.dm +++ b/code/game/machinery/computer/cloning.dm @@ -3,7 +3,7 @@ desc = "Used to clone people and manage DNA." icon_screen = "dna" icon_keyboard = "med_key" - circuit = /obj/item/weapon/circuitboard/computer/cloning + circuit = /obj/item/circuitboard/computer/cloning req_access = list(ACCESS_HEADS) //ONLY USED FOR RECORD DELETION RIGHT NOW. var/obj/machinery/dna_scannernew/scanner = null //Linked scanner. For scanning. var/list/pods //Linked cloning pods @@ -13,7 +13,7 @@ var/menu = 1 //Which menu screen to display var/list/records = list() var/datum/data/record/active_record = null - var/obj/item/weapon/disk/data/diskette = null //Mostly so the geneticist can steal everything. + var/obj/item/disk/data/diskette = null //Mostly so the geneticist can steal everything. var/loading = 0 // Nice loading text var/autoprocess = 0 @@ -115,7 +115,7 @@ LAZYREMOVE(pods, pod) /obj/machinery/computer/cloning/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES + if(istype(W, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) return @@ -232,7 +232,7 @@ dat += "

[src.active_record.fields["name"]]

" dat += "Scan ID [src.active_record.fields["id"]] Clone
" - var/obj/item/weapon/implant/health/H = locate(src.active_record.fields["imp"]) + var/obj/item/implant/health/H = locate(src.active_record.fields["imp"]) if ((H) && (istype(H))) dat += "Health Implant Data:
[H.sensehealth()]

" @@ -339,7 +339,7 @@ playsound(src, 'sound/machines/terminal_prompt.ogg', 50, 0) else if (src.menu == 4) - var/obj/item/weapon/card/id/C = usr.get_active_held_item() + var/obj/item/card/id/C = usr.get_active_held_item() if (istype(C)||istype(C, /obj/item/device/pda)) if(src.check_access(C)) src.temp = "[src.active_record.fields["name"]] => Record deleted." @@ -488,12 +488,12 @@ R.fields["mind"] = "\ref[mob_occupant.mind]" //Add an implant if needed - var/obj/item/weapon/implant/health/imp - for(var/obj/item/weapon/implant/health/HI in mob_occupant.implants) + var/obj/item/implant/health/imp + for(var/obj/item/implant/health/HI in mob_occupant.implants) imp = HI break if(!imp) - imp = new /obj/item/weapon/implant/health(mob_occupant) + imp = new /obj/item/implant/health(mob_occupant) imp.implant(mob_occupant) R.fields["imp"] = "\ref[imp]" diff --git a/code/game/machinery/computer/communications.dm b/code/game/machinery/computer/communications.dm index eef44384d2a..997ed52b700 100755 --- a/code/game/machinery/computer/communications.dm +++ b/code/game/machinery/computer/communications.dm @@ -5,7 +5,7 @@ icon_screen = "comm" icon_keyboard = "tech_key" req_access = list(ACCESS_HEADS) - circuit = /obj/item/weapon/circuitboard/computer/communications + circuit = /obj/item/circuitboard/computer/communications var/authenticated = 0 var/auth_id = "Unknown" //Who is currently logged in? var/list/messagetitle = list() @@ -36,7 +36,7 @@ light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/communications/proc/checkCCcooldown() - var/obj/item/weapon/circuitboard/computer/communications/CM = circuit + var/obj/item/circuitboard/computer/communications/CM = circuit if(CM.lastTimeUsed + 600 > world.time) return FALSE return TRUE @@ -61,7 +61,7 @@ if(!href_list["operation"]) return - var/obj/item/weapon/circuitboard/computer/communications/CM = circuit + var/obj/item/circuitboard/computer/communications/CM = circuit switch(href_list["operation"]) // main interface if("main") @@ -70,7 +70,7 @@ if("login") var/mob/M = usr - var/obj/item/weapon/card/id/I = M.get_active_held_item() + var/obj/item/card/id/I = M.get_active_held_item() if(!istype(I)) I = M.get_idcard() @@ -96,7 +96,7 @@ if("swipeidseclevel") var/mob/M = usr - var/obj/item/weapon/card/id/I = M.get_active_held_item() + var/obj/item/card/id/I = M.get_active_held_item() if (istype(I, /obj/item/device/pda)) var/obj/item/device/pda/pda = I I = pda.id @@ -392,7 +392,7 @@ src.updateUsrDialog() /obj/machinery/computer/communications/attackby(obj/I, mob/user, params) - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) attack_hand(user) else return ..() @@ -692,5 +692,5 @@ return ..() /obj/machinery/computer/communications/proc/overrideCooldown() - var/obj/item/weapon/circuitboard/computer/communications/CM = circuit + var/obj/item/circuitboard/computer/communications/CM = circuit CM.lastTimeUsed = 0 diff --git a/code/game/machinery/computer/crew.dm b/code/game/machinery/computer/crew.dm index e8d3aaf061c..9b5e14963fc 100644 --- a/code/game/machinery/computer/crew.dm +++ b/code/game/machinery/computer/crew.dm @@ -6,7 +6,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 250 active_power_usage = 500 - circuit = /obj/item/weapon/circuitboard/computer/crew + circuit = /obj/item/circuitboard/computer/crew light_color = LIGHT_COLOR_BLUE @@ -135,7 +135,7 @@ GLOBAL_DATUM_INIT(crewmonitor, /datum/crewmonitor, new) if (ignore_unused || hi.isUsed()) var/list/results = list() var/obj/item/clothing/under/U - var/obj/item/weapon/card/id/I + var/obj/item/card/id/I var/turf/pos var/ijob var/name diff --git a/code/game/machinery/computer/dna_console.dm b/code/game/machinery/computer/dna_console.dm index de18b515430..aafe74f2b37 100644 --- a/code/game/machinery/computer/dna_console.dm +++ b/code/game/machinery/computer/dna_console.dm @@ -22,7 +22,7 @@ icon_screen = "dna" icon_keyboard = "med_key" density = TRUE - circuit = /obj/item/weapon/circuitboard/computer/scan_consolenew + circuit = /obj/item/circuitboard/computer/scan_consolenew var/radduration = 2 var/radstrength = 1 @@ -31,7 +31,7 @@ var/injectorready = 0 //world timer cooldown var var/current_screen = "mainmenu" var/obj/machinery/dna_scannernew/connected = null - var/obj/item/weapon/disk/data/diskette = null + var/obj/item/disk/data/diskette = null var/list/delayed_action = null anchored = TRUE use_power = IDLE_POWER_USE @@ -41,7 +41,7 @@ light_color = LIGHT_COLOR_BLUE /obj/machinery/computer/scan_consolenew/attackby(obj/item/I, mob/user, params) - if (istype(I, /obj/item/weapon/disk/data)) //INSERT SOME DISKETTES + if (istype(I, /obj/item/disk/data)) //INSERT SOME DISKETTES if (!src.diskette) if(!user.drop_item()) return @@ -390,11 +390,11 @@ num = Clamp(num, 1, NUMBER_OF_BUFFERS) var/list/buffer_slot = buffer[num] if(istype(buffer_slot)) - var/obj/item/weapon/dnainjector/timed/I + var/obj/item/dnainjector/timed/I switch(href_list["text"]) if("se") if(buffer_slot["SE"]) - I = new /obj/item/weapon/dnainjector/timed(loc) + I = new /obj/item/dnainjector/timed(loc) var/powers = 0 for(var/datum/mutation/human/HM in GLOB.good_mutations + GLOB.bad_mutations + GLOB.not_good_mutations) if(HM.check_block_string(buffer_slot["SE"])) @@ -417,19 +417,19 @@ I.damage_coeff = connected.damage_coeff if("ui") if(buffer_slot["UI"]) - I = new /obj/item/weapon/dnainjector/timed(loc) + I = new /obj/item/dnainjector/timed(loc) I.fields = list("UI"=buffer_slot["UI"]) if(connected) I.damage_coeff = connected.damage_coeff if("ue") if(buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) - I = new /obj/item/weapon/dnainjector/timed(loc) + I = new /obj/item/dnainjector/timed(loc) I.fields = list("name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) if(connected) I.damage_coeff = connected.damage_coeff if("mixed") if(buffer_slot["UI"] && buffer_slot["name"] && buffer_slot["UE"] && buffer_slot["blood_type"]) - I = new /obj/item/weapon/dnainjector/timed(loc) + I = new /obj/item/dnainjector/timed(loc) I.fields = list("UI"=buffer_slot["UI"],"name"=buffer_slot["name"], "UE"=buffer_slot["UE"], "blood_type"=buffer_slot["blood_type"]) if(connected) I.damage_coeff = connected.damage_coeff diff --git a/code/game/machinery/computer/gulag_teleporter.dm b/code/game/machinery/computer/gulag_teleporter.dm index 4b7fccc2216..c416d93e58a 100644 --- a/code/game/machinery/computer/gulag_teleporter.dm +++ b/code/game/machinery/computer/gulag_teleporter.dm @@ -5,9 +5,9 @@ icon_screen = "explosive" icon_keyboard = "security_key" req_access = list(ACCESS_ARMORY) - circuit = /obj/item/weapon/circuitboard/computer/gulag_teleporter_console + circuit = /obj/item/circuitboard/computer/gulag_teleporter_console var/default_goal = 200 - var/obj/item/weapon/card/id/prisoner/id = null + var/obj/item/card/id/prisoner/id = null var/obj/machinery/gulag_teleporter/teleporter = null var/obj/structure/gulag_beacon/beacon = null var/mob/living/carbon/human/prisoner = null @@ -25,7 +25,7 @@ return ..() /obj/machinery/computer/gulag_teleporter_computer/attackby(obj/item/W, mob/user) - if(istype(W, /obj/item/weapon/card/id/prisoner)) + if(istype(W, /obj/item/card/id/prisoner)) if(!id) if(!user.drop_item()) return @@ -101,7 +101,7 @@ id = null else var/obj/item/I = usr.get_active_held_item() - if(istype(I, /obj/item/weapon/card/id/prisoner)) + if(istype(I, /obj/item/card/id/prisoner)) if(!usr.drop_item()) return I.forceMove(src) diff --git a/code/game/machinery/computer/launchpad_control.dm b/code/game/machinery/computer/launchpad_control.dm index ae88943cb29..d6c8d9e7e92 100644 --- a/code/game/machinery/computer/launchpad_control.dm +++ b/code/game/machinery/computer/launchpad_control.dm @@ -3,7 +3,7 @@ desc = "Used to teleport objects to and from a launchpad." icon_screen = "teleport" icon_keyboard = "teleport_key" - circuit = /obj/item/weapon/circuitboard/computer/launchpad_console + circuit = /obj/item/circuitboard/computer/launchpad_console var/sending = TRUE var/current_pad //current pad viewed on the screen var/list/obj/machinery/launchpad/launchpads diff --git a/code/game/machinery/computer/law.dm b/code/game/machinery/computer/law.dm index 4846c99326a..9eda23a1c0c 100644 --- a/code/game/machinery/computer/law.dm +++ b/code/game/machinery/computer/law.dm @@ -5,8 +5,8 @@ icon_screen = "command" /obj/machinery/computer/upload/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/aiModule)) - var/obj/item/weapon/aiModule/M = O + if(istype(O, /obj/item/aiModule)) + var/obj/item/aiModule/M = O if(src.stat & (NOPOWER|BROKEN|MAINT)) return if(!current) @@ -33,7 +33,7 @@ /obj/machinery/computer/upload/ai name = "\improper AI upload console" desc = "Used to upload laws to the AI." - circuit = /obj/item/weapon/circuitboard/computer/aiupload + circuit = /obj/item/circuitboard/computer/aiupload /obj/machinery/computer/upload/ai/attack_hand(mob/user) if(..()) @@ -57,7 +57,7 @@ /obj/machinery/computer/upload/borg name = "cyborg upload console" desc = "Used to upload laws to Cyborgs." - circuit = /obj/item/weapon/circuitboard/computer/borgupload + circuit = /obj/item/circuitboard/computer/borgupload /obj/machinery/computer/upload/borg/attack_hand(mob/user) if(..()) diff --git a/code/game/machinery/computer/medical.dm b/code/game/machinery/computer/medical.dm index cd1e5b1c90e..f2ea3238efb 100644 --- a/code/game/machinery/computer/medical.dm +++ b/code/game/machinery/computer/medical.dm @@ -6,8 +6,8 @@ icon_screen = "medcomp" icon_keyboard = "med_key" req_one_access = list(ACCESS_MEDICAL, ACCESS_FORENSICS_LOCKERS) - circuit = /obj/item/weapon/circuitboard/computer/med_data - var/obj/item/weapon/card/id/scan = null + circuit = /obj/item/circuitboard/computer/med_data + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null var/screen = null @@ -26,7 +26,7 @@ icon_keyboard = "syndie_key" /obj/machinery/computer/med_data/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/card/id) && !scan) + if(istype(O, /obj/item/card/id) && !scan) if(!user.drop_item()) return O.loc = src @@ -112,11 +112,11 @@ dat += "" if(active1 in GLOB.data_core.general) - if(istype(active1.fields["photo_front"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P1 = active1.fields["photo_front"] + if(istype(active1.fields["photo_front"], /obj/item/photo)) + var/obj/item/photo/P1 = active1.fields["photo_front"] user << browse_rsc(P1.img, "photo_front") - if(istype(active1.fields["photo_side"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P2 = active1.fields["photo_side"] + if(istype(active1.fields["photo_side"], /obj/item/photo)) + var/obj/item/photo/P2 = active1.fields["photo_side"] user << browse_rsc(P2.img, "photo_side") dat += "" dat += "" @@ -222,7 +222,7 @@ src.scan = null else var/obj/item/I = usr.get_active_held_item() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) if(!usr.drop_item()) return I.loc = src @@ -258,7 +258,7 @@ src.authenticated = 1 src.rank = "Central Command" src.screen = 1 - else if(istype(src.scan, /obj/item/weapon/card/id)) + else if(istype(src.scan, /obj/item/card/id)) src.active1 = null src.active2 = null if(src.check_access(src.scan)) @@ -399,14 +399,14 @@ if("show_photo_front") if(active1) if(active1.fields["photo_front"]) - if(istype(active1.fields["photo_front"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = active1.fields["photo_front"] + if(istype(active1.fields["photo_front"], /obj/item/photo)) + var/obj/item/photo/P = active1.fields["photo_front"] P.show(usr) if("show_photo_side") if(active1) if(active1.fields["photo_side"]) - if(istype(active1.fields["photo_side"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = active1.fields["photo_side"] + if(istype(active1.fields["photo_side"], /obj/item/photo)) + var/obj/item/photo/P = active1.fields["photo_side"] P.show(usr) else @@ -539,7 +539,7 @@ GLOB.data_core.medicalPrintCount++ playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) sleep(30) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( src.loc ) + var/obj/item/paper/P = new /obj/item/paper( src.loc ) P.info = "
Medical Record - (MR-[GLOB.data_core.medicalPrintCount])

" if(active1 in GLOB.data_core.general) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", src.active1.fields["name"], src.active1.fields["id"], src.active1.fields["sex"], src.active1.fields["age"]) diff --git a/code/game/machinery/computer/message.dm b/code/game/machinery/computer/message.dm index f71066f8dd3..44822d37714 100644 --- a/code/game/machinery/computer/message.dm +++ b/code/game/machinery/computer/message.dm @@ -8,7 +8,7 @@ name = "message monitor console" desc = "Used to Monitor the crew's messages, that are sent via PDA. Can also be used to view Request Console messages." icon_screen = "comm_logs" - circuit = /obj/item/weapon/circuitboard/computer/message_monitor + circuit = /obj/item/circuitboard/computer/message_monitor //Server linked to. var/obj/machinery/message_server/linkedServer = null //Sparks effect - For emag @@ -32,8 +32,8 @@ light_color = LIGHT_COLOR_GREEN -/obj/machinery/computer/message_monitor/attackby(obj/item/weapon/O, mob/living/user, params) - if(istype(O, /obj/item/weapon/screwdriver) && emagged) +/obj/machinery/computer/message_monitor/attackby(obj/item/O, mob/living/user, params) + if(istype(O, /obj/item/screwdriver) && emagged) //Stops people from just unscrewing the monitor and putting it back to get the console working again. to_chat(user, "It is too hot to mess with!") else @@ -47,7 +47,7 @@ screen = 2 spark_system.set_up(5, 0, src) src.spark_system.start() - var/obj/item/weapon/paper/monitorkey/MK = new/obj/item/weapon/paper/monitorkey + var/obj/item/paper/monitorkey/MK = new/obj/item/paper/monitorkey MK.loc = src.loc // Will help make emagging the console not so easy to get away with. MK.info += "

�%@%(*$%&(�&?*(%&�/{}" @@ -451,16 +451,16 @@ return src.attack_hand(usr) -/obj/item/weapon/paper/monitorkey +/obj/item/paper/monitorkey //..() name = "monitor decryption key" var/obj/machinery/message_server/server = null -/obj/item/weapon/paper/monitorkey/Initialize() +/obj/item/paper/monitorkey/Initialize() ..() return INITIALIZE_HINT_LATELOAD -/obj/item/weapon/paper/monitorkey/LateInitialize() +/obj/item/paper/monitorkey/LateInitialize() if(GLOB.message_servers) for(var/obj/machinery/message_server/server in GLOB.message_servers) if(!isnull(server)) diff --git a/code/game/machinery/computer/monastery_shuttle.dm b/code/game/machinery/computer/monastery_shuttle.dm index ac2e9c9e78a..98e79099545 100644 --- a/code/game/machinery/computer/monastery_shuttle.dm +++ b/code/game/machinery/computer/monastery_shuttle.dm @@ -1,7 +1,7 @@ /obj/machinery/computer/shuttle/monastery_shuttle name = "monastery shuttle console" desc = "Used to control the monastery shuttle." - circuit = /obj/item/weapon/circuitboard/computer/shuttle/monastery_shuttle + circuit = /obj/item/circuitboard/computer/shuttle/monastery_shuttle shuttleId = "pod1" possible_destinations = "monastery_shuttle_asteroid;monastery_shuttle_station" no_destination_swap = TRUE diff --git a/code/game/machinery/computer/prisoner.dm b/code/game/machinery/computer/prisoner.dm index ac74f47cd42..56a6320640f 100644 --- a/code/game/machinery/computer/prisoner.dm +++ b/code/game/machinery/computer/prisoner.dm @@ -10,8 +10,8 @@ var/timeleft = 60 var/stop = 0 var/screen = 0 // 0 - No Access Denied, 1 - Access allowed - var/obj/item/weapon/card/id/prisoner/inserted_id - circuit = /obj/item/weapon/circuitboard/computer/prisoner + var/obj/item/card/id/prisoner/inserted_id + circuit = /obj/item/circuitboard/computer/prisoner light_color = LIGHT_COLOR_RED @@ -34,7 +34,7 @@ dat += "

Prisoner Implant Management

" dat += "
Chemical Implants
" var/turf/Tr = null - for(var/obj/item/weapon/implant/chem/C in GLOB.tracked_chem_implants) + for(var/obj/item/implant/chem/C in GLOB.tracked_chem_implants) Tr = get_turf(C) if((Tr) && (Tr.z != src.z)) continue//Out of range @@ -47,7 +47,7 @@ dat += "((10))
" dat += "********************************
" dat += "
Tracking Implants
" - for(var/obj/item/weapon/implant/tracking/T in GLOB.tracked_implants) + for(var/obj/item/implant/tracking/T in GLOB.tracked_implants) if(!isliving(T.imp_in)) continue Tr = get_turf(T) @@ -71,7 +71,7 @@ return /obj/machinery/computer/prisoner/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) return attack_hand(user) else return ..() @@ -90,7 +90,7 @@ if(href_list["id"]) if(href_list["id"] =="insert" && !inserted_id) - var/obj/item/weapon/card/id/prisoner/I = usr.get_active_held_item() + var/obj/item/card/id/prisoner/I = usr.get_active_held_item() if(istype(I)) if(!usr.drop_item()) return @@ -111,16 +111,16 @@ num = min(num,1000) //Cap the quota to the equivilent of 10 minutes. inserted_id.goal = num else if(href_list["inject1"]) - var/obj/item/weapon/implant/I = locate(href_list["inject1"]) in GLOB.tracked_chem_implants + var/obj/item/implant/I = locate(href_list["inject1"]) in GLOB.tracked_chem_implants if(I && istype(I)) I.activate(1) else if(href_list["inject5"]) - var/obj/item/weapon/implant/I = locate(href_list["inject5"]) in GLOB.tracked_chem_implants + var/obj/item/implant/I = locate(href_list["inject5"]) in GLOB.tracked_chem_implants if(I && istype(I)) I.activate(5) else if(href_list["inject10"]) - var/obj/item/weapon/implant/I = locate(href_list["inject10"]) in GLOB.tracked_chem_implants + var/obj/item/implant/I = locate(href_list["inject10"]) in GLOB.tracked_chem_implants if(I && istype(I)) I.activate(10) @@ -134,7 +134,7 @@ var/warning = copytext(sanitize(input(usr,"Message:","Enter your message here!","")),1,MAX_MESSAGE_LEN) if(!warning) return - var/obj/item/weapon/implant/I = locate(href_list["warn"]) in GLOB.tracked_implants + var/obj/item/implant/I = locate(href_list["warn"]) in GLOB.tracked_implants if(I && istype(I) && I.imp_in) var/mob/living/R = I.imp_in to_chat(R, "You hear a voice in your head saying: '[warning]'") diff --git a/code/game/machinery/computer/robot.dm b/code/game/machinery/computer/robot.dm index 6ffb0f1e375..9960032d1d3 100644 --- a/code/game/machinery/computer/robot.dm +++ b/code/game/machinery/computer/robot.dm @@ -7,7 +7,7 @@ icon_screen = "robot" icon_keyboard = "rd_key" req_access = list(ACCESS_ROBOTICS) - circuit = /obj/item/weapon/circuitboard/computer/robotics + circuit = /obj/item/circuitboard/computer/robotics var/temp = null light_color = LIGHT_COLOR_PINK diff --git a/code/game/machinery/computer/security.dm b/code/game/machinery/computer/security.dm index 517d9c8264d..00787f10e29 100644 --- a/code/game/machinery/computer/security.dm +++ b/code/game/machinery/computer/security.dm @@ -4,8 +4,8 @@ icon_screen = "security" icon_keyboard = "security_key" req_one_access = list(ACCESS_SECURITY, ACCESS_FORENSICS_LOCKERS) - circuit = /obj/item/weapon/circuitboard/computer/secure_data - var/obj/item/weapon/card/id/scan = null + circuit = /obj/item/circuitboard/computer/secure_data + var/obj/item/card/id/scan = null var/authenticated = null var/rank = null var/screen = null @@ -35,7 +35,7 @@ clockwork = TRUE //it'd look weird /obj/machinery/computer/secure_data/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/card/id)) + if(istype(O, /obj/item/card/id)) if(!scan) if(!user.drop_item()) return @@ -175,11 +175,11 @@ if(3) dat += "Security Record
" if(istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)) - if(istype(active1.fields["photo_front"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P1 = active1.fields["photo_front"] + if(istype(active1.fields["photo_front"], /obj/item/photo)) + var/obj/item/photo/P1 = active1.fields["photo_front"] user << browse_rsc(P1.img, "photo_front") - if(istype(active1.fields["photo_side"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P2 = active1.fields["photo_side"] + if(istype(active1.fields["photo_side"], /obj/item/photo)) + var/obj/item/photo/P2 = active1.fields["photo_side"] user << browse_rsc(P2.img, "photo_side") dat += {"
Medical Record
Name:[active1.fields["name"]]
@@ -310,7 +310,7 @@ What a mess.*/ scan = null else var/obj/item/I = usr.get_active_held_item() - if(istype(I, /obj/item/weapon/card/id)) + if(istype(I, /obj/item/card/id)) if(!usr.drop_item()) return I.loc = src @@ -336,7 +336,7 @@ What a mess.*/ authenticated = usr.client.holder.admin_signature rank = "Central Command" screen = 1 - else if(istype(scan, /obj/item/weapon/card/id)) + else if(istype(scan, /obj/item/card/id)) active1 = null active2 = null if(check_access(scan)) @@ -369,7 +369,7 @@ What a mess.*/ GLOB.data_core.securityPrintCount++ playsound(loc, 'sound/items/poster_being_created.ogg', 100, 1) sleep(30) - var/obj/item/weapon/paper/P = new /obj/item/weapon/paper( loc ) + var/obj/item/paper/P = new /obj/item/paper( loc ) P.info = "
Security Record - (SR-[GLOB.data_core.securityPrintCount])

" if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1))) P.info += text("Name: [] ID: []
\nSex: []
\nAge: []
", active1.fields["name"], active1.fields["id"], active1.fields["sex"], active1.fields["age"]) @@ -451,8 +451,8 @@ What a mess.*/ printing = 1 sleep(30) if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists. - var/obj/item/weapon/photo/photo = active1.fields["photo_front"] - new /obj/item/weapon/poster/wanted(src.loc, photo.img, wanted_name, info) + var/obj/item/photo/photo = active1.fields["photo_front"] + new /obj/item/poster/wanted(src.loc, photo.img, wanted_name, info) printing = 0 //RECORD DELETE @@ -610,8 +610,8 @@ What a mess.*/ active1.fields["species"] = t1 if("show_photo_front") if(active1.fields["photo_front"]) - if(istype(active1.fields["photo_front"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = active1.fields["photo_front"] + if(istype(active1.fields["photo_front"], /obj/item/photo)) + var/obj/item/photo/P = active1.fields["photo_front"] P.show(usr) if("upd_photo_front") var/icon/photo = get_photo(usr) @@ -620,8 +620,8 @@ What a mess.*/ active1.fields["photo_front"] = photo if("show_photo_side") if(active1.fields["photo_side"]) - if(istype(active1.fields["photo_side"], /obj/item/weapon/photo)) - var/obj/item/weapon/photo/P = active1.fields["photo_side"] + if(istype(active1.fields["photo_side"], /obj/item/photo)) + var/obj/item/photo/P = active1.fields["photo_side"] P.show(usr) if("upd_photo_side") var/icon/photo = get_photo(usr) @@ -737,14 +737,14 @@ What a mess.*/ return /obj/machinery/computer/secure_data/proc/get_photo(mob/user) - var/obj/item/weapon/photo/P = null + var/obj/item/photo/P = null if(issilicon(user)) var/mob/living/silicon/tempAI = user var/datum/picture/selection = tempAI.GetPhoto() if(selection) P = new() P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"]) - else if(istype(user.get_active_held_item(), /obj/item/weapon/photo)) + else if(istype(user.get_active_held_item(), /obj/item/photo)) P = user.get_active_held_item() return P diff --git a/code/game/machinery/computer/station_alert.dm b/code/game/machinery/computer/station_alert.dm index 44d291cf8b9..019d52fe86a 100644 --- a/code/game/machinery/computer/station_alert.dm +++ b/code/game/machinery/computer/station_alert.dm @@ -3,7 +3,7 @@ desc = "Used to access the station's automated alert system." icon_screen = "alert:0" icon_keyboard = "atmos_key" - circuit = /obj/item/weapon/circuitboard/computer/stationalert + circuit = /obj/item/circuitboard/computer/stationalert var/alarms = list("Fire" = list(), "Atmosphere" = list(), "Power" = list()) light_color = LIGHT_COLOR_CYAN diff --git a/code/game/machinery/computer/teleporter.dm b/code/game/machinery/computer/teleporter.dm index f184d78a1b3..ab4c72ab41e 100644 --- a/code/game/machinery/computer/teleporter.dm +++ b/code/game/machinery/computer/teleporter.dm @@ -4,7 +4,7 @@ icon_screen = "teleport" icon_keyboard = "teleport_key" light_color = LIGHT_COLOR_BLUE - circuit = /obj/item/weapon/circuitboard/computer/teleporter + circuit = /obj/item/circuitboard/computer/teleporter var/obj/item/device/gps/locked var/regime_set = "Teleporter" var/id @@ -168,7 +168,7 @@ continue L[avoid_assoc_duplicate_keys(T.loc.name, areaindex)] = R - for(var/obj/item/weapon/implant/tracking/I in GLOB.tracked_implants) + for(var/obj/item/implant/tracking/I in GLOB.tracked_implants) if(!I.imp_in || !ismob(I.loc)) continue else diff --git a/code/game/machinery/constructable_frame.dm b/code/game/machinery/constructable_frame.dm index 1ff66314f27..04c2ad6e29c 100644 --- a/code/game/machinery/constructable_frame.dm +++ b/code/game/machinery/constructable_frame.dm @@ -4,7 +4,7 @@ icon_state = "box_0" density = TRUE max_integrity = 250 - var/obj/item/weapon/circuitboard/circuit = null + var/obj/item/circuitboard/circuit = null var/state = 1 /obj/structure/frame/examine(user) @@ -74,10 +74,10 @@ /obj/structure/frame/machine/attackby(obj/item/P, mob/user, params) switch(state) if(1) - if(istype(P, /obj/item/weapon/circuitboard/machine)) + if(istype(P, /obj/item/circuitboard/machine)) to_chat(user, "The frame needs wiring first!") return - else if(istype(P, /obj/item/weapon/circuitboard)) + else if(istype(P, /obj/item/circuitboard)) to_chat(user, "This frame does not accept circuit boards of this type!") return if(istype(P, /obj/item/stack/cable_coil)) @@ -94,7 +94,7 @@ else to_chat(user, "You need five length of cable to wire the frame!") return - if(istype(P, /obj/item/weapon/screwdriver) && !anchored) + if(istype(P, /obj/item/screwdriver) && !anchored) playsound(src.loc, P.usesound, 50, 1) user.visible_message("[user] disassembles the frame.", \ "You start to disassemble the frame...", "You hear banging and clanking.") @@ -105,7 +105,7 @@ M.add_fingerprint(user) qdel(src) return - if(istype(P, /obj/item/weapon/wrench)) + if(istype(P, /obj/item/wrench)) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(src.loc, P.usesound, 75, 1) if(do_after(user, 40*P.toolspeed, target = src)) @@ -115,7 +115,7 @@ return if(2) - if(istype(P, /obj/item/weapon/wrench)) + if(istype(P, /obj/item/wrench)) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(src.loc, P.usesound, 75, 1) if(do_after(user, 40*P.toolspeed, target = src)) @@ -123,11 +123,11 @@ anchored = !anchored return - if(istype(P, /obj/item/weapon/circuitboard/machine)) + if(istype(P, /obj/item/circuitboard/machine)) if(!anchored) to_chat(user, "The frame needs to be secured first!") return - var/obj/item/weapon/circuitboard/machine/B = P + var/obj/item/circuitboard/machine/B = P if(!user.drop_item()) return playsound(src.loc, 'sound/items/deconstruct.ogg', 50, 1) @@ -141,11 +141,11 @@ update_namelist() return - else if(istype(P, /obj/item/weapon/circuitboard)) + else if(istype(P, /obj/item/circuitboard)) to_chat(user, "This frame does not accept circuit boards of this type!") return - if(istype(P, /obj/item/weapon/wirecutters)) + if(istype(P, /obj/item/wirecutters)) playsound(src.loc, P.usesound, 50, 1) to_chat(user, "You remove the cables.") state = 1 @@ -155,7 +155,7 @@ return if(3) - if(istype(P, /obj/item/weapon/crowbar)) + if(istype(P, /obj/item/crowbar)) playsound(src.loc, P.usesound, 50, 1) state = 2 circuit.loc = src.loc @@ -173,7 +173,7 @@ icon_state = "box_1" return - if(istype(P, /obj/item/weapon/screwdriver)) + if(istype(P, /obj/item/screwdriver)) var/component_check = 1 for(var/R in req_components) if(req_components[R] > 0) @@ -194,13 +194,13 @@ qdel(src) return - if(istype(P, /obj/item/weapon/storage/part_replacer) && P.contents.len && get_req_components_amt()) - var/obj/item/weapon/storage/part_replacer/replacer = P + if(istype(P, /obj/item/storage/part_replacer) && P.contents.len && get_req_components_amt()) + var/obj/item/storage/part_replacer/replacer = P var/list/added_components = list() var/list/part_list = list() //Assemble a list of current parts, then sort them by their rating! - for(var/obj/item/weapon/stock_parts/co in replacer) + for(var/obj/item/stock_parts/co in replacer) part_list += co //Sort the parts. This ensures that higher tier items are applied first. part_list = sortTim(part_list, /proc/cmp_rped_sort) @@ -213,7 +213,7 @@ req_components[path]-- part_list -= part - for(var/obj/item/weapon/stock_parts/part in added_components) + for(var/obj/item/stock_parts/part in added_components) components += part to_chat(user, "[part.name] applied.") if(added_components.len) diff --git a/code/game/machinery/dance_machine.dm b/code/game/machinery/dance_machine.dm index 2891d47d912..9ba8e1d34d9 100644 --- a/code/game/machinery/dance_machine.dm +++ b/code/game/machinery/dance_machine.dm @@ -60,7 +60,7 @@ /obj/machinery/disco/attackby(obj/item/O, mob/user, params) if(!active) - if(istype(O, /obj/item/weapon/wrench)) + if(istype(O, /obj/item/wrench)) if(!anchored && !isinspace()) to_chat(user,"You secure the [src] to the floor.") anchored = TRUE diff --git a/code/game/machinery/deployable.dm b/code/game/machinery/deployable.dm index 093bc0ed75e..333aa6ac551 100644 --- a/code/game/machinery/deployable.dm +++ b/code/game/machinery/deployable.dm @@ -26,8 +26,8 @@ return /obj/structure/barricade/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM && material == METAL) - var/obj/item/weapon/weldingtool/WT = I + if(istype(I, /obj/item/weldingtool) && user.a_intent != INTENT_HARM && material == METAL) + var/obj/item/weldingtool/WT = I if(obj_integrity < max_integrity) if(WT.remove_fuel(0,user)) to_chat(user, "You begin repairing [src]...") @@ -108,7 +108,7 @@ visible_message("[src] deploys!") -/obj/item/weapon/grenade/barrier +/obj/item/grenade/barrier name = "barrier grenade" desc = "Instant cover. Alt+click to toggle modes." icon = 'icons/obj/grenade.dmi' @@ -117,12 +117,12 @@ actions_types = list(/datum/action/item_action/toggle_barrier_spread) var/mode = SINGLE -/obj/item/weapon/grenade/barrier/AltClick(mob/living/user) +/obj/item/grenade/barrier/AltClick(mob/living/user) if(!istype(user) || user.incapacitated()) return toggle_mode(user) -/obj/item/weapon/grenade/barrier/proc/toggle_mode(mob/user) +/obj/item/grenade/barrier/proc/toggle_mode(mob/user) switch(mode) if(SINGLE) mode = VERTICAL @@ -133,7 +133,7 @@ to_chat(user, "[src] is now in [mode] mode.") -/obj/item/weapon/grenade/barrier/prime() +/obj/item/grenade/barrier/prime() new /obj/structure/barricade/security(get_turf(src.loc)) switch(mode) if(VERTICAL) @@ -154,7 +154,7 @@ new /obj/structure/barricade/security(target_turf2) qdel(src) -/obj/item/weapon/grenade/barrier/ui_action_click(mob/user) +/obj/item/grenade/barrier/ui_action_click(mob/user) toggle_mode(user) diff --git a/code/game/machinery/dna_scanner.dm b/code/game/machinery/dna_scanner.dm index 80f73b3027f..65a60887212 100644 --- a/code/game/machinery/dna_scanner.dm +++ b/code/game/machinery/dna_scanner.dm @@ -9,7 +9,7 @@ idle_power_usage = 50 active_power_usage = 300 occupant_typecache = list(/mob/living, /obj/item/bodypart/head, /obj/item/organ/brain) - circuit = /obj/item/weapon/circuitboard/machine/clonescanner + circuit = /obj/item/circuitboard/machine/clonescanner var/locked = FALSE var/damage_coeff var/scan_level @@ -19,11 +19,11 @@ scan_level = 0 damage_coeff = 0 precision_coeff = 0 - for(var/obj/item/weapon/stock_parts/scanning_module/P in component_parts) + for(var/obj/item/stock_parts/scanning_module/P in component_parts) scan_level += P.rating - for(var/obj/item/weapon/stock_parts/manipulator/P in component_parts) + for(var/obj/item/stock_parts/manipulator/P in component_parts) precision_coeff = P.rating - for(var/obj/item/weapon/stock_parts/micro_laser/P in component_parts) + for(var/obj/item/stock_parts/micro_laser/P in component_parts) damage_coeff = P.rating /obj/machinery/dna_scannernew/update_icon() diff --git a/code/game/machinery/doors/airlock.dm b/code/game/machinery/doors/airlock.dm index 28d9a5fd3ad..ce82cd0e857 100644 --- a/code/game/machinery/doors/airlock.dm +++ b/code/game/machinery/doors/airlock.dm @@ -67,11 +67,11 @@ assemblytype = /obj/structure/door_assembly/door_assembly_0 var/justzap = FALSE normalspeed = 1 - var/obj/item/weapon/electronics/airlock/electronics = null + var/obj/item/electronics/airlock/electronics = null var/hasShocked = FALSE //Prevents multiple shocks from happening autoclose = TRUE var/obj/item/device/doorCharge/charge = null //If applied, causes an explosion upon opening the door - var/obj/item/weapon/note //Any papers pinned to the airlock + var/obj/item/note //Any papers pinned to the airlock var/detonated = 0 var/doorOpen = 'sound/machines/airlock.ogg' var/doorClose = 'sound/machines/airlockclose.ogg' @@ -1020,8 +1020,8 @@ update_icon() return if(AIRLOCK_SECURITY_METAL) - if(istype(C, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = C + if(istype(C, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return to_chat(user, "You begin cutting the panel's shielding...") @@ -1038,8 +1038,8 @@ update_icon() return if(AIRLOCK_SECURITY_PLASTEEL_I_S) - if(istype(C, /obj/item/weapon/crowbar)) - var/obj/item/weapon/crowbar/W = C + if(istype(C, /obj/item/crowbar)) + var/obj/item/crowbar/W = C to_chat(user, "You start removing the inner layer of shielding...") playsound(src, W.usesound, 100, 1) if(do_after(user, 40*W.toolspeed, 1, target = src)) @@ -1056,8 +1056,8 @@ update_icon() return if(AIRLOCK_SECURITY_PLASTEEL_I) - if(istype(C, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = C + if(istype(C, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return to_chat(user, "You begin cutting the inner layer of shielding...") @@ -1072,8 +1072,8 @@ security_level = AIRLOCK_SECURITY_PLASTEEL_I_S return if(AIRLOCK_SECURITY_PLASTEEL_O_S) - if(istype(C, /obj/item/weapon/crowbar)) - var/obj/item/weapon/crowbar/W = C + if(istype(C, /obj/item/crowbar)) + var/obj/item/crowbar/W = C to_chat(user, "You start removing outer layer of shielding...") playsound(src, W.usesound, 100, 1) if(do_after(user, 40*W.toolspeed, 1, target = src)) @@ -1087,8 +1087,8 @@ spawn_atom_to_turf(/obj/item/stack/sheet/plasteel, user.loc, 1) return if(AIRLOCK_SECURITY_PLASTEEL_O) - if(istype(C, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = C + if(istype(C, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = C if(!WT.remove_fuel(2, user)) return to_chat(user, "You begin cutting the outer layer of shielding...") @@ -1103,8 +1103,8 @@ security_level = AIRLOCK_SECURITY_PLASTEEL_O_S return if(AIRLOCK_SECURITY_PLASTEEL) - if(istype(C, /obj/item/weapon/wirecutters)) - var/obj/item/weapon/wirecutters/W = C + if(istype(C, /obj/item/wirecutters)) + var/obj/item/wirecutters/W = C if(src.hasPower() && src.shock(user, 60)) // Protective grille of wiring is electrified return to_chat(user, "You start cutting through the outer grille.") @@ -1116,7 +1116,7 @@ "You cut through \the [src]'s outer grille.") security_level = AIRLOCK_SECURITY_PLASTEEL_O return - if(istype(C, /obj/item/weapon/screwdriver)) + if(istype(C, /obj/item/screwdriver)) if(panel_open && detonated) to_chat(user, "[src] has no maintenance panel!") return @@ -1124,7 +1124,7 @@ to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the airlock.") playsound(src.loc, C.usesound, 50, 1) src.update_icon() - else if(istype(C, /obj/item/weapon/wirecutters) && note) + else if(istype(C, /obj/item/wirecutters) && note) user.visible_message("[user] cuts down [note] from [src].", "You remove [note] from [src].") playsound(src, 'sound/items/Wirecutter.ogg', 50, 1) note.forceMove(get_turf(user)) @@ -1132,10 +1132,10 @@ update_icon() else if(is_wire_tool(C)) return attack_hand(user) - else if(istype(C, /obj/item/weapon/pai_cable)) - var/obj/item/weapon/pai_cable/cable = C + else if(istype(C, /obj/item/pai_cable)) + var/obj/item/pai_cable/cable = C cable.plugin(src, user) - else if(istype(C, /obj/item/weapon/airlock_painter)) + else if(istype(C, /obj/item/airlock_painter)) change_paintjob(C, user) else if(istype(C, /obj/item/device/doorCharge)) if(!panel_open || security_level) @@ -1155,7 +1155,7 @@ update_icon() C.forceMove(src) charge = C - else if(istype(C, /obj/item/weapon/paper) || istype(C, /obj/item/weapon/photo)) + else if(istype(C, /obj/item/paper) || istype(C, /obj/item/photo)) if(note) to_chat(user, "There's already something pinned to this airlock! Use wirecutters to remove it.") return @@ -1169,7 +1169,7 @@ return ..() -/obj/machinery/door/airlock/try_to_weld(obj/item/weapon/weldingtool/W, mob/user) +/obj/machinery/door/airlock/try_to_weld(obj/item/weldingtool/W, mob/user) if(!operating && density) if(user.a_intent != INTENT_HELP) if(W.remove_fuel(0,user)) @@ -1200,12 +1200,12 @@ else to_chat(user, "The airlock doesn't need repairing.") -/obj/machinery/door/airlock/proc/weld_checks(obj/item/weapon/weldingtool/W, mob/user) +/obj/machinery/door/airlock/proc/weld_checks(obj/item/weldingtool/W, mob/user) return !operating && density && user && W && W.isOn() && user.loc /obj/machinery/door/airlock/try_to_crowbar(obj/item/I, mob/living/user) var/beingcrowbarred = null - if(istype(I, /obj/item/weapon/crowbar) ) + if(istype(I, /obj/item/crowbar) ) beingcrowbarred = 1 else beingcrowbarred = 0 @@ -1236,7 +1236,7 @@ to_chat(user, "The airlock's bolts prevent it from being forced!") else if( !welded && !operating) if(!beingcrowbarred) //being fireaxe'd - var/obj/item/weapon/twohanded/fireaxe/F = I + var/obj/item/twohanded/fireaxe/F = I if(F.wielded) spawn(0) if(density) @@ -1252,7 +1252,7 @@ else close(2) - if(istype(I, /obj/item/weapon/crowbar/power)) + if(istype(I, /obj/item/crowbar/power)) if(isElectrified()) shock(user,100)//it's like sticking a forck in a power socket return @@ -1399,7 +1399,7 @@ return -/obj/machinery/door/airlock/proc/change_paintjob(obj/item/weapon/airlock_painter/W, mob/user) +/obj/machinery/door/airlock/proc/change_paintjob(obj/item/airlock_painter/W, mob/user) if(!W.can_use(user)) return @@ -1463,7 +1463,7 @@ assemblytype = /obj/structure/door_assembly/door_assembly_highsecurity update_icon() -/obj/machinery/door/airlock/CanAStarPass(obj/item/weapon/card/id/ID) +/obj/machinery/door/airlock/CanAStarPass(obj/item/card/id/ID) //Airlock is passable if it is open (!density), bot has access, and is not bolted shut or powered off) return !density || (check_access(ID) && !locked && hasPower()) @@ -1567,9 +1567,9 @@ if(user) to_chat(user, "You remove the airlock electronics.") - var/obj/item/weapon/electronics/airlock/ae + var/obj/item/electronics/airlock/ae if(!electronics) - ae = new/obj/item/weapon/electronics/airlock( src.loc ) + ae = new/obj/item/electronics/airlock( src.loc ) gen_access() if(req_one_access.len) ae.one_access = 1 @@ -1582,13 +1582,13 @@ ae.loc = src.loc qdel(src) -/obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/weapon/construction/rcd/the_rcd) +/obj/machinery/door/airlock/rcd_vals(mob/user, obj/item/construction/rcd/the_rcd) switch(the_rcd.mode) if(RCD_DECONSTRUCT) return list("mode" = RCD_DECONSTRUCT, "delay" = 50, "cost" = 32) return FALSE -/obj/machinery/door/airlock/rcd_act(mob/user, obj/item/weapon/construction/rcd/the_rcd, passed_mode) +/obj/machinery/door/airlock/rcd_act(mob/user, obj/item/construction/rcd/the_rcd, passed_mode) switch(passed_mode) if(RCD_DECONSTRUCT) to_chat(user, "You deconstruct the airlock.") @@ -1599,9 +1599,9 @@ /obj/machinery/door/airlock/proc/note_type() //Returns a string representing the type of note pinned to this airlock if(!note) return - else if(istype(note, /obj/item/weapon/paper)) + else if(istype(note, /obj/item/paper)) return "note" - else if(istype(note, /obj/item/weapon/photo)) + else if(istype(note, /obj/item/photo)) return "photo" #undef AIRLOCK_CLOSED diff --git a/code/game/machinery/doors/airlock_electronics.dm b/code/game/machinery/doors/airlock_electronics.dm index 41c4bc30f48..f27e3da2dcd 100644 --- a/code/game/machinery/doors/airlock_electronics.dm +++ b/code/game/machinery/doors/airlock_electronics.dm @@ -1,18 +1,18 @@ -/obj/item/weapon/electronics/airlock +/obj/item/electronics/airlock name = "airlock electronics" req_access = list(ACCESS_MAINT_TUNNELS) var/list/accesses = list() var/one_access = 0 -/obj/item/weapon/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ +/obj/item/electronics/airlock/ui_interact(mob/user, ui_key = "main", datum/tgui/ui = null, force_open = FALSE, \ datum/tgui/master_ui = null, datum/ui_state/state = GLOB.hands_state) SStgui.try_update_ui(user, src, ui_key, ui, force_open) if(!ui) ui = new(user, src, ui_key, "airlock_electronics", name, 975, 420, master_ui, state) ui.open() -/obj/item/weapon/electronics/airlock/ui_data() +/obj/item/electronics/airlock/ui_data() var/list/data = list() var/list/regions = list() @@ -33,7 +33,7 @@ return data -/obj/item/weapon/electronics/airlock/ui_act(action, params) +/obj/item/electronics/airlock/ui_act(action, params) if(..()) return switch(action) diff --git a/code/game/machinery/doors/airlock_types.dm b/code/game/machinery/doors/airlock_types.dm index a076f6898e9..8563d0b93d4 100644 --- a/code/game/machinery/doors/airlock_types.dm +++ b/code/game/machinery/doors/airlock_types.dm @@ -510,7 +510,7 @@ /obj/machinery/door/airlock/clockwork/proc/attempt_construction(obj/item/I, mob/living/user) if(!I || !user || !user.canUseTopic(src)) return 0 - else if(istype(I, /obj/item/weapon/wrench)) + else if(istype(I, /obj/item/wrench)) if(construction_state == GEAR_SECURE) user.visible_message("[user] begins loosening [src]'s cogwheel...", "You begin loosening [src]'s cogwheel...") playsound(src, I.usesound, 50, 1) @@ -528,7 +528,7 @@ playsound(src, 'sound/items/deconstruct.ogg', 50, 1) construction_state = GEAR_SECURE return 1 - else if(istype(I, /obj/item/weapon/crowbar)) + else if(istype(I, /obj/item/crowbar)) if(construction_state == GEAR_SECURE) to_chat(user, "[src]'s cogwheel is too tightly secured! Your [I.name] can't reach under it!") return 1 diff --git a/code/game/machinery/doors/door.dm b/code/game/machinery/doors/door.dm index e1c477f82ef..f12341d6695 100644 --- a/code/game/machinery/doors/door.dm +++ b/code/game/machinery/doors/door.dm @@ -150,17 +150,17 @@ return TRUE return ..() -/obj/machinery/door/proc/try_to_weld(obj/item/weapon/weldingtool/W, mob/user) +/obj/machinery/door/proc/try_to_weld(obj/item/weldingtool/W, mob/user) return /obj/machinery/door/proc/try_to_crowbar(obj/item/I, mob/user) return /obj/machinery/door/attackby(obj/item/I, mob/user, params) - if(user.a_intent != INTENT_HARM && (istype(I, /obj/item/weapon/crowbar) || istype(I, /obj/item/weapon/twohanded/fireaxe))) + if(user.a_intent != INTENT_HARM && (istype(I, /obj/item/crowbar) || istype(I, /obj/item/twohanded/fireaxe))) try_to_crowbar(I, user) return 1 - else if(istype(I, /obj/item/weapon/weldingtool)) + else if(istype(I, /obj/item/weldingtool)) try_to_weld(I, user) return 1 else if(!(I.flags_1 & NOBLUDGEON_1) && user.a_intent != INTENT_HARM) @@ -327,7 +327,7 @@ /obj/machinery/door/morgue icon = 'icons/obj/doors/doormorgue.dmi' -/obj/machinery/door/storage_contents_dump_act(obj/item/weapon/storage/src_object, mob/user) +/obj/machinery/door/storage_contents_dump_act(obj/item/storage/src_object, mob/user) return 0 /obj/machinery/door/proc/lock() diff --git a/code/game/machinery/doors/firedoor.dm b/code/game/machinery/doors/firedoor.dm index f610531be11..02f3f03b917 100644 --- a/code/game/machinery/doors/firedoor.dm +++ b/code/game/machinery/doors/firedoor.dm @@ -91,13 +91,13 @@ "You bang on \the [src].") playsound(loc, 'sound/effects/glassknock.ogg', 10, FALSE, frequency = 32000) -/obj/machinery/door/firedoor/attackby(obj/item/weapon/C, mob/user, params) +/obj/machinery/door/firedoor/attackby(obj/item/C, mob/user, params) add_fingerprint(user) if(operating) return if(welded) - if(istype(C, /obj/item/weapon/wrench)) + if(istype(C, /obj/item/wrench)) if(boltslocked) to_chat(user, "There are screws locking the bolts in place!") return @@ -111,7 +111,7 @@ "You undo [src]'s floor bolts.") deconstruct(TRUE) return - if(istype(C, /obj/item/weapon/screwdriver)) + if(istype(C, /obj/item/screwdriver)) user.visible_message("[user] [boltslocked ? "unlocks" : "locks"] [src]'s bolts.", \ "You [boltslocked ? "unlock" : "lock"] [src]'s floor bolts.") playsound(get_turf(src), C.usesound, 50, 1) @@ -123,7 +123,7 @@ /obj/machinery/door/firedoor/try_to_activate_door(mob/user) return -/obj/machinery/door/firedoor/try_to_weld(obj/item/weapon/weldingtool/W, mob/user) +/obj/machinery/door/firedoor/try_to_weld(obj/item/weldingtool/W, mob/user) if(W.remove_fuel(0, user)) playsound(get_turf(src), W.usesound, 50, 1) user.visible_message("[user] starts [welded ? "unwelding" : "welding"] [src].", "You start welding [src].") @@ -243,7 +243,7 @@ max_integrity = 550 -/obj/item/weapon/electronics/firelock +/obj/item/electronics/firelock name = "firelock circuitry" desc = "A circuit board used in construction of firelocks." icon_state = "mainboard" @@ -276,10 +276,10 @@ ..() icon_state = "frame[constructionStep]" -/obj/structure/firelock_frame/attackby(obj/item/weapon/C, mob/user) +/obj/structure/firelock_frame/attackby(obj/item/C, mob/user) switch(constructionStep) if(CONSTRUCTION_PANEL_OPEN) - if(istype(C, /obj/item/weapon/crowbar)) + if(istype(C, /obj/item/crowbar)) playsound(get_turf(src), C.usesound, 50, 1) user.visible_message("[user] starts prying something out from [src]...", \ "You begin prying out the wire cover...") @@ -293,7 +293,7 @@ constructionStep = CONSTRUCTION_WIRES_EXPOSED update_icon() return - if(istype(C, /obj/item/weapon/wrench)) + if(istype(C, /obj/item/wrench)) if(locate(/obj/machinery/door/firedoor) in get_turf(src)) to_chat(user, "There's already a firelock there.") return @@ -335,7 +335,7 @@ return if(CONSTRUCTION_WIRES_EXPOSED) - if(istype(C, /obj/item/weapon/wirecutters)) + if(istype(C, /obj/item/wirecutters)) playsound(get_turf(src), C.usesound, 50, 1) user.visible_message("[user] starts cutting the wires from [src]...", \ "You begin removing [src]'s wires...") @@ -350,7 +350,7 @@ constructionStep = CONSTRUCTION_GUTTED update_icon() return - if(istype(C, /obj/item/weapon/crowbar)) + if(istype(C, /obj/item/crowbar)) playsound(get_turf(src), C.usesound, 50, 1) user.visible_message("[user] starts prying a metal plate into [src]...", \ "You begin prying the cover plate back onto [src]...") @@ -365,7 +365,7 @@ update_icon() return if(CONSTRUCTION_GUTTED) - if(istype(C, /obj/item/weapon/crowbar)) + if(istype(C, /obj/item/crowbar)) user.visible_message("[user] begins removing the circuit board from [src]...", \ "You begin prying out the circuit board from [src]...") playsound(get_turf(src), C.usesound, 50, 1) @@ -375,7 +375,7 @@ return user.visible_message("[user] removes [src]'s circuit board.", \ "You remove the circuit board from [src].") - new /obj/item/weapon/electronics/firelock(get_turf(src)) + new /obj/item/electronics/firelock(get_turf(src)) playsound(get_turf(src), C.usesound, 50, 1) constructionStep = CONSTRUCTION_NOCIRCUIT update_icon() @@ -399,8 +399,8 @@ update_icon() return if(CONSTRUCTION_NOCIRCUIT) - if(istype(C, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/W = C + if(istype(C, /obj/item/weldingtool)) + var/obj/item/weldingtool/W = C if(W.remove_fuel(1,user)) playsound(get_turf(src), W.usesound, 50, 1) user.visible_message("[user] begins cutting apart [src]'s frame...", \ @@ -418,7 +418,7 @@ new /obj/item/stack/sheet/plasteel(T, 2) qdel(src) return - if(istype(C, /obj/item/weapon/electronics/firelock)) + if(istype(C, /obj/item/electronics/firelock)) user.visible_message("[user] starts adding [C] to [src]...", \ "You begin adding a circuit board to [src]...") playsound(get_turf(src), 'sound/items/deconstruct.ogg', 50, 1) diff --git a/code/game/machinery/doors/windowdoor.dm b/code/game/machinery/doors/windowdoor.dm index d13685ccf16..6a1bb1ec3ae 100644 --- a/code/game/machinery/doors/windowdoor.dm +++ b/code/game/machinery/doors/windowdoor.dm @@ -14,7 +14,7 @@ flags_1 = ON_BORDER_1 opacity = 0 CanAtmosPass = ATMOS_PASS_PROC - var/obj/item/weapon/electronics/airlock/electronics = null + var/obj/item/electronics/airlock/electronics = null var/reinf = 0 var/shards = 2 var/rods = 2 @@ -29,7 +29,7 @@ src.icon_state = "[src.icon_state]" src.base_state = src.icon_state for(var/i in 1 to shards) - debris += new /obj/item/weapon/shard(src) + debris += new /obj/item/shard(src) if(rods) debris += new /obj/item/stack/rods(src, rods) if(cable) @@ -114,7 +114,7 @@ return 1 //used in the AStar algorithm to determinate if the turf the door is on is passable -/obj/machinery/door/window/CanAStarPass(obj/item/weapon/card/id/ID, to_dir) +/obj/machinery/door/window/CanAStarPass(obj/item/card/id/ID, to_dir) return !density || (dir != to_dir) || (check_access(ID) && hasPower()) /obj/machinery/door/window/CheckExit(atom/movable/mover as mob|obj, turf/target) @@ -215,14 +215,14 @@ desc += "
Its access panel is smoking slightly." open() -/obj/machinery/door/window/attackby(obj/item/weapon/I, mob/living/user, params) +/obj/machinery/door/window/attackby(obj/item/I, mob/living/user, params) if(operating) return add_fingerprint(user) if(!(flags_1&NODECONSTRUCT_1)) - if(istype(I, /obj/item/weapon/screwdriver)) + if(istype(I, /obj/item/screwdriver)) if(density || operating) to_chat(user, "You need to open the door to access the maintenance panel!") return @@ -231,7 +231,7 @@ to_chat(user, "You [panel_open ? "open":"close"] the maintenance panel of the [src.name].") return - if(istype(I, /obj/item/weapon/crowbar)) + if(istype(I, /obj/item/crowbar)) if(panel_open && !density && !operating) playsound(src.loc, I.usesound, 100, 1) user.visible_message("[user] removes the electronics from the [src.name].", \ @@ -264,9 +264,9 @@ to_chat(user, "You remove the airlock electronics.") - var/obj/item/weapon/electronics/airlock/ae + var/obj/item/electronics/airlock/ae if(!electronics) - ae = new/obj/item/weapon/electronics/airlock( src.loc ) + ae = new/obj/item/electronics/airlock( src.loc ) if(req_one_access) ae.one_access = 1 ae.accesses = src.req_one_access diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm index 5adc8d1da3c..08a6100ecfc 100644 --- a/code/game/machinery/doppler_array.dm +++ b/code/game/machinery/doppler_array.dm @@ -23,7 +23,7 @@ GLOBAL_LIST_EMPTY(doppler_arrays) return PROCESS_KILL /obj/machinery/doppler_array/attackby(obj/item/O, mob/user, params) - if(istype(O, /obj/item/weapon/wrench)) + if(istype(O, /obj/item/wrench)) if(!anchored && !isinspace()) anchored = TRUE power_change() diff --git a/code/game/machinery/droneDispenser.dm b/code/game/machinery/droneDispenser.dm index 4336571f561..31643fa1775 100644 --- a/code/game/machinery/droneDispenser.dm +++ b/code/game/machinery/droneDispenser.dm @@ -250,17 +250,17 @@ else to_chat(user, "The [src] isn't accepting the [sheets].") - else if(istype(O, /obj/item/weapon/crowbar)) + else if(istype(O, /obj/item/crowbar)) materials.retrieve_all() playsound(loc, O.usesound, 50, 1) to_chat(user, "You retrieve the materials from [src].") - else if(istype(O, /obj/item/weapon/weldingtool)) + else if(istype(O, /obj/item/weldingtool)) if(!(stat & BROKEN)) to_chat(user, "[src] doesn't need repairs.") return - var/obj/item/weapon/weldingtool/WT = O + var/obj/item/weldingtool/WT = O if(!WT.isOn()) return diff --git a/code/game/machinery/firealarm.dm b/code/game/machinery/firealarm.dm index 363e4de80c9..2b66b23db3a 100644 --- a/code/game/machinery/firealarm.dm +++ b/code/game/machinery/firealarm.dm @@ -1,4 +1,4 @@ -/obj/item/weapon/electronics/firealarm +/obj/item/electronics/firealarm name = "fire alarm electronics" desc = "A fire alarm circuit. Can handle heat levels up to 40 degrees celsius." @@ -145,7 +145,7 @@ /obj/machinery/firealarm/attackby(obj/item/W, mob/user, params) add_fingerprint(user) - if(istype(W, /obj/item/weapon/screwdriver) && buildstage == 2) + if(istype(W, /obj/item/screwdriver) && buildstage == 2) playsound(src.loc, W.usesound, 50, 1) panel_open = !panel_open to_chat(user, "The wires have been [panel_open ? "exposed" : "unexposed"].") @@ -154,8 +154,8 @@ if(panel_open) - if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent == INTENT_HELP) - var/obj/item/weapon/weldingtool/WT = W + if(istype(W, /obj/item/weldingtool) && user.a_intent == INTENT_HELP) + var/obj/item/weldingtool/WT = W if(obj_integrity < max_integrity) if(WT.remove_fuel(0,user)) to_chat(user, "You begin repairing [src]...") @@ -178,7 +178,7 @@ user.visible_message("[user] has disconnected [src]'s detecting unit!", "You disconnect [src]'s detecting unit.") return - else if (istype(W, /obj/item/weapon/wirecutters)) + else if (istype(W, /obj/item/wirecutters)) buildstage = 1 playsound(src.loc, W.usesound, 50, 1) new /obj/item/stack/cable_coil(user.loc, 5) @@ -197,7 +197,7 @@ update_icon() return - else if(istype(W, /obj/item/weapon/crowbar)) + else if(istype(W, /obj/item/crowbar)) playsound(src.loc, W.usesound, 50, 1) user.visible_message("[user.name] removes the electronics from [src.name].", \ "You start prying out the circuit...") @@ -208,19 +208,19 @@ stat &= ~BROKEN else to_chat(user, "You pry out the circuit.") - new /obj/item/weapon/electronics/firealarm(user.loc) + new /obj/item/electronics/firealarm(user.loc) buildstage = 0 update_icon() return if(0) - if(istype(W, /obj/item/weapon/electronics/firealarm)) + if(istype(W, /obj/item/electronics/firealarm)) to_chat(user, "You insert the circuit.") qdel(W) buildstage = 1 update_icon() return - else if(istype(W, /obj/item/weapon/wrench)) + else if(istype(W, /obj/item/wrench)) user.visible_message("[user] removes the fire alarm assembly from the wall.", \ "You remove the fire alarm assembly from the wall.") var/obj/item/wallframe/firealarm/frame = new /obj/item/wallframe/firealarm() @@ -247,7 +247,7 @@ if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 1) if(!(stat & BROKEN)) - var/obj/item/I = new /obj/item/weapon/electronics/firealarm(loc) + var/obj/item/I = new /obj/item/electronics/firealarm(loc) if(!disassembled) I.obj_integrity = I.max_integrity * 0.5 new /obj/item/stack/cable_coil(loc, 3) diff --git a/code/game/machinery/flasher.dm b/code/game/machinery/flasher.dm index 8a0b86d0348..f8186a8a511 100644 --- a/code/game/machinery/flasher.dm +++ b/code/game/machinery/flasher.dm @@ -49,9 +49,9 @@ icon_state = "[base_state]1-p" //Don't want to render prison breaks impossible -/obj/machinery/flasher/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/flasher/attackby(obj/item/W, mob/user, params) add_fingerprint(user) - if (istype(W, /obj/item/weapon/wirecutters)) + if (istype(W, /obj/item/wirecutters)) if (bulb) user.visible_message("[user] begins to disconnect [src]'s flashbulb.", "You begin to disconnect [src]'s flashbulb...") playsound(src.loc, W.usesound, 100, 1) @@ -72,7 +72,7 @@ else to_chat(user, "A flashbulb is already installed in [src]!") - else if (istype(W, /obj/item/weapon/wrench)) + else if (istype(W, /obj/item/wrench)) if(!bulb) to_chat(user, "You start unsecuring the flasher frame...") playsound(loc, W.usesound, 50, 1) @@ -164,8 +164,8 @@ if (M.m_intent != MOVE_INTENT_WALK && anchored) flash() -/obj/machinery/flasher/portable/attackby(obj/item/weapon/W, mob/user, params) - if (istype(W, /obj/item/weapon/wrench)) +/obj/machinery/flasher/portable/attackby(obj/item/W, mob/user, params) + if (istype(W, /obj/item/wrench)) playsound(src.loc, W.usesound, 100, 1) if (!anchored && !isinspace()) diff --git a/code/game/machinery/gulag_item_reclaimer.dm b/code/game/machinery/gulag_item_reclaimer.dm index d844183097a..ffa903c3e93 100644 --- a/code/game/machinery/gulag_item_reclaimer.dm +++ b/code/game/machinery/gulag_item_reclaimer.dm @@ -10,7 +10,7 @@ idle_power_usage = 100 active_power_usage = 2500 var/list/stored_items = list() - var/obj/item/weapon/card/id/prisoner/inserted_id = null + var/obj/item/card/id/prisoner/inserted_id = null var/obj/machinery/gulag_teleporter/linked_teleporter = null /obj/machinery/gulag_item_reclaimer/Destroy() @@ -31,7 +31,7 @@ emagged = TRUE /obj/machinery/gulag_item_reclaimer/attackby(obj/item/I, mob/user) - if(istype(I, /obj/item/weapon/card/id/prisoner)) + if(istype(I, /obj/item/card/id/prisoner)) if(!inserted_id) if(!user.drop_item()) return @@ -90,7 +90,7 @@ inserted_id = null else var/obj/item/I = usr.get_active_held_item() - if(istype(I, /obj/item/weapon/card/id/prisoner)) + if(istype(I, /obj/item/card/id/prisoner)) if(!usr.drop_item()) return I.forceMove(src) diff --git a/code/game/machinery/gulag_teleporter.dm b/code/game/machinery/gulag_teleporter.dm index 6970db7c123..b37c5a10a70 100644 --- a/code/game/machinery/gulag_teleporter.dm +++ b/code/game/machinery/gulag_teleporter.dm @@ -17,17 +17,17 @@ The console is located at computer/gulag_teleporter.dm use_power = IDLE_POWER_USE idle_power_usage = 200 active_power_usage = 5000 - circuit = /obj/item/weapon/circuitboard/machine/gulag_teleporter + circuit = /obj/item/circuitboard/machine/gulag_teleporter var/locked = FALSE var/jumpsuit_type = /obj/item/clothing/under/rank/prisoner var/shoes_type = /obj/item/clothing/shoes/sneakers/orange var/obj/machinery/gulag_item_reclaimer/linked_reclaimer var/static/list/telegulag_required_items = typecacheof(list( - /obj/item/weapon/implant, + /obj/item/implant, /obj/item/clothing/suit/space/eva/plasmaman, /obj/item/clothing/under/plasmaman, /obj/item/clothing/head/helmet/space/plasmaman, - /obj/item/weapon/tank/internals, + /obj/item/tank/internals, /obj/item/clothing/mask/breath, /obj/item/clothing/mask/gas)) @@ -136,7 +136,7 @@ The console is located at computer/gulag_teleporter.dm var/mob/living/mob_occupant = occupant for(var/obj/item/W in mob_occupant) if(!is_type_in_typecache(W, telegulag_required_items) && mob_occupant.temporarilyRemoveItemFromInventory(W)) - if(istype(W, /obj/item/weapon/restraints/handcuffs)) + if(istype(W, /obj/item/restraints/handcuffs)) W.forceMove(get_turf(src)) continue if(linked_reclaimer) @@ -160,15 +160,15 @@ The console is located at computer/gulag_teleporter.dm if(R) R.fields["criminal"] = "Incarcerated" -/obj/item/weapon/circuitboard/machine/gulag_teleporter +/obj/item/circuitboard/machine/gulag_teleporter name = "labor camp teleporter (Machine Board)" build_path = /obj/machinery/gulag_teleporter origin_tech = "programming=3;engineering=4;bluespace=4;materials=4" req_components = list( - /obj/item/weapon/ore/bluespace_crystal = 2, - /obj/item/weapon/stock_parts/scanning_module, - /obj/item/weapon/stock_parts/manipulator) - def_components = list(/obj/item/weapon/ore/bluespace_crystal = /obj/item/weapon/ore/bluespace_crystal/artificial) + /obj/item/ore/bluespace_crystal = 2, + /obj/item/stock_parts/scanning_module, + /obj/item/stock_parts/manipulator) + def_components = list(/obj/item/ore/bluespace_crystal = /obj/item/ore/bluespace_crystal/artificial) /* beacon that receives the teleported prisoner */ /obj/structure/gulag_beacon diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 4a0cf3a23af..f7a4138348b 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -40,7 +40,7 @@ Possible to do for anyone motivated enough: active_power_usage = 100 max_integrity = 300 armor = list(melee = 50, bullet = 20, laser = 20, energy = 20, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 0) - circuit = /obj/item/weapon/circuitboard/machine/holopad + circuit = /obj/item/circuitboard/machine/holopad var/list/masters = list()//List of living mobs that use the holopad var/last_request = 0 //to prevent request spam. ~Carn var/holo_range = 5 // Change to change how far the AI can move away from the holopad before deactivating. @@ -82,7 +82,7 @@ Possible to do for anyone motivated enough: /obj/machinery/holopad/RefreshParts() var/holograph_range = 4 - for(var/obj/item/weapon/stock_parts/capacitor/B in component_parts) + for(var/obj/item/stock_parts/capacitor/B in component_parts) holograph_range += 1 * B.rating holo_range = holograph_range diff --git a/code/game/machinery/igniter.dm b/code/game/machinery/igniter.dm index 0e450533fa6..6c3e3d9cdc5 100644 --- a/code/game/machinery/igniter.dm +++ b/code/game/machinery/igniter.dm @@ -81,8 +81,8 @@ icon_state = "[base_state]-p" // src.sd_SetLuminosity(0) -/obj/machinery/sparker/attackby(obj/item/weapon/W, mob/user, params) - if (istype(W, /obj/item/weapon/screwdriver)) +/obj/machinery/sparker/attackby(obj/item/W, mob/user, params) + if (istype(W, /obj/item/screwdriver)) add_fingerprint(user) src.disable = !src.disable if (src.disable) diff --git a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm index 45b891ce304..c5c0200493d 100644 --- a/code/game/machinery/iv_drip.dm +++ b/code/game/machinery/iv_drip.dm @@ -9,10 +9,10 @@ mouse_drag_pointer = MOUSE_ACTIVE_POINTER var/mob/living/carbon/attached = null var/mode = IV_INJECTING - var/obj/item/weapon/reagent_containers/beaker = null - var/list/drip_containers = list(/obj/item/weapon/reagent_containers/blood, - /obj/item/weapon/reagent_containers/food, - /obj/item/weapon/reagent_containers/glass) + var/obj/item/reagent_containers/beaker = null + var/list/drip_containers = list(/obj/item/reagent_containers/blood, + /obj/item/reagent_containers/food, + /obj/item/reagent_containers/glass) /obj/machinery/iv_drip/Initialize() . = ..() @@ -90,7 +90,7 @@ to_chat(usr, "There's nothing attached to the IV drip!") -/obj/machinery/iv_drip/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/iv_drip/attackby(obj/item/W, mob/user, params) if(is_type_in_typecache(W, drip_containers)) if(beaker) to_chat(user, "There is already a reagent container loaded!") @@ -127,7 +127,7 @@ if(mode) if(beaker.reagents.total_volume) var/transfer_amount = 5 - if(istype(beaker, /obj/item/weapon/reagent_containers/blood)) + if(istype(beaker, /obj/item/reagent_containers/blood)) // speed up transfer on blood packs transfer_amount = 10 var/fraction = min(transfer_amount/beaker.reagents.total_volume, 1) //the fraction that is transfered of the total volume diff --git a/code/game/machinery/iv_drip.dm.rej b/code/game/machinery/iv_drip.dm.rej index 4c8aa8206c9..490beb519f5 100644 --- a/code/game/machinery/iv_drip.dm.rej +++ b/code/game/machinery/iv_drip.dm.rej @@ -1,6 +1,6 @@ diff a/code/game/machinery/iv_drip.dm b/code/game/machinery/iv_drip.dm (rejected hunks) @@ -15,7 +15,7 @@ - /obj/item/weapon/reagent_containers/glass) + /obj/item/reagent_containers/glass) /obj/machinery/iv_drip/Initialize() - ..() diff --git a/code/game/machinery/launch_pad.dm b/code/game/machinery/launch_pad.dm index 1155dfa577a..bc61bdc3ed0 100644 --- a/code/game/machinery/launch_pad.dm +++ b/code/game/machinery/launch_pad.dm @@ -8,7 +8,7 @@ use_power = TRUE idle_power_usage = 200 active_power_usage = 2500 - circuit = /obj/item/weapon/circuitboard/machine/launchpad + circuit = /obj/item/circuitboard/machine/launchpad var/stationary = TRUE //to prevent briefcase pad deconstruction and such var/display_name = "Launchpad" var/teleport_speed = 35 @@ -20,7 +20,7 @@ /obj/machinery/launchpad/RefreshParts() var/E = -1 //to make default parts have the base value - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) E += M.rating range = initial(range) range += E diff --git a/code/game/machinery/limbgrower.dm b/code/game/machinery/limbgrower.dm index 692c7dcb263..b37be1c4c26 100644 --- a/code/game/machinery/limbgrower.dm +++ b/code/game/machinery/limbgrower.dm @@ -15,7 +15,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 100 - circuit = /obj/item/weapon/circuitboard/machine/limbgrower + circuit = /obj/item/circuitboard/machine/limbgrower var/operating = FALSE var/disabled = FALSE @@ -56,7 +56,7 @@ popup.open() /obj/machinery/limbgrower/on_deconstruction() - for(var/obj/item/weapon/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/glass/G in component_parts) reagents.trans_to(G, G.reagents.maximum_volume) ..() @@ -150,11 +150,11 @@ /obj/machinery/limbgrower/RefreshParts() reagents.maximum_volume = 0 - for(var/obj/item/weapon/reagent_containers/glass/G in component_parts) + for(var/obj/item/reagent_containers/glass/G in component_parts) reagents.maximum_volume += G.volume G.reagents.trans_to(src, G.reagents.total_volume) var/T=1.2 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) T -= M.rating*0.2 prod_coeff = min(1,max(0,T)) // Coeff going 1 -> 0,8 -> 0,6 -> 0,4 diff --git a/code/game/machinery/navbeacon.dm b/code/game/machinery/navbeacon.dm index 2b5a1f08b02..c79630a58c1 100644 --- a/code/game/machinery/navbeacon.dm +++ b/code/game/machinery/navbeacon.dm @@ -82,14 +82,14 @@ if(T.intact) return // prevent intraction when T-scanner revealed - if(istype(I, /obj/item/weapon/screwdriver)) + if(istype(I, /obj/item/screwdriver)) open = !open user.visible_message("[user] [open ? "opens" : "closes"] the beacon's cover.", "You [open ? "open" : "close"] the beacon's cover.") updateicon() - else if (istype(I, /obj/item/weapon/card/id)||istype(I, /obj/item/device/pda)) + else if (istype(I, /obj/item/card/id)||istype(I, /obj/item/device/pda)) if(open) if (src.allowed(user)) src.locked = !src.locked diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm index d1a7bbd87aa..f50ddbdf7e3 100644 --- a/code/game/machinery/newscaster.dm +++ b/code/game/machinery/newscaster.dm @@ -116,7 +116,7 @@ GLOBAL_LIST_EMPTY(allCasters) newChannel.is_admin_channel = adminChannel network_channels += newChannel -/datum/newscaster/feed_network/proc/SubmitArticle(msg, author, channel_name, obj/item/weapon/photo/photo, adminMessage = 0, allow_comments = 1) +/datum/newscaster/feed_network/proc/SubmitArticle(msg, author, channel_name, obj/item/photo/photo, adminMessage = 0, allow_comments = 1) var/datum/newscaster/feed_message/newMsg = new /datum/newscaster/feed_message newMsg.author = author newMsg.body = msg @@ -135,7 +135,7 @@ GLOBAL_LIST_EMPTY(allCasters) lastAction ++ newMsg.creationTime = lastAction -/datum/newscaster/feed_network/proc/submitWanted(criminal, body, scanned_user, obj/item/weapon/photo/photo, adminMsg = 0, newMessage = 0) +/datum/newscaster/feed_network/proc/submitWanted(criminal, body, scanned_user, obj/item/photo/photo, adminMsg = 0, newMessage = 0) wanted_issue.active = 1 wanted_issue.criminal = criminal wanted_issue.body = body @@ -186,7 +186,7 @@ GLOBAL_LIST_EMPTY(allCasters) var/alert = FALSE var/scanned_user = "Unknown" var/msg = "" - var/obj/item/weapon/photo/photo = null + var/obj/item/photo/photo = null var/channel_name = "" var/c_locked=0 var/datum/newscaster/feed_channel/viewing_channel = null @@ -711,7 +711,7 @@ GLOBAL_LIST_EMPTY(allCasters) updateUsrDialog() /obj/machinery/newscaster/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/weapon/wrench)) + if(istype(I, /obj/item/wrench)) to_chat(user, "You start [anchored ? "un" : ""]securing [name]...") playsound(loc, I.usesound, 50, 1) if(do_after(user, 60*I.toolspeed, target = src)) @@ -719,14 +719,14 @@ GLOBAL_LIST_EMPTY(allCasters) if(stat & BROKEN) to_chat(user, "The broken remains of [src] fall on the ground.") new /obj/item/stack/sheet/metal(loc, 5) - new /obj/item/weapon/shard(loc) - new /obj/item/weapon/shard(loc) + new /obj/item/shard(loc) + new /obj/item/shard(loc) else to_chat(user, "You [anchored ? "un" : ""]secure [name].") new /obj/item/wallframe/newscaster(loc) qdel(src) - else if(istype(I, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) - var/obj/item/weapon/weldingtool/WT = I + else if(istype(I, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) + var/obj/item/weldingtool/WT = I if(stat & BROKEN) if(WT.remove_fuel(0,user)) user.visible_message("[user] is repairing [src].", \ @@ -760,8 +760,8 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/deconstruct(disassembled = TRUE) if(!(flags_1 & NODECONSTRUCT_1)) new /obj/item/stack/sheet/metal(loc, 2) - new /obj/item/weapon/shard(loc) - new /obj/item/weapon/shard(loc) + new /obj/item/shard(loc) + new /obj/item/shard(loc) qdel(src) /obj/machinery/newscaster/obj_break() @@ -786,7 +786,7 @@ GLOBAL_LIST_EMPTY(allCasters) else qdel(photo) photo = null - if(istype(user.get_active_held_item(), /obj/item/weapon/photo)) + if(istype(user.get_active_held_item(), /obj/item/photo)) photo = user.get_active_held_item() if(!user.drop_item()) return @@ -813,7 +813,7 @@ GLOBAL_LIST_EMPTY(allCasters) for(var/datum/picture/t in targetcam.aipictures) nametemp += t.fields["name"] find = input("Select image (numbered in order taken)") in nametemp - var/obj/item/weapon/photo/P = new/obj/item/weapon/photo() + var/obj/item/photo/P = new/obj/item/photo() for(var/datum/picture/q in targetcam.aipictures) if(q.fields["name"] == find) selection = q @@ -833,8 +833,8 @@ GLOBAL_LIST_EMPTY(allCasters) scanned_user = "[P.id.registered_name] ([P.id.assignment])" else scanned_user = "Unknown" - else if(istype(human_user.wear_id, /obj/item/weapon/card/id) ) - var/obj/item/weapon/card/id/ID = human_user.wear_id + else if(istype(human_user.wear_id, /obj/item/card/id) ) + var/obj/item/card/id/ID = human_user.wear_id scanned_user ="[ID.registered_name] ([ID.assignment])" else scanned_user ="Unknown" @@ -849,7 +849,7 @@ GLOBAL_LIST_EMPTY(allCasters) /obj/machinery/newscaster/proc/print_paper() SSblackbox.inc("newscaster_newspapers_printed",1) - var/obj/item/weapon/newspaper/NEWSPAPER = new /obj/item/weapon/newspaper + var/obj/item/newspaper/NEWSPAPER = new /obj/item/newspaper for(var/datum/newscaster/feed_channel/FC in GLOB.news_network.network_channels) NEWSPAPER.news_content += FC if(GLOB.news_network.wanted_issue.active) @@ -876,7 +876,7 @@ GLOBAL_LIST_EMPTY(allCasters) playsound(loc, 'sound/machines/warning-buzzer.ogg', 75, 1) -/obj/item/weapon/newspaper +/obj/item/newspaper name = "newspaper" desc = "An issue of The Griffon, the newspaper circulating aboard Nanotrasen Space Stations." icon = 'icons/obj/bureaucracy.dmi' @@ -897,18 +897,18 @@ GLOBAL_LIST_EMPTY(allCasters) var/wantedPhoto var/creationTime -/obj/item/weapon/newspaper/suicide_act(mob/user) +/obj/item/newspaper/suicide_act(mob/user) user.visible_message("[user] is focusing intently on [src]! It looks like [user.p_theyre()] trying to commit sudoku... until [user.p_their()] eyes light up with realization!") user.say(";JOURNALISM IS MY CALLING! EVERYBODY APPRECIATES UNBIASED REPORTI-GLORF") var/mob/living/carbon/human/H = user - var/obj/W = new /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey(H.loc) + var/obj/W = new /obj/item/reagent_containers/food/drinks/bottle/whiskey(H.loc) playsound(H.loc, 'sound/items/drink.ogg', rand(10,50), 1) W.reagents.trans_to(H, W.reagents.total_volume) user.visible_message("[user] downs the contents of [W.name] in one gulp! Shoulda stuck to sudoku!") return(TOXLOSS) -/obj/item/weapon/newspaper/attack_self(mob/user) +/obj/item/newspaper/attack_self(mob/user) if(ishuman(user)) var/mob/living/carbon/human/human_user = user var/dat @@ -989,7 +989,7 @@ GLOBAL_LIST_EMPTY(allCasters) else to_chat(user, "The paper is full of unintelligible symbols!") -/obj/item/weapon/newspaper/proc/notContent(list/L) +/obj/item/newspaper/proc/notContent(list/L) if(!L.len) return 0 for(var/i=L.len;i>0;i--) @@ -1003,7 +1003,7 @@ GLOBAL_LIST_EMPTY(allCasters) return 0 return 0 -/obj/item/weapon/newspaper/Topic(href, href_list) +/obj/item/newspaper/Topic(href, href_list) var/mob/living/U = usr ..() if((src in U.contents) || (isturf(loc) && in_range(src, U))) @@ -1031,8 +1031,8 @@ GLOBAL_LIST_EMPTY(allCasters) if(ismob(loc)) attack_self(loc) -/obj/item/weapon/newspaper/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/pen)) +/obj/item/newspaper/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/pen)) if(scribble_page == curr_page) to_chat(user, "There's already a scribble in this page... You wouldn't want to make things too cluttered, would you?") else diff --git a/code/game/machinery/pipe/construction.dm b/code/game/machinery/pipe/construction.dm index 1216cdd1e99..4a5e32d4e85 100644 --- a/code/game/machinery/pipe/construction.dm +++ b/code/game/machinery/pipe/construction.dm @@ -205,8 +205,8 @@ GLOBAL_LIST_INIT(pipeID2State, list( /obj/item/pipe/attack_self(mob/user) return rotate() -/obj/item/pipe/attackby(obj/item/weapon/W, mob/user, params) - if (!istype(W, /obj/item/weapon/wrench)) +/obj/item/pipe/attackby(obj/item/W, mob/user, params) + if (!istype(W, /obj/item/wrench)) return ..() if (!isturf(src.loc)) return 1 @@ -267,10 +267,10 @@ GLOBAL_LIST_INIT(pipeID2State, list( item_state = "buildpipe" w_class = WEIGHT_CLASS_BULKY -/obj/item/pipe_meter/attackby(obj/item/weapon/W, mob/user, params) +/obj/item/pipe_meter/attackby(obj/item/W, mob/user, params) ..() - if (!istype(W, /obj/item/weapon/wrench)) + if (!istype(W, /obj/item/wrench)) return ..() if(!locate(/obj/machinery/atmospherics/pipe, src.loc)) to_chat(user, "You need to fasten it to a pipe!") diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm index 6721a8e0b81..456fc1d0bd4 100644 --- a/code/game/machinery/pipe/pipe_dispenser.dm +++ b/code/game/machinery/pipe/pipe_dispenser.dm @@ -73,7 +73,7 @@ return qdel(W) return - else if (istype(W, /obj/item/weapon/wrench)) + else if (istype(W, /obj/item/wrench)) if (!anchored && !isinspace()) playsound(src.loc, W.usesound, 50, 1) to_chat(user, "You begin to fasten \the [src] to the floor...") diff --git a/code/game/machinery/porta_turret/portable_turret.dm b/code/game/machinery/porta_turret/portable_turret.dm index 2e090e7c4fa..374f920aad1 100644 --- a/code/game/machinery/porta_turret/portable_turret.dm +++ b/code/game/machinery/porta_turret/portable_turret.dm @@ -35,8 +35,8 @@ var/locked = TRUE //if the turret's behaviour control access is locked var/controllock = 0 //if the turret responds to control panels - var/installation = /obj/item/weapon/gun/energy/e_gun/turret //the type of weapon installed by default - var/obj/item/weapon/gun/stored_gun = null + var/installation = /obj/item/gun/energy/e_gun/turret //the type of weapon installed by default + var/obj/item/gun/stored_gun = null var/gun_charge = 0 //the charge of the gun when retrieved from wreckage var/mode = TURRET_STUN @@ -113,7 +113,7 @@ icon_state = "[base_icon_state]_unpowered" -/obj/machinery/porta_turret/proc/setup(obj/item/weapon/gun/turret_gun) +/obj/machinery/porta_turret/proc/setup(obj/item/gun/turret_gun) if(stored_gun) qdel(stored_gun) stored_gun = null @@ -225,7 +225,7 @@ /obj/machinery/porta_turret/attackby(obj/item/I, mob/user, params) if(stat & BROKEN) - if(istype(I, /obj/item/weapon/crowbar)) + if(istype(I, /obj/item/crowbar)) //If the turret is destroyed, you can remove it with a crowbar to //try and salvage its components to_chat(user, "You begin prying the metal coverings off...") @@ -242,7 +242,7 @@ to_chat(user, "You remove the turret but did not manage to salvage anything.") qdel(src) - else if((istype(I, /obj/item/weapon/wrench)) && (!on)) + else if((istype(I, /obj/item/wrench)) && (!on)) if(raised) return @@ -455,15 +455,15 @@ return 10 if(auth_weapons) //check for weapon authorization - if(isnull(perp.wear_id) || istype(perp.wear_id.GetID(), /obj/item/weapon/card/id/syndicate)) + if(isnull(perp.wear_id) || istype(perp.wear_id.GetID(), /obj/item/card/id/syndicate)) if(allowed(perp)) //if the perp has security access, return 0 return 0 - if(perp.is_holding_item_of_type(/obj/item/weapon/gun) || perp.is_holding_item_of_type(/obj/item/weapon/melee/baton)) + if(perp.is_holding_item_of_type(/obj/item/gun) || perp.is_holding_item_of_type(/obj/item/melee/baton)) threatcount += 4 - if(istype(perp.belt, /obj/item/weapon/gun) || istype(perp.belt, /obj/item/weapon/melee/baton)) + if(istype(perp.belt, /obj/item/gun) || istype(perp.belt, /obj/item/melee/baton)) threatcount += 2 if(check_records) //if the turret can check the records, check if they are set to *Arrest* on records @@ -535,7 +535,7 @@ /obj/machinery/porta_turret/stationary //is this even used anywhere mode = TURRET_LETHAL emagged = TRUE - installation = /obj/item/weapon/gun/energy/laser + installation = /obj/item/gun/energy/laser /obj/machinery/porta_turret/syndicate installation = null @@ -797,7 +797,7 @@ result_path = /obj/machinery/turretid materials = list(MAT_METAL=MINERAL_MATERIAL_AMOUNT) -/obj/item/weapon/gun/proc/get_turret_properties() +/obj/item/gun/proc/get_turret_properties() . = list() .["lethal_projectile"] = null .["lethal_projectile_sound"] = null @@ -805,7 +805,7 @@ .["stun_projectile_sound"] = null .["base_icon_state"] = "standard" -/obj/item/weapon/gun/energy/get_turret_properties() +/obj/item/gun/energy/get_turret_properties() . = ..() var/obj/item/ammo_casing/primary_ammo = ammo_type[1] @@ -821,7 +821,7 @@ .["lethal_projectile"] = .["stun_projectile"] .["lethal_projectile_sound"] = .["stun_projectile_sound"] -/obj/item/weapon/gun/ballistic/get_turret_properties() +/obj/item/gun/ballistic/get_turret_properties() . = ..() var/obj/item/ammo_box/mag = mag_type var/obj/item/ammo_casing/primary_ammo = initial(mag.ammo_type) @@ -833,7 +833,7 @@ .["lethal_projectile_sound"] = .["stun_projectile_sound"] -/obj/item/weapon/gun/energy/laser/bluetag/get_turret_properties() +/obj/item/gun/energy/laser/bluetag/get_turret_properties() . = ..() .["stun_projectile"] = /obj/item/projectile/beam/lasertag/bluetag .["lethal_projectile"] = /obj/item/projectile/beam/lasertag/bluetag @@ -841,7 +841,7 @@ .["shot_delay"] = 30 .["team_color"] = "blue" -/obj/item/weapon/gun/energy/laser/redtag/get_turret_properties() +/obj/item/gun/energy/laser/redtag/get_turret_properties() . = ..() .["stun_projectile"] = /obj/item/projectile/beam/lasertag/redtag .["lethal_projectile"] = /obj/item/projectile/beam/lasertag/redtag @@ -849,7 +849,7 @@ .["shot_delay"] = 30 .["team_color"] = "red" -/obj/item/weapon/gun/energy/e_gun/turret/get_turret_properties() +/obj/item/gun/energy/e_gun/turret/get_turret_properties() . = ..() /obj/machinery/porta_turret/lasertag @@ -867,21 +867,21 @@ . = 0 //But does not target anyone else if(istype(perp.wear_suit, /obj/item/clothing/suit/redtag)) . += 4 - if(perp.is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/redtag)) + if(perp.is_holding_item_of_type(/obj/item/gun/energy/laser/redtag)) . += 4 - if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/redtag)) + if(istype(perp.belt, /obj/item/gun/energy/laser/redtag)) . += 2 if(team_color == "red") . = 0 if(istype(perp.wear_suit, /obj/item/clothing/suit/bluetag)) . += 4 - if(perp.is_holding_item_of_type(/obj/item/weapon/gun/energy/laser/bluetag)) + if(perp.is_holding_item_of_type(/obj/item/gun/energy/laser/bluetag)) . += 4 - if(istype(perp.belt, /obj/item/weapon/gun/energy/laser/bluetag)) + if(istype(perp.belt, /obj/item/gun/energy/laser/bluetag)) . += 2 -/obj/machinery/porta_turret/lasertag/setup(obj/item/weapon/gun/gun) +/obj/machinery/porta_turret/lasertag/setup(obj/item/gun/gun) var/list/properties = ..() if(properties["team_color"]) team_color = properties["team_color"] @@ -902,11 +902,11 @@ //lasertag presets /obj/machinery/porta_turret/lasertag/red - installation = /obj/item/weapon/gun/energy/laser/redtag + installation = /obj/item/gun/energy/laser/redtag team_color = "red" /obj/machinery/porta_turret/lasertag/blue - installation = /obj/item/weapon/gun/energy/laser/bluetag + installation = /obj/item/gun/energy/laser/bluetag team_color = "blue" /obj/machinery/porta_turret/lasertag/bullet_act(obj/item/projectile/P) diff --git a/code/game/machinery/porta_turret/portable_turret_construct.dm b/code/game/machinery/porta_turret/portable_turret_construct.dm index 08909030cac..1dbdc52b1e7 100644 --- a/code/game/machinery/porta_turret/portable_turret_construct.dm +++ b/code/game/machinery/porta_turret/portable_turret_construct.dm @@ -15,20 +15,20 @@ density = TRUE var/build_step = PTURRET_UNSECURED //the current step in the building process var/finish_name = "turret" //the name applied to the product turret - var/obj/item/weapon/gun/installed_gun = null + var/obj/item/gun/installed_gun = null /obj/machinery/porta_turret_construct/attackby(obj/item/I, mob/user, params) //this is a bit unwieldy but self-explanatory switch(build_step) if(PTURRET_UNSECURED) //first step - if(istype(I, /obj/item/weapon/wrench) && !anchored) + if(istype(I, /obj/item/wrench) && !anchored) playsound(loc, I.usesound, 100, 1) to_chat(user, "You secure the external bolts.") anchored = TRUE build_step = PTURRET_BOLTED return - else if(istype(I, /obj/item/weapon/crowbar) && !anchored) + else if(istype(I, /obj/item/crowbar) && !anchored) playsound(loc, I.usesound, 75, 1) to_chat(user, "You dismantle the turret construction.") new /obj/item/stack/sheet/metal( loc, 5) @@ -46,7 +46,7 @@ to_chat(user, "You need two sheets of metal to continue construction!") return - else if(istype(I, /obj/item/weapon/wrench)) + else if(istype(I, /obj/item/wrench)) playsound(loc, I.usesound, 75, 1) to_chat(user, "You unfasten the external bolts.") anchored = FALSE @@ -55,14 +55,14 @@ if(PTURRET_START_INTERNAL_ARMOUR) - if(istype(I, /obj/item/weapon/wrench)) + if(istype(I, /obj/item/wrench)) playsound(loc, I.usesound, 100, 1) to_chat(user, "You bolt the metal armor into place.") build_step = PTURRET_INTERNAL_ARMOUR_ON return - else if(istype(I, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = I + else if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. @@ -81,8 +81,8 @@ if(PTURRET_INTERNAL_ARMOUR_ON) - if(istype(I, /obj/item/weapon/gun/energy)) //the gun installation part - var/obj/item/weapon/gun/energy/E = I + if(istype(I, /obj/item/gun/energy)) //the gun installation part + var/obj/item/gun/energy/E = I if(!user.drop_item()) return E.forceMove(src) @@ -91,7 +91,7 @@ build_step = PTURRET_GUN_EQUIPPED return - else if(istype(I, /obj/item/weapon/wrench)) + else if(istype(I, /obj/item/wrench)) playsound(loc, I.usesound, 100, 1) to_chat(user, "You remove the turret's metal armor bolts.") build_step = PTURRET_START_INTERNAL_ARMOUR @@ -108,7 +108,7 @@ if(PTURRET_SENSORS_ON) - if(istype(I, /obj/item/weapon/screwdriver)) + if(istype(I, /obj/item/screwdriver)) playsound(loc, I.usesound, 100, 1) build_step = PTURRET_CLOSED to_chat(user, "You close the internal access hatch.") @@ -125,15 +125,15 @@ to_chat(user, "You need two sheets of metal to continue construction!") return - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(istype(I, /obj/item/screwdriver)) playsound(loc, I.usesound, 100, 1) build_step = PTURRET_SENSORS_ON to_chat(user, "You open the internal access hatch.") return if(PTURRET_START_EXTERNAL_ARMOUR) - if(istype(I, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/WT = I + if(istype(I, /obj/item/weldingtool)) + var/obj/item/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) @@ -151,7 +151,7 @@ var/obj/machinery/porta_turret/turret //fuck lasertag turrets - if(istype(installed_gun, /obj/item/weapon/gun/energy/laser/bluetag) || istype(installed_gun, /obj/item/weapon/gun/energy/laser/redtag)) + if(istype(installed_gun, /obj/item/gun/energy/laser/bluetag) || istype(installed_gun, /obj/item/gun/energy/laser/redtag)) turret = new/obj/machinery/porta_turret/lasertag(loc) else turret = new/obj/machinery/porta_turret(loc) @@ -160,14 +160,14 @@ turret.setup(installed_gun) qdel(src) - else if(istype(I, /obj/item/weapon/crowbar)) + else if(istype(I, /obj/item/crowbar)) playsound(loc, I.usesound, 75, 1) to_chat(user, "You pry off the turret's exterior armor.") new /obj/item/stack/sheet/metal(loc, 2) build_step = PTURRET_CLOSED return - if(istype(I, /obj/item/weapon/pen)) //you can rename turrets like bots! + if(istype(I, /obj/item/pen)) //you can rename turrets like bots! var/t = stripped_input(user, "Enter new turret name", name, finish_name) if(!t) return diff --git a/code/game/machinery/porta_turret/portable_turret_cover.dm b/code/game/machinery/porta_turret/portable_turret_cover.dm index 27575e94cb7..7bc381c466c 100644 --- a/code/game/machinery/porta_turret/portable_turret_cover.dm +++ b/code/game/machinery/porta_turret/portable_turret_cover.dm @@ -41,7 +41,7 @@ /obj/machinery/porta_turret_cover/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/wrench) && !parent_turret.on) + if(istype(I, /obj/item/wrench) && !parent_turret.on) if(parent_turret.raised) return diff --git a/code/game/machinery/quantum_pad.dm b/code/game/machinery/quantum_pad.dm index f0d793732bc..4292f5b08a1 100644 --- a/code/game/machinery/quantum_pad.dm +++ b/code/game/machinery/quantum_pad.dm @@ -8,7 +8,7 @@ idle_power_usage = 200 active_power_usage = 5000 unique_rename = 1 - circuit = /obj/item/weapon/circuitboard/machine/quantumpad + circuit = /obj/item/circuitboard/machine/quantumpad var/teleport_cooldown = 400 //30 seconds base due to base parts var/teleport_speed = 50 var/last_teleport //to handle the cooldown @@ -18,11 +18,11 @@ /obj/machinery/quantumpad/RefreshParts() var/E = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating power_efficiency = E E = 0 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) E += M.rating teleport_speed = initial(teleport_speed) teleport_speed -= (E*10) @@ -137,6 +137,6 @@ do_teleport(ROI, get_turf(linked_pad)) -/obj/item/weapon/paper/guides/quantumpad +/obj/item/paper/guides/quantumpad name = "Quantum Pad For Dummies" info = "
Dummies Guide To Quantum Pads


Do you hate the concept of having to use your legs, let alone walk to places? Well, with the Quantum Pad (tm), never again will the fear of cardio keep you from going places!

How to set up your Quantum Pad(tm)


1.Unscrew the Quantum Pad(tm) you wish to link.
2. Use your multi-tool to cache the buffer of the Quantum Pad(tm) you wish to link.
3. Apply the multi-tool to the secondary Quantum Pad(tm) you wish to link to the first Quantum Pad(tm)

If you followed these instructions carefully, your Quantum Pad(tm) should now be properly linked together for near-instant movement across the station! Bear in mind that this is technically a one-way teleport, so you'll need to do the same process with the secondary pad to the first one if you wish to travel between both.
" diff --git a/code/game/machinery/recharger.dm b/code/game/machinery/recharger.dm index 72b03bc7b54..4a72fa90c6d 100755 --- a/code/game/machinery/recharger.dm +++ b/code/game/machinery/recharger.dm @@ -7,21 +7,21 @@ use_power = IDLE_POWER_USE idle_power_usage = 4 active_power_usage = 250 - circuit = /obj/item/weapon/circuitboard/machine/recharger + circuit = /obj/item/circuitboard/machine/recharger var/obj/item/charging = null var/recharge_coeff = 1 var/static/list/allowed_devices = typecacheof(list( - /obj/item/weapon/gun/energy, - /obj/item/weapon/melee/baton, + /obj/item/gun/energy, + /obj/item/melee/baton, /obj/item/ammo_box/magazine/recharge, /obj/item/device/modular_computer)) /obj/machinery/recharger/RefreshParts() - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) recharge_coeff = C.rating -/obj/machinery/recharger/attackby(obj/item/weapon/G, mob/user, params) - if(istype(G, /obj/item/weapon/wrench)) +/obj/machinery/recharger/attackby(obj/item/G, mob/user, params) + if(istype(G, /obj/item/wrench)) if(charging) to_chat(user, "Remove the charging item first!") return @@ -44,8 +44,8 @@ to_chat(user, "[src] blinks red as you try to insert [G].") return 1 - if (istype(G, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/E = G + if (istype(G, /obj/item/gun/energy)) + var/obj/item/gun/energy/E = G if(!E.can_charge) to_chat(user, "Your gun has no external power connector.") return 1 @@ -64,7 +64,7 @@ if(default_deconstruction_screwdriver(user, "rechargeropen", "recharger0", G)) return - if(panel_open && istype(G, /obj/item/weapon/crowbar)) + if(panel_open && istype(G, /obj/item/crowbar)) default_deconstruction_crowbar(G) return @@ -102,15 +102,15 @@ var/using_power = 0 if(charging) - var/obj/item/weapon/stock_parts/cell/C = charging.get_cell() + var/obj/item/stock_parts/cell/C = charging.get_cell() if(C) if(C.charge < C.maxcharge) C.give(C.chargerate * recharge_coeff) use_power(250 * recharge_coeff) using_power = 1 update_icon(using_power) - if(istype(charging, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/E = charging + if(istype(charging, /obj/item/gun/energy)) + var/obj/item/gun/energy/E = charging E.recharge_newshot() return if(istype(charging, /obj/item/ammo_box/magazine/recharge)) @@ -128,13 +128,13 @@ /obj/machinery/recharger/emp_act(severity) if(!(stat & (NOPOWER|BROKEN)) && anchored) - if(istype(charging, /obj/item/weapon/gun/energy)) - var/obj/item/weapon/gun/energy/E = charging + if(istype(charging, /obj/item/gun/energy)) + var/obj/item/gun/energy/E = charging if(E.cell) E.cell.emp_act(severity) - else if(istype(charging, /obj/item/weapon/melee/baton)) - var/obj/item/weapon/melee/baton/B = charging + else if(istype(charging, /obj/item/melee/baton)) + var/obj/item/melee/baton/B = charging if(B.cell) B.cell.charge = 0 ..() diff --git a/code/game/machinery/rechargestation.dm b/code/game/machinery/rechargestation.dm index 8d69d6a37d3..0fd04f63d52 100644 --- a/code/game/machinery/rechargestation.dm +++ b/code/game/machinery/rechargestation.dm @@ -9,7 +9,7 @@ active_power_usage = 1000 req_access = list(ACCESS_ROBOTICS) state_open = TRUE - circuit = /obj/item/weapon/circuitboard/machine/cyborgrecharger + circuit = /obj/item/circuitboard/machine/cyborgrecharger var/recharge_speed var/repairs @@ -20,11 +20,11 @@ /obj/machinery/recharge_station/RefreshParts() recharge_speed = 0 repairs = 0 - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) recharge_speed += C.rating * 100 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) repairs += M.rating - 1 - for(var/obj/item/weapon/stock_parts/cell/C in component_parts) + for(var/obj/item/stock_parts/cell/C in component_parts) recharge_speed *= C.maxcharge / 10000 /obj/machinery/recharge_station/process() diff --git a/code/game/machinery/recycler.dm b/code/game/machinery/recycler.dm index e3d01280064..b4bee2bdae4 100644 --- a/code/game/machinery/recycler.dm +++ b/code/game/machinery/recycler.dm @@ -8,7 +8,7 @@ layer = ABOVE_ALL_MOB_LAYER // Overhead anchored = TRUE density = TRUE - circuit = /obj/item/weapon/circuitboard/machine/recycler + circuit = /obj/item/circuitboard/machine/recycler var/safety_mode = FALSE // Temporarily stops machine if it detects a mob var/icon_name = "grinder-o" var/blood = 0 @@ -27,10 +27,10 @@ /obj/machinery/recycler/RefreshParts() var/amt_made = 0 var/mat_mod = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/B in component_parts) + for(var/obj/item/stock_parts/matter_bin/B in component_parts) mat_mod = 2 * B.rating mat_mod *= 50000 - for(var/obj/item/weapon/stock_parts/manipulator/M in component_parts) + for(var/obj/item/stock_parts/manipulator/M in component_parts) amt_made = 12.5 * M.rating //% of materials salvaged materials.max_amount = mat_mod amount_produced = min(50, amt_made) + 50 @@ -189,7 +189,7 @@ crush_damage = 120 flags_1 = NODECONSTRUCT_1 -/obj/item/weapon/paper/guides/recycler +/obj/item/paper/guides/recycler name = "paper - 'garbage duty instructions'" info = "

New Assignment

You have been assigned to collect garbage from trash bins, located around the station. The crewmembers will put their trash into it and you will collect the said trash.

There is a recycling machine near your closet, inside maintenance; use it to recycle the trash for a small chance to get useful minerals. Then deliver these minerals to cargo or engineering. You are our last hope for a clean station, do not screw this up!" diff --git a/code/game/machinery/requests_console.dm b/code/game/machinery/requests_console.dm index efcf10dcb6c..872194ee67f 100644 --- a/code/game/machinery/requests_console.dm +++ b/code/game/machinery/requests_console.dm @@ -486,8 +486,8 @@ GLOBAL_LIST_EMPTY(allConsoles) say(title) src.messages += "From: [linkedsender]
[message]" -/obj/machinery/requests_console/attackby(obj/item/weapon/O, mob/user, params) - if(istype(O, /obj/item/weapon/crowbar)) +/obj/machinery/requests_console/attackby(obj/item/O, mob/user, params) + if(istype(O, /obj/item/crowbar)) if(open) to_chat(user, "You close the maintenance panel.") open = FALSE @@ -496,7 +496,7 @@ GLOBAL_LIST_EMPTY(allConsoles) open = TRUE update_icon() return - if(istype(O, /obj/item/weapon/screwdriver)) + if(istype(O, /obj/item/screwdriver)) if(open) hackState = !hackState if(hackState) @@ -508,7 +508,7 @@ GLOBAL_LIST_EMPTY(allConsoles) to_chat(user, "You must open the maintenance panel first!") return - var/obj/item/weapon/card/id/ID = O.GetID() + var/obj/item/card/id/ID = O.GetID() if(ID) if(screen == 9) msgVerified = "Verified by [ID.registered_name] ([ID.assignment])" @@ -521,9 +521,9 @@ GLOBAL_LIST_EMPTY(allConsoles) to_chat(user, "You are not authorized to send announcements!") updateUsrDialog() return - if (istype(O, /obj/item/weapon/stamp)) + if (istype(O, /obj/item/stamp)) if(screen == 9) - var/obj/item/weapon/stamp/T = O + var/obj/item/stamp/T = O msgStamped = "Stamped with the [T.name]" updateUsrDialog() return diff --git a/code/game/machinery/shieldgen.dm b/code/game/machinery/shieldgen.dm index 4079db2018a..7c6666b3a93 100644 --- a/code/game/machinery/shieldgen.dm +++ b/code/game/machinery/shieldgen.dm @@ -140,8 +140,8 @@ to_chat(user, "The device must first be secured to the floor!") return -/obj/machinery/shieldgen/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/screwdriver)) +/obj/machinery/shieldgen/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/screwdriver)) playsound(src.loc, W.usesound, 100, 1) panel_open = !panel_open if(panel_open) @@ -163,7 +163,7 @@ to_chat(user, "You repair \the [src].") update_icon() - else if(istype(W, /obj/item/weapon/wrench)) + else if(istype(W, /obj/item/wrench)) if(locked) to_chat(user, "The bolts are covered! Unlocking this would retract the covers.") return @@ -333,7 +333,7 @@ return ..() /obj/machinery/shieldwallgen/attackby(obj/item/W, mob/user, params) - if(istype(W, /obj/item/weapon/wrench)) + if(istype(W, /obj/item/wrench)) default_unfasten_wrench(user, W, 0) else if(W.GetID()) diff --git a/code/game/machinery/slotmachine.dm b/code/game/machinery/slotmachine.dm index 71036c735f5..957f533a293 100644 --- a/code/game/machinery/slotmachine.dm +++ b/code/game/machinery/slotmachine.dm @@ -21,7 +21,7 @@ density = TRUE use_power = IDLE_POWER_USE idle_power_usage = 50 - circuit = /obj/item/weapon/circuitboard/computer/slot_machine + circuit = /obj/item/circuitboard/computer/slot_machine var/money = 3000 //How much money it has CONSUMED var/plays = 0 var/working = 0 @@ -46,8 +46,8 @@ toggle_reel_spin(0) - for(var/cointype in typesof(/obj/item/weapon/coin)) - var/obj/item/weapon/coin/C = cointype + for(var/cointype in typesof(/obj/item/coin)) + var/obj/item/coin/C = cointype coinvalues["[cointype]"] = initial(C.value) /obj/machinery/computer/slot_machine/Destroy() @@ -80,8 +80,8 @@ update_icon() /obj/machinery/computer/slot_machine/attackby(obj/item/I, mob/living/user, params) - if(istype(I, /obj/item/weapon/coin)) - var/obj/item/weapon/coin/C = I + if(istype(I, /obj/item/coin)) + var/obj/item/coin/C = I if(prob(2)) if(!user.drop_item()) return @@ -241,8 +241,8 @@ money = 0 for(var/i = 0, i < 5, i++) - var/cointype = pick(subtypesof(/obj/item/weapon/coin)) - var/obj/item/weapon/coin/C = new cointype(loc) + var/cointype = pick(subtypesof(/obj/item/coin)) + var/obj/item/coin/C = new cointype(loc) random_step(C, 2, 50) else if(linelength == 5) @@ -287,7 +287,7 @@ balance += surplus /obj/machinery/computer/slot_machine/proc/give_coins(amount) - var/cointype = emagged ? /obj/item/weapon/coin/iron : /obj/item/weapon/coin/silver + var/cointype = emagged ? /obj/item/coin/iron : /obj/item/coin/silver if(!emagged) amount = dispense(amount, cointype, null, 0) @@ -299,12 +299,12 @@ return amount -/obj/machinery/computer/slot_machine/proc/dispense(amount = 0, cointype = /obj/item/weapon/coin/silver, mob/living/target, throwit = 0) +/obj/machinery/computer/slot_machine/proc/dispense(amount = 0, cointype = /obj/item/coin/silver, mob/living/target, throwit = 0) var/value = coinvalues["[cointype]"] while(amount >= value) - var/obj/item/weapon/coin/C = new cointype(loc) //DOUBLE THE PAIN + var/obj/item/coin/C = new cointype(loc) //DOUBLE THE PAIN amount -= value if(throwit && target) C.throw_at(target, 3, 10) diff --git a/code/game/machinery/spaceheater.dm b/code/game/machinery/spaceheater.dm index 033310e55de..886798156e4 100644 --- a/code/game/machinery/spaceheater.dm +++ b/code/game/machinery/spaceheater.dm @@ -12,8 +12,8 @@ desc = "Made by Space Amish using traditional space techniques, this heater/cooler is guaranteed not to set the station on fire." max_integrity = 250 armor = list(melee = 0, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 100, rad = 100, fire = 80, acid = 10) - circuit = /obj/item/weapon/circuitboard/machine/space_heater - var/obj/item/weapon/stock_parts/cell/cell + circuit = /obj/item/circuitboard/machine/space_heater + var/obj/item/stock_parts/cell/cell var/on = FALSE var/mode = HEATER_MODE_STANDBY var/setMode = "auto" // Anything other than "heat" or "cool" is considered auto. @@ -111,9 +111,9 @@ /obj/machinery/space_heater/RefreshParts() var/laser = 0 var/cap = 0 - for(var/obj/item/weapon/stock_parts/micro_laser/M in component_parts) + for(var/obj/item/stock_parts/micro_laser/M in component_parts) laser += M.rating - for(var/obj/item/weapon/stock_parts/capacitor/M in component_parts) + for(var/obj/item/stock_parts/capacitor/M in component_parts) cap += M.rating heatingPower = laser * 40000 @@ -135,14 +135,14 @@ /obj/machinery/space_heater/attackby(obj/item/I, mob/user, params) add_fingerprint(user) - if(istype(I, /obj/item/weapon/stock_parts/cell)) + if(istype(I, /obj/item/stock_parts/cell)) if(panel_open) if(cell) to_chat(user, "There is already a power cell inside!") return else // insert cell - var/obj/item/weapon/stock_parts/cell/C = usr.get_active_held_item() + var/obj/item/stock_parts/cell/C = usr.get_active_held_item() if(istype(C)) if(!user.drop_item()) return @@ -155,7 +155,7 @@ else to_chat(user, "The hatch must be open to insert a power cell!") return - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(istype(I, /obj/item/screwdriver)) panel_open = !panel_open user.visible_message("\The [user] [panel_open ? "opens" : "closes"] the hatch on \the [src].", "You [panel_open ? "open" : "close"] the hatch on \the [src].") update_icon() diff --git a/code/game/machinery/suit_storage_unit.dm b/code/game/machinery/suit_storage_unit.dm index f625de8c5ca..cd2a5bd3b5f 100644 --- a/code/game/machinery/suit_storage_unit.dm +++ b/code/game/machinery/suit_storage_unit.dm @@ -35,7 +35,7 @@ /obj/machinery/suit_storage_unit/captain suit_type = /obj/item/clothing/suit/space/hardsuit/captain mask_type = /obj/item/clothing/mask/gas/sechailer - storage_type = /obj/item/weapon/tank/jetpack/oxygen/captain + storage_type = /obj/item/tank/jetpack/oxygen/captain /obj/machinery/suit_storage_unit/engine suit_type = /obj/item/clothing/suit/space/hardsuit/engine @@ -53,12 +53,12 @@ /obj/machinery/suit_storage_unit/hos suit_type = /obj/item/clothing/suit/space/hardsuit/security/hos mask_type = /obj/item/clothing/mask/gas/sechailer - storage_type = /obj/item/weapon/tank/internals/oxygen + storage_type = /obj/item/tank/internals/oxygen /obj/machinery/suit_storage_unit/atmos suit_type = /obj/item/clothing/suit/space/hardsuit/engine/atmos mask_type = /obj/item/clothing/mask/gas - storage_type = /obj/item/weapon/watertank/atmos + storage_type = /obj/item/watertank/atmos /obj/machinery/suit_storage_unit/mining suit_type = /obj/item/clothing/suit/hooded/explorer @@ -79,27 +79,27 @@ /obj/machinery/suit_storage_unit/syndicate suit_type = /obj/item/clothing/suit/space/hardsuit/syndi mask_type = /obj/item/clothing/mask/gas/syndicate - storage_type = /obj/item/weapon/tank/jetpack/oxygen/harness + storage_type = /obj/item/tank/jetpack/oxygen/harness /obj/machinery/suit_storage_unit/ert/command suit_type = /obj/item/clothing/suit/space/hardsuit/ert mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/security suit_type = /obj/item/clothing/suit/space/hardsuit/ert/sec mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/engineer suit_type = /obj/item/clothing/suit/space/hardsuit/ert/engi mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/ert/medical suit_type = /obj/item/clothing/suit/space/hardsuit/ert/med mask_type = /obj/item/clothing/mask/breath - storage_type = /obj/item/weapon/tank/internals/emergency_oxygen/double + storage_type = /obj/item/tank/internals/emergency_oxygen/double /obj/machinery/suit_storage_unit/Initialize() . = ..() diff --git a/code/game/machinery/syndicatebeacon.dm b/code/game/machinery/syndicatebeacon.dm index 15ed4281b80..a8ddc6710ef 100644 --- a/code/game/machinery/syndicatebeacon.dm +++ b/code/game/machinery/syndicatebeacon.dm @@ -53,8 +53,8 @@ return -/obj/machinery/power/singularity_beacon/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/screwdriver)) +/obj/machinery/power/singularity_beacon/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/screwdriver)) if(active) to_chat(user, "You need to deactivate the beacon first!") return diff --git a/code/game/machinery/syndicatebomb.dm b/code/game/machinery/syndicatebomb.dm index 4e96eb661d9..efb872b7664 100644 --- a/code/game/machinery/syndicatebomb.dm +++ b/code/game/machinery/syndicatebomb.dm @@ -21,7 +21,7 @@ var/open_panel = FALSE //are the wires exposed? var/active = FALSE //is the bomb counting down? var/defused = FALSE //is the bomb capable of exploding? - var/obj/item/weapon/bombcore/payload = /obj/item/weapon/bombcore + var/obj/item/bombcore/payload = /obj/item/bombcore var/beepsound = 'sound/items/timer.ogg' var/delayedbig = FALSE //delay wire pulsed? var/delayedlittle = FALSE //activation wire pulsed? @@ -110,7 +110,7 @@ . = timer_set /obj/machinery/syndicatebomb/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/wrench) && can_unanchor) + if(istype(I, /obj/item/wrench) && can_unanchor) if(!anchored) if(!isturf(loc) || isspaceturf(loc)) to_chat(user, "The bomb must be placed on solid ground to attach it.") @@ -128,7 +128,7 @@ else to_chat(user, "The bolts are locked down!") - else if(istype(I, /obj/item/weapon/screwdriver)) + else if(istype(I, /obj/item/screwdriver)) open_panel = !open_panel update_icon() to_chat(user, "You [open_panel ? "open" : "close"] the wire panel.") @@ -136,7 +136,7 @@ else if(is_wire_tool(I) && open_panel) wires.interact(user) - else if(istype(I, /obj/item/weapon/crowbar)) + else if(istype(I, /obj/item/crowbar)) if(open_panel && wires.is_all_cut()) if(payload) to_chat(user, "You carefully pry out [payload].") @@ -148,7 +148,7 @@ to_chat(user, "The wires connecting the shell to the explosives are holding it down!") else to_chat(user, "The cover is screwed on, it won't pry off!") - else if(istype(I, /obj/item/weapon/bombcore)) + else if(istype(I, /obj/item/bombcore)) if(!payload) if(!user.drop_item()) return @@ -157,10 +157,10 @@ payload.loc = src else to_chat(user, "[payload] is already loaded into [src]! You'll have to remove it first.") - else if(istype(I, /obj/item/weapon/weldingtool)) + else if(istype(I, /obj/item/weldingtool)) if(payload || !wires.is_all_cut() || !open_panel) return - var/obj/item/weapon/weldingtool/WT = I + var/obj/item/weldingtool/WT = I if(!WT.isOn()) return if(WT.get_fuel() < 5) //uses up 5 fuel. @@ -221,7 +221,7 @@ var/turf/bombturf = get_turf(src) var/area/A = get_area(bombturf) - if(payload && !istype(payload, /obj/item/weapon/bombcore/training)) + if(payload && !istype(payload, /obj/item/bombcore/training)) message_admins("[ADMIN_LOOKUPFLW(user)] has primed a [name] ([payload]) for detonation at [A.name] [ADMIN_JMP(bombturf)].") log_game("[key_name(user)] has primed a [name] ([payload]) for detonation at [A.name][COORD(bombturf)]") payload.adminlog = "The [src.name] that [key_name(user)] had primed detonated!" @@ -232,18 +232,18 @@ name = "training bomb" icon_state = "training-bomb" desc = "A salvaged syndicate device gutted of its explosives to be used as a training aid for aspiring bomb defusers." - payload = /obj/item/weapon/bombcore/training + payload = /obj/item/bombcore/training /obj/machinery/syndicatebomb/badmin name = "generic summoning badmin bomb" desc = "Oh god what is in this thing?" - payload = /obj/item/weapon/bombcore/badmin/summon + payload = /obj/item/bombcore/badmin/summon /obj/machinery/syndicatebomb/badmin/clown name = "clown bomb" icon_state = "clown-bomb" desc = "HONK." - payload = /obj/item/weapon/bombcore/badmin/summon/clown + payload = /obj/item/bombcore/badmin/summon/clown beepsound = 'sound/items/bikehorn.ogg' /obj/machinery/syndicatebomb/empty @@ -261,12 +261,12 @@ /obj/machinery/syndicatebomb/self_destruct name = "self destruct device" desc = "Do not taunt. Warranty invalid if exposed to high temperature. Not suitable for agents under 3 years of age." - payload = /obj/item/weapon/bombcore/large + payload = /obj/item/bombcore/large can_unanchor = FALSE ///Bomb Cores/// -/obj/item/weapon/bombcore +/obj/item/bombcore name = "bomb payload" desc = "A powerful secondary explosive of syndicate design and unknown composition, it should be stable under normal conditions..." icon = 'icons/obj/assemblies.dmi' @@ -283,15 +283,15 @@ var/range_light = 17 var/range_flame = 17 -/obj/item/weapon/bombcore/ex_act(severity, target) // Little boom can chain a big boom. +/obj/item/bombcore/ex_act(severity, target) // Little boom can chain a big boom. detonate() -/obj/item/weapon/bombcore/burn() +/obj/item/bombcore/burn() detonate() ..() -/obj/item/weapon/bombcore/proc/detonate() +/obj/item/bombcore/proc/detonate() if(adminlog) message_admins(adminlog) log_game(adminlog) @@ -300,20 +300,20 @@ qdel(loc) qdel(src) -/obj/item/weapon/bombcore/proc/defuse() +/obj/item/bombcore/proc/defuse() //Note: Because of how var/defused is used you shouldn't override this UNLESS you intend to set the var to 0 or // otherwise remove the core/reset the wires before the end of defuse(). It will repeatedly be called otherwise. ///Bomb Core Subtypes/// -/obj/item/weapon/bombcore/training +/obj/item/bombcore/training name = "dummy payload" desc = "A nanotrasen replica of a syndicate payload. Its not intended to explode but to announce that it WOULD have exploded, then rewire itself to allow for more training." origin_tech = null var/defusals = 0 var/attempts = 0 -/obj/item/weapon/bombcore/training/proc/reset() +/obj/item/bombcore/training/proc/reset() var/obj/machinery/syndicatebomb/holder = loc if(istype(holder)) if(holder.wires) @@ -326,7 +326,7 @@ holder.update_icon() holder.updateDialog() -/obj/item/weapon/bombcore/training/detonate() +/obj/item/bombcore/training/detonate() var/obj/machinery/syndicatebomb/holder = loc if(istype(holder)) attempts++ @@ -335,7 +335,7 @@ else qdel(src) -/obj/item/weapon/bombcore/training/defuse() +/obj/item/bombcore/training/defuse() var/obj/machinery/syndicatebomb/holder = loc if(istype(holder)) attempts++ @@ -345,45 +345,45 @@ if(istype(holder)) reset() -/obj/item/weapon/bombcore/badmin +/obj/item/bombcore/badmin name = "badmin payload" desc = "If you're seeing this someone has either made a mistake or gotten dangerously savvy with var editing!" origin_tech = null -/obj/item/weapon/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players +/obj/item/bombcore/badmin/defuse() //because we wouldn't want them being harvested by players var/obj/machinery/syndicatebomb/B = loc qdel(B) qdel(src) -/obj/item/weapon/bombcore/badmin/summon - var/summon_path = /obj/item/weapon/reagent_containers/food/snacks/cookie +/obj/item/bombcore/badmin/summon + var/summon_path = /obj/item/reagent_containers/food/snacks/cookie var/amt_summon = 1 -/obj/item/weapon/bombcore/badmin/summon/detonate() +/obj/item/bombcore/badmin/summon/detonate() var/obj/machinery/syndicatebomb/B = src.loc spawn_and_random_walk(summon_path, src, amt_summon, walk_chance=50, admin_spawn=TRUE) qdel(B) qdel(src) -/obj/item/weapon/bombcore/badmin/summon/clown +/obj/item/bombcore/badmin/summon/clown summon_path = /mob/living/simple_animal/hostile/retaliate/clown amt_summon = 100 -/obj/item/weapon/bombcore/badmin/summon/clown/defuse() +/obj/item/bombcore/badmin/summon/clown/defuse() playsound(src.loc, 'sound/misc/sadtrombone.ogg', 50) ..() -/obj/item/weapon/bombcore/large +/obj/item/bombcore/large name = "large bomb payload" range_heavy = 5 range_medium = 10 range_light = 20 range_flame = 20 -/obj/item/weapon/bombcore/large/underwall +/obj/item/bombcore/large/underwall layer = ABOVE_OPEN_TURF_LAYER -/obj/item/weapon/bombcore/miniature +/obj/item/bombcore/miniature name = "small bomb core" w_class = WEIGHT_CLASS_SMALL range_heavy = 1 @@ -391,7 +391,7 @@ range_light = 4 range_flame = 2 -/obj/item/weapon/bombcore/chemical +/obj/item/bombcore/chemical name = "chemical payload" desc = "An explosive payload designed to spread chemicals, dangerous or otherwise, across a large area. Properties of the core may vary with grenade casing type, and must be loaded before use." origin_tech = "combat=4;materials=3" @@ -402,11 +402,11 @@ var/temp_boost = 50 var/time_release = 0 -/obj/item/weapon/bombcore/chemical/detonate() +/obj/item/bombcore/chemical/detonate() if(time_release > 0) var/total_volume = 0 - for(var/obj/item/weapon/reagent_containers/RC in beakers) + for(var/obj/item/reagent_containers/RC in beakers) total_volume += RC.reagents.total_volume if(total_volume < time_release) // If it's empty, the detonation is complete. @@ -418,7 +418,7 @@ var/fraction = time_release/total_volume var/datum/reagents/reactants = new(time_release) reactants.my_atom = src - for(var/obj/item/weapon/reagent_containers/RC in beakers) + for(var/obj/item/reagent_containers/RC in beakers) RC.reagents.trans_to(reactants, RC.reagents.total_volume*fraction, 1, 1, 1) chem_splash(get_turf(src), spread_range, list(reactants), temp_boost) @@ -429,12 +429,12 @@ var/list/reactants = list() - for(var/obj/item/weapon/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/glass/G in beakers) reactants += G.reagents for(var/obj/item/slime_extract/S in beakers) if(S.Uses) - for(var/obj/item/weapon/reagent_containers/glass/G in beakers) + for(var/obj/item/reagent_containers/glass/G in beakers) G.reagents.trans_to(S, G.reagents.total_volume) if(S && S.reagents && S.reagents.total_volume) @@ -454,14 +454,14 @@ qdel(loc) qdel(src) -/obj/item/weapon/bombcore/chemical/attackby(obj/item/I, mob/user, params) - if(istype(I, /obj/item/weapon/crowbar) && beakers.len > 0) +/obj/item/bombcore/chemical/attackby(obj/item/I, mob/user, params) + if(istype(I, /obj/item/crowbar) && beakers.len > 0) playsound(loc, I.usesound, 50, 1) for (var/obj/item/B in beakers) B.loc = get_turf(src) beakers -= B return - else if(istype(I, /obj/item/weapon/reagent_containers/glass/beaker) || istype(I, /obj/item/weapon/reagent_containers/glass/bottle)) + else if(istype(I, /obj/item/reagent_containers/glass/beaker) || istype(I, /obj/item/reagent_containers/glass/bottle)) if(beakers.len < max_beakers) if(!user.drop_item()) return @@ -473,17 +473,17 @@ return ..() -/obj/item/weapon/bombcore/chemical/CheckParts(list/parts_list) +/obj/item/bombcore/chemical/CheckParts(list/parts_list) ..() // Using different grenade casings, causes the payload to have different properties. - var/obj/item/weapon/stock_parts/matter_bin/MB = locate(/obj/item/weapon/stock_parts/matter_bin) in src + var/obj/item/stock_parts/matter_bin/MB = locate(/obj/item/stock_parts/matter_bin) in src if(MB) max_beakers += MB.rating // max beakers = 2-5. qdel(MB) - for(var/obj/item/weapon/grenade/chem_grenade/G in src) + for(var/obj/item/grenade/chem_grenade/G in src) - if(istype(G, /obj/item/weapon/grenade/chem_grenade/large)) - var/obj/item/weapon/grenade/chem_grenade/large/LG = G + if(istype(G, /obj/item/grenade/chem_grenade/large)) + var/obj/item/grenade/chem_grenade/large/LG = G max_beakers += 1 // Adding two large grenades only allows for a maximum of 7 beakers. spread_range += 2 // Extra range, reduced density. temp_boost += 50 // maximum of +150K blast using only large beakers. Not enough to self ignite. @@ -494,17 +494,17 @@ else S.loc = get_turf(src) - if(istype(G, /obj/item/weapon/grenade/chem_grenade/cryo)) + if(istype(G, /obj/item/grenade/chem_grenade/cryo)) spread_range -= 1 // Reduced range, but increased density. temp_boost -= 100 // minimum of -150K blast. - if(istype(G, /obj/item/weapon/grenade/chem_grenade/pyro)) + if(istype(G, /obj/item/grenade/chem_grenade/pyro)) temp_boost += 150 // maximum of +350K blast, which is enough to self ignite. Which means a self igniting bomb can't take advantage of other grenade casing properties. Sorry? - if(istype(G, /obj/item/weapon/grenade/chem_grenade/adv_release)) + if(istype(G, /obj/item/grenade/chem_grenade/adv_release)) time_release += 50 // A typical bomb, using basic beakers, will explode over 2-4 seconds. Using two will make the reaction last for less time, but it will be more dangerous overall. - for(var/obj/item/weapon/reagent_containers/glass/B in G) + for(var/obj/item/reagent_containers/glass/B in G) if(beakers.len < max_beakers) beakers += B B.loc = src diff --git a/code/game/machinery/telecomms/computers/logbrowser.dm b/code/game/machinery/telecomms/computers/logbrowser.dm index 6ca5adb25c0..92a4edfcd24 100644 --- a/code/game/machinery/telecomms/computers/logbrowser.dm +++ b/code/game/machinery/telecomms/computers/logbrowser.dm @@ -14,7 +14,7 @@ var/universal_translate = 0 // set to 1 if it can translate nonhuman speech req_access = list(ACCESS_TCOMSAT) - circuit = /obj/item/weapon/circuitboard/computer/comm_server + circuit = /obj/item/circuitboard/computer/comm_server /obj/machinery/computer/telecomms/server/attack_hand(mob/user) if(..()) diff --git a/code/game/machinery/telecomms/computers/telemonitor.dm b/code/game/machinery/telecomms/computers/telemonitor.dm index 0fd04b25361..bccbfd96fd3 100644 --- a/code/game/machinery/telecomms/computers/telemonitor.dm +++ b/code/game/machinery/telecomms/computers/telemonitor.dm @@ -16,7 +16,7 @@ var/network = "NULL" // the network to probe var/temp = "" // temporary feedback messages - circuit = /obj/item/weapon/circuitboard/computer/comm_monitor + circuit = /obj/item/circuitboard/computer/comm_monitor /obj/machinery/computer/telecomms/monitor/attack_hand(mob/user) if(..()) diff --git a/code/game/machinery/telecomms/machines/broadcaster.dm b/code/game/machinery/telecomms/machines/broadcaster.dm index 66783ee0628..246c1fa0478 100644 --- a/code/game/machinery/telecomms/machines/broadcaster.dm +++ b/code/game/machinery/telecomms/machines/broadcaster.dm @@ -17,7 +17,7 @@ GLOBAL_VAR_INIT(message_delay, 0) // To make sure restarting the recentmessages use_power = IDLE_POWER_USE idle_power_usage = 25 machinetype = 5 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/broadcaster + circuit = /obj/item/circuitboard/machine/telecomms/broadcaster /obj/machinery/telecomms/broadcaster/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) // Don't broadcast rejected signals diff --git a/code/game/machinery/telecomms/machines/bus.dm b/code/game/machinery/telecomms/machines/bus.dm index 52437afb662..252a285d2a3 100644 --- a/code/game/machinery/telecomms/machines/bus.dm +++ b/code/game/machinery/telecomms/machines/bus.dm @@ -18,7 +18,7 @@ idle_power_usage = 50 machinetype = 2 netspeed = 40 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/bus + circuit = /obj/item/circuitboard/machine/telecomms/bus var/change_frequency = 0 /obj/machinery/telecomms/bus/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/telecomms/machines/hub.dm b/code/game/machinery/telecomms/machines/hub.dm index 41d59e1e779..4019d970022 100644 --- a/code/game/machinery/telecomms/machines/hub.dm +++ b/code/game/machinery/telecomms/machines/hub.dm @@ -20,7 +20,7 @@ machinetype = 7 long_range_link = 1 netspeed = 40 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/hub + circuit = /obj/item/circuitboard/machine/telecomms/hub /obj/machinery/telecomms/hub/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) if(is_freq_listening(signal)) diff --git a/code/game/machinery/telecomms/machines/processor.dm b/code/game/machinery/telecomms/machines/processor.dm index 8d1494ff61a..fb791cf03e4 100644 --- a/code/game/machinery/telecomms/machines/processor.dm +++ b/code/game/machinery/telecomms/machines/processor.dm @@ -16,7 +16,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 30 machinetype = 3 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/processor + circuit = /obj/item/circuitboard/machine/telecomms/processor var/process_mode = 1 // 1 = Uncompress Signals, 0 = Compress Signals /obj/machinery/telecomms/processor/receive_information(datum/signal/signal, obj/machinery/telecomms/machine_from) diff --git a/code/game/machinery/telecomms/machines/receiver.dm b/code/game/machinery/telecomms/machines/receiver.dm index 0614668f3ad..79ab1258785 100644 --- a/code/game/machinery/telecomms/machines/receiver.dm +++ b/code/game/machinery/telecomms/machines/receiver.dm @@ -16,7 +16,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 30 machinetype = 1 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/receiver + circuit = /obj/item/circuitboard/machine/telecomms/receiver /obj/machinery/telecomms/receiver/receive_signal(datum/signal/signal) diff --git a/code/game/machinery/telecomms/machines/relay.dm b/code/game/machinery/telecomms/machines/relay.dm index 4dee1e80786..ca333b9a6c5 100644 --- a/code/game/machinery/telecomms/machines/relay.dm +++ b/code/game/machinery/telecomms/machines/relay.dm @@ -17,7 +17,7 @@ machinetype = 8 netspeed = 5 long_range_link = 1 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/relay + circuit = /obj/item/circuitboard/machine/telecomms/relay var/broadcasting = 1 var/receiving = 1 diff --git a/code/game/machinery/telecomms/machines/server.dm b/code/game/machinery/telecomms/machines/server.dm index 703bd378dd3..a328333b367 100644 --- a/code/game/machinery/telecomms/machines/server.dm +++ b/code/game/machinery/telecomms/machines/server.dm @@ -16,7 +16,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 15 machinetype = 4 - circuit = /obj/item/weapon/circuitboard/machine/telecomms/server + circuit = /obj/item/circuitboard/machine/telecomms/server var/list/log_entries = list() var/list/stored_names = list() var/list/TrafficActions = list() diff --git a/code/game/machinery/teleporter.dm b/code/game/machinery/teleporter.dm index b1edee8325d..1c7268e6c6b 100644 --- a/code/game/machinery/teleporter.dm +++ b/code/game/machinery/teleporter.dm @@ -11,7 +11,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 - circuit = /obj/item/weapon/circuitboard/machine/teleporter_hub + circuit = /obj/item/circuitboard/machine/teleporter_hub var/accurate = FALSE var/obj/machinery/teleport/station/power_station var/calibrated //Calibration prevents mutation @@ -28,7 +28,7 @@ /obj/machinery/teleport/hub/RefreshParts() var/A = 0 - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) A += M.rating accurate = A @@ -98,7 +98,7 @@ /obj/machinery/teleport/hub/syndicate/Initialize() . = ..() - component_parts += new /obj/item/weapon/stock_parts/matter_bin/super(null) + component_parts += new /obj/item/stock_parts/matter_bin/super(null) RefreshParts() @@ -109,7 +109,7 @@ use_power = IDLE_POWER_USE idle_power_usage = 10 active_power_usage = 2000 - circuit = /obj/item/weapon/circuitboard/machine/teleporter_station + circuit = /obj/item/circuitboard/machine/teleporter_station var/engaged = FALSE var/obj/machinery/computer/teleporter/teleporter_console var/obj/machinery/teleport/hub/teleporter_hub @@ -122,7 +122,7 @@ /obj/machinery/teleport/station/RefreshParts() var/E - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) E += C.rating efficiency = E - 1 @@ -150,7 +150,7 @@ teleporter_console = null return ..() -/obj/machinery/teleport/station/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/teleport/station/attackby(obj/item/W, mob/user, params) if(istype(W, /obj/item/device/multitool)) var/obj/item/device/multitool/M = W if(panel_open) @@ -175,7 +175,7 @@ else if(default_deconstruction_crowbar(W)) return - else if(istype(W, /obj/item/weapon/wirecutters)) + else if(istype(W, /obj/item/wirecutters)) if(panel_open) link_console_and_hub() to_chat(user, "You reconnect the station to nearby machinery.") diff --git a/code/game/machinery/vending.dm b/code/game/machinery/vending.dm index 15877eea395..6b3be49653e 100644 --- a/code/game/machinery/vending.dm +++ b/code/game/machinery/vending.dm @@ -24,7 +24,7 @@ max_integrity = 300 integrity_failure = 100 armor = list(melee = 20, bullet = 0, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 50, acid = 70) - circuit = /obj/item/weapon/circuitboard/machine/vendor + circuit = /obj/item/circuitboard/machine/vendor var/active = 1 //No sales pitches if off! var/vend_ready = 1 //Are we ready to vend?? Is it time?? @@ -52,12 +52,12 @@ var/shut_up = 0 //Stop spouting those godawful pitches! var/extended_inventory = 0 //can we access the hidden inventory? var/scan_id = 1 - var/obj/item/weapon/coin/coin + var/obj/item/coin/coin var/obj/item/stack/spacecash/bill var/dish_quants = list() //used by the snack machine's custom compartment to count dishes. - var/obj/item/weapon/vending_refill/refill_canister = null //The type of refill canisters used by this machine. + var/obj/item/vending_refill/refill_canister = null //The type of refill canisters used by this machine. var/refill_count = 3 //The number of canisters the vending machine uses /obj/machinery/vending/Initialize() @@ -86,7 +86,7 @@ return ..() /obj/machinery/vending/snack/Destroy() - for(var/obj/item/weapon/reagent_containers/food/snacks/S in contents) + for(var/obj/item/reagent_containers/food/snacks/S in contents) S.forceMove(get_turf(src)) return ..() @@ -98,7 +98,7 @@ build_inventory(products, start_empty = 1) build_inventory(contraband, 1, start_empty = 1) build_inventory(premium, 0, 1, start_empty = 1) - for(var/obj/item/weapon/vending_refill/VR in component_parts) + for(var/obj/item/vending_refill/VR in component_parts) refill_inventory(VR, product_records, STANDARD_CHARGE) refill_inventory(VR, coin_records, COIN_CHARGE) refill_inventory(VR, hidden_records, CONTRABAND_CHARGE) @@ -154,7 +154,7 @@ else product_records += R -/obj/machinery/vending/proc/refill_inventory(obj/item/weapon/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE) +/obj/machinery/vending/proc/refill_inventory(obj/item/vending_refill/refill, datum/data/vending_product/machine, var/charge_type = STANDARD_CHARGE) var/total = 0 var/to_restock = 0 @@ -182,11 +182,11 @@ total += restock return total -/obj/machinery/vending/snack/attackby(obj/item/weapon/W, mob/user, params) - if(istype(W, /obj/item/weapon/reagent_containers/food/snacks)) +/obj/machinery/vending/snack/attackby(obj/item/W, mob/user, params) + if(istype(W, /obj/item/reagent_containers/food/snacks)) if(!compartment_access_check(user)) return - var/obj/item/weapon/reagent_containers/food/snacks/S = W + var/obj/item/reagent_containers/food/snacks/S = W if(!S.junkiness) if(!iscompartmentfull(user)) if(!user.drop_item()) @@ -197,13 +197,13 @@ else to_chat(user, "[src]'s chef compartment does not accept junk food.") - else if(istype(W, /obj/item/weapon/storage/bag/tray)) + else if(istype(W, /obj/item/storage/bag/tray)) if(!compartment_access_check(user)) return - var/obj/item/weapon/storage/T = W + var/obj/item/storage/T = W var/loaded = 0 var/denied_items = 0 - for(var/obj/item/weapon/reagent_containers/food/snacks/S in T.contents) + for(var/obj/item/reagent_containers/food/snacks/S in T.contents) if(iscompartmentfull(user)) break if(!S.junkiness) @@ -237,14 +237,14 @@ return 1 return 0 -/obj/machinery/vending/snack/proc/food_load(obj/item/weapon/reagent_containers/food/snacks/S) +/obj/machinery/vending/snack/proc/food_load(obj/item/reagent_containers/food/snacks/S) if(dish_quants[S.name]) dish_quants[S.name]++ else dish_quants[S.name] = 1 sortList(dish_quants) -/obj/machinery/vending/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/vending/attackby(obj/item/W, mob/user, params) if(panel_open) if(default_unfasten_wrench(user, W, time = 60)) return @@ -253,7 +253,7 @@ if(default_deconstruction_crowbar(W)) return - if(istype(W, /obj/item/weapon/screwdriver)) + if(istype(W, /obj/item/screwdriver)) if(anchored) panel_open = !panel_open to_chat(user, "You [panel_open ? "open" : "close"] the maintenance panel.") @@ -265,11 +265,11 @@ else to_chat(user, "You must first secure [src].") return - else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/weapon/wirecutters)) + else if(istype(W, /obj/item/device/multitool)||istype(W, /obj/item/wirecutters)) if(panel_open) attack_hand(user) return - else if(istype(W, /obj/item/weapon/coin)) + else if(istype(W, /obj/item/coin)) if(coin) to_chat(user, "[src] already has [coin] inserted") return @@ -305,7 +305,7 @@ to_chat(user, "It does nothing.") else if(panel_open) //if the panel is open we attempt to refill the machine - var/obj/item/weapon/vending_refill/canister = W + var/obj/item/vending_refill/canister = W if(canister.charges[STANDARD_CHARGE] == 0) to_chat(user, "This [canister.name] is empty!") else @@ -329,7 +329,7 @@ for(var/datum/data/vending_product/machine_content in product_list[i]) while(machine_content.amount !=0) var/safety = 0 //to avoid infinite loop - for(var/obj/item/weapon/vending_refill/VR in component_parts) + for(var/obj/item/vending_refill/VR in component_parts) safety++ if(VR.charges[i] < VR.init_charges[i]) VR.charges[i]++ @@ -416,7 +416,7 @@ if(issilicon(usr)) if(iscyborg(usr)) var/mob/living/silicon/robot/R = usr - if(!(R.module && istype(R.module, /obj/item/weapon/robot_module/butler) )) + if(!(R.module && istype(R.module, /obj/item/robot_module/butler) )) to_chat(usr, "The vending machine refuses to interface with you, as you are not in its target demographic!") return else @@ -640,7 +640,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C desc = "A vendor with a wide variety of masks and gas tanks." icon = 'icons/obj/objects.dmi' icon_state = "dispenser" - product_paths = "/obj/item/weapon/tank/internals/oxygen;/obj/item/weapon/tank/internals/plasma;/obj/item/weapon/tank/internals/emergency_oxygen;/obj/item/weapon/tank/internals/emergency_oxygen/engi;/obj/item/clothing/mask/breath" + product_paths = "/obj/item/tank/internals/oxygen;/obj/item/tank/internals/plasma;/obj/item/tank/internals/emergency_oxygen;/obj/item/tank/internals/emergency_oxygen/engi;/obj/item/clothing/mask/breath" product_amounts = "10;10;10;5;25" */ @@ -649,27 +649,27 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C desc = "A technological marvel, supposedly able to mix just the mixture you'd like to drink the moment you ask for one." icon_state = "boozeomat" //////////////18 drink entities below, plus the glasses, in case someone wants to edit the number of bottles icon_deny = "boozeomat-deny" - products = list(/obj/item/weapon/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/whiskey = 5, - /obj/item/weapon/reagent_containers/food/drinks/bottle/tequila = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/vodka = 5, - /obj/item/weapon/reagent_containers/food/drinks/bottle/vermouth = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/rum = 5, - /obj/item/weapon/reagent_containers/food/drinks/bottle/wine = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/cognac = 5, - /obj/item/weapon/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/hcider = 5, - /obj/item/weapon/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/weapon/reagent_containers/food/drinks/bottle/grappa = 5, - /obj/item/weapon/reagent_containers/food/drinks/ale = 6, /obj/item/weapon/reagent_containers/food/drinks/bottle/orangejuice = 4, - /obj/item/weapon/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/weapon/reagent_containers/food/drinks/bottle/limejuice = 4, - /obj/item/weapon/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/tonic = 8, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/sodawater = 15, - /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/weapon/reagent_containers/food/drinks/ice = 10, - /obj/item/weapon/reagent_containers/food/drinks/drinkingglass/shotglass = 12, /obj/item/weapon/reagent_containers/food/drinks/flask = 3) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/mug/tea = 12) + products = list(/obj/item/reagent_containers/food/drinks/bottle/gin = 5, /obj/item/reagent_containers/food/drinks/bottle/whiskey = 5, + /obj/item/reagent_containers/food/drinks/bottle/tequila = 5, /obj/item/reagent_containers/food/drinks/bottle/vodka = 5, + /obj/item/reagent_containers/food/drinks/bottle/vermouth = 5, /obj/item/reagent_containers/food/drinks/bottle/rum = 5, + /obj/item/reagent_containers/food/drinks/bottle/wine = 5, /obj/item/reagent_containers/food/drinks/bottle/cognac = 5, + /obj/item/reagent_containers/food/drinks/bottle/kahlua = 5, /obj/item/reagent_containers/food/drinks/bottle/hcider = 5, + /obj/item/reagent_containers/food/drinks/bottle/absinthe = 5, /obj/item/reagent_containers/food/drinks/bottle/grappa = 5, + /obj/item/reagent_containers/food/drinks/ale = 6, /obj/item/reagent_containers/food/drinks/bottle/orangejuice = 4, + /obj/item/reagent_containers/food/drinks/bottle/tomatojuice = 4, /obj/item/reagent_containers/food/drinks/bottle/limejuice = 4, + /obj/item/reagent_containers/food/drinks/bottle/cream = 4, /obj/item/reagent_containers/food/drinks/soda_cans/tonic = 8, + /obj/item/reagent_containers/food/drinks/soda_cans/cola = 8, /obj/item/reagent_containers/food/drinks/soda_cans/sodawater = 15, + /obj/item/reagent_containers/food/drinks/drinkingglass = 30, /obj/item/reagent_containers/food/drinks/ice = 10, + /obj/item/reagent_containers/food/drinks/drinkingglass/shotglass = 12, /obj/item/reagent_containers/food/drinks/flask = 3) + contraband = list(/obj/item/reagent_containers/food/drinks/mug/tea = 12) product_slogans = "I hope nobody asks me for a bloody cup o' tea...;Alcohol is humanity's friend. Would you abandon a friend?;Quite delighted to serve you!;Is nobody thirsty on this station?" product_ads = "Drink up!;Booze is good for you!;Alcohol is humanity's best friend.;Quite delighted to serve you!;Care for a nice, cold beer?;Nothing cures you like booze!;Have a sip!;Have a drink!;Have a beer!;Beer is good for you!;Only the finest alcohol!;Best quality booze since 2053!;Award-winning wine!;Maximum alcohol!;Man loves beer.;A toast for progress!" req_access_txt = "25" - refill_canister = /obj/item/weapon/vending_refill/boozeomat + refill_canister = /obj/item/vending_refill/boozeomat /obj/machinery/vending/assist products = list( /obj/item/device/assembly/prox_sensor = 5, /obj/item/device/assembly/igniter = 3, /obj/item/device/assembly/signaler = 4, - /obj/item/weapon/wirecutters = 1, /obj/item/weapon/cartridge/signal = 4) + /obj/item/wirecutters = 1, /obj/item/cartridge/signal = 4) contraband = list(/obj/item/device/assembly/timer = 2, /obj/item/device/assembly/voice = 2, /obj/item/device/assembly/health = 2) product_ads = "Only the finest!;Have some tools.;The most robust equipment.;The finest gear in space!" armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) @@ -681,9 +681,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_ads = "Have a drink!;Drink up!;It's good for you!;Would you like a hot joe?;I'd kill for some coffee!;The best beans in the galaxy.;Only the finest brew for you.;Mmmm. Nothing like a coffee.;I like coffee, don't you?;Coffee helps you work!;Try some tea.;We hope you like the best!;Try our new chocolate!;Admin conspiracies" icon_state = "coffee" icon_vend = "coffee-vend" - products = list(/obj/item/weapon/reagent_containers/food/drinks/coffee = 25, /obj/item/weapon/reagent_containers/food/drinks/mug/tea = 25, /obj/item/weapon/reagent_containers/food/drinks/mug/coco = 25) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/ice = 12) - refill_canister = /obj/item/weapon/vending_refill/coffee + products = list(/obj/item/reagent_containers/food/drinks/coffee = 25, /obj/item/reagent_containers/food/drinks/mug/tea = 25, /obj/item/reagent_containers/food/drinks/mug/coco = 25) + contraband = list(/obj/item/reagent_containers/food/drinks/ice = 12) + refill_canister = /obj/item/vending_refill/coffee /obj/machinery/vending/snack name = "\improper Getmore Chocolate Corp" @@ -691,11 +691,11 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Try our new nougat bar!;Twice the calories for half the price!" product_ads = "The healthiest!;Award-winning chocolate bars!;Mmm! So good!;Oh my god it's so juicy!;Have a snack.;Snacks are good for you!;Have some more Getmore!;Best quality snacks straight from mars.;We love chocolate!;Try our new jerky!" icon_state = "snack" - products = list(/obj/item/weapon/reagent_containers/food/snacks/candy = 6, /obj/item/weapon/reagent_containers/food/drinks/dry_ramen = 6, /obj/item/weapon/reagent_containers/food/snacks/chips =6, - /obj/item/weapon/reagent_containers/food/snacks/sosjerky = 6, /obj/item/weapon/reagent_containers/food/snacks/no_raisin = 6, /obj/item/weapon/reagent_containers/food/snacks/spacetwinkie = 6, - /obj/item/weapon/reagent_containers/food/snacks/cheesiehonkers = 6) - contraband = list(/obj/item/weapon/reagent_containers/food/snacks/syndicake = 6) - refill_canister = /obj/item/weapon/vending_refill/snack + products = list(/obj/item/reagent_containers/food/snacks/candy = 6, /obj/item/reagent_containers/food/drinks/dry_ramen = 6, /obj/item/reagent_containers/food/snacks/chips =6, + /obj/item/reagent_containers/food/snacks/sosjerky = 6, /obj/item/reagent_containers/food/snacks/no_raisin = 6, /obj/item/reagent_containers/food/snacks/spacetwinkie = 6, + /obj/item/reagent_containers/food/snacks/cheesiehonkers = 6) + contraband = list(/obj/item/reagent_containers/food/snacks/syndicake = 6) + refill_canister = /obj/item/vending_refill/snack var/chef_compartment_access = "28" /obj/machinery/vending/snack/random @@ -726,12 +726,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Enjoy your meal.;Enough calories to support strenuous labor." product_ads = "Sufficiently healthy.;Efficiently produced tofu!;Mmm! So good!;Have a meal.;You need food to live!;Have some more candy corn!;Try our new ice cups!" icon_state = "sustenance" - products = list(/obj/item/weapon/reagent_containers/food/snacks/tofu = 24, - /obj/item/weapon/reagent_containers/food/drinks/ice = 12, - /obj/item/weapon/reagent_containers/food/snacks/candy_corn = 6) - contraband = list(/obj/item/weapon/kitchen/knife = 6, - /obj/item/weapon/reagent_containers/food/drinks/coffee = 12, - /obj/item/weapon/tank/internals/emergency_oxygen = 6, + products = list(/obj/item/reagent_containers/food/snacks/tofu = 24, + /obj/item/reagent_containers/food/drinks/ice = 12, + /obj/item/reagent_containers/food/snacks/candy_corn = 6) + contraband = list(/obj/item/kitchen/knife = 6, + /obj/item/reagent_containers/food/drinks/coffee = 12, + /obj/item/tank/internals/emergency_oxygen = 6, /obj/item/clothing/mask/breath = 6) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -742,13 +742,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "Cola_Machine" product_slogans = "Robust Softdrinks: More robust than a toolbox to the head!" product_ads = "Refreshing!;Hope you're thirsty!;Over 1 million drinks sold!;Thirsty? Why not cola?;Please, have a drink!;Drink up!;The best drinks in space." - products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/weapon/reagent_containers/glass/beaker/waterbottle = 10) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 6) - premium = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/air = 1) - refill_canister = /obj/item/weapon/vending_refill/cola + products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/glass/beaker/waterbottle = 10) + contraband = list(/obj/item/reagent_containers/food/drinks/soda_cans/thirteenloko = 6, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 6) + premium = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/nuka_cola = 1, /obj/item/reagent_containers/food/drinks/soda_cans/air = 1) + refill_canister = /obj/item/vending_refill/cola /obj/machinery/vending/cola/random name = "\improper Random Drinkies" @@ -797,10 +797,10 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C name = "\improper Shambler's Vendor" desc = "~Shake me up some of that Shambler's Juice!~" icon_state = "shamblers_juice" - products = list(/obj/item/weapon/reagent_containers/food/drinks/soda_cans/cola = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/starkist = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/pwr_game = 10, - /obj/item/weapon/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/weapon/reagent_containers/food/drinks/soda_cans/shamblers = 10) + products = list(/obj/item/reagent_containers/food/drinks/soda_cans/cola = 10, /obj/item/reagent_containers/food/drinks/soda_cans/space_mountain_wind = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/dr_gibb = 10, /obj/item/reagent_containers/food/drinks/soda_cans/starkist = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/space_up = 10, /obj/item/reagent_containers/food/drinks/soda_cans/pwr_game = 10, + /obj/item/reagent_containers/food/drinks/soda_cans/lemon_lime = 10, /obj/item/reagent_containers/food/drinks/soda_cans/shamblers = 10) product_slogans = "~Shake me up some of that Shambler's Juice!~" product_ads = "Refreshing!;Jyrbv dv lg jfdv fw kyrk Jyrdscvi'j Alztv!;Over 1 trillion souls drank!;Thirsty? Nyp efk uizeb kyv uribevjj?;Kyv Jyrdscvi uizebj kyv ezxyk!;Drink up!;Krjkp." @@ -812,9 +812,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Carts to go!" icon_state = "cart" icon_deny = "cart-deny" - products = list(/obj/item/weapon/cartridge/medical = 10, /obj/item/weapon/cartridge/engineering = 10, /obj/item/weapon/cartridge/security = 10, - /obj/item/weapon/cartridge/janitor = 10, /obj/item/weapon/cartridge/signal/toxins = 10, /obj/item/device/pda/heads = 10, - /obj/item/weapon/cartridge/captain = 3, /obj/item/weapon/cartridge/quartermaster = 10) + products = list(/obj/item/cartridge/medical = 10, /obj/item/cartridge/engineering = 10, /obj/item/cartridge/security = 10, + /obj/item/cartridge/janitor = 10, /obj/item/cartridge/signal/toxins = 10, /obj/item/device/pda/heads = 10, + /obj/item/cartridge/captain = 3, /obj/item/cartridge/quartermaster = 10) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -826,12 +826,12 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Liberation Station: Your one-stop shop for all things second ammendment!;Be a patriot today, pick up a gun!;Quality weapons for cheap prices!;Better dead than red!" product_ads = "Float like an astronaut, sting like a bullet!;Express your second ammendment today!;Guns don't kill people, but you can!;Who needs responsibilities when you have guns?" vend_reply = "Remember the name: Liberation Station!" - products = list(/obj/item/weapon/gun/ballistic/automatic/pistol/deagle/gold = 2, /obj/item/weapon/gun/ballistic/automatic/pistol/deagle/camo = 2, - /obj/item/weapon/gun/ballistic/automatic/pistol/m1911 = 2, /obj/item/weapon/gun/ballistic/automatic/proto/unrestricted = 2, - /obj/item/weapon/gun/ballistic/shotgun/automatic/combat = 2, /obj/item/weapon/gun/ballistic/automatic/gyropistol = 1, - /obj/item/weapon/gun/ballistic/shotgun = 2, /obj/item/weapon/gun/ballistic/automatic/ar = 2) + products = list(/obj/item/gun/ballistic/automatic/pistol/deagle/gold = 2, /obj/item/gun/ballistic/automatic/pistol/deagle/camo = 2, + /obj/item/gun/ballistic/automatic/pistol/m1911 = 2, /obj/item/gun/ballistic/automatic/proto/unrestricted = 2, + /obj/item/gun/ballistic/shotgun/automatic/combat = 2, /obj/item/gun/ballistic/automatic/gyropistol = 1, + /obj/item/gun/ballistic/shotgun = 2, /obj/item/gun/ballistic/automatic/ar = 2) premium = list(/obj/item/ammo_box/magazine/smgm9mm = 2, /obj/item/ammo_box/magazine/m50 = 4, /obj/item/ammo_box/magazine/m45 = 2, /obj/item/ammo_box/magazine/m75 = 2) - contraband = list(/obj/item/clothing/under/patriotsuit = 1, /obj/item/weapon/bedsheet/patriot = 3) + contraband = list(/obj/item/clothing/under/patriotsuit = 1, /obj/item/bedsheet/patriot = 3) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -841,22 +841,22 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Space cigs taste good like a cigarette should.;I'd rather toolbox than switch.;Smoke!;Don't believe the reports - smoke today!" product_ads = "Probably not bad for you!;Don't believe the scientists!;It's good for you!;Don't quit, buy more!;Smoke!;Nicotine heaven.;Best cigarettes since 2150.;Award-winning cigs." icon_state = "cigs" - products = list(/obj/item/weapon/storage/fancy/cigarettes = 5, - /obj/item/weapon/storage/fancy/cigarettes/cigpack_uplift = 3, - /obj/item/weapon/storage/fancy/cigarettes/cigpack_robust = 3, - /obj/item/weapon/storage/fancy/cigarettes/cigpack_carp = 3, - /obj/item/weapon/storage/fancy/cigarettes/cigpack_midori = 3, - /obj/item/weapon/storage/box/matches = 10, - /obj/item/weapon/lighter/greyscale = 4, - /obj/item/weapon/storage/fancy/rollingpapers = 5) - contraband = list(/obj/item/weapon/lighter = 3, /obj/item/clothing/mask/vape = 5) - premium = list(/obj/item/weapon/storage/fancy/cigarettes/cigpack_robustgold = 3, \ - /obj/item/weapon/storage/fancy/cigarettes/cigars = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/havana = 1, /obj/item/weapon/storage/fancy/cigarettes/cigars/cohiba = 1) - refill_canister = /obj/item/weapon/vending_refill/cigarette + products = list(/obj/item/storage/fancy/cigarettes = 5, + /obj/item/storage/fancy/cigarettes/cigpack_uplift = 3, + /obj/item/storage/fancy/cigarettes/cigpack_robust = 3, + /obj/item/storage/fancy/cigarettes/cigpack_carp = 3, + /obj/item/storage/fancy/cigarettes/cigpack_midori = 3, + /obj/item/storage/box/matches = 10, + /obj/item/lighter/greyscale = 4, + /obj/item/storage/fancy/rollingpapers = 5) + contraband = list(/obj/item/lighter = 3, /obj/item/clothing/mask/vape = 5) + premium = list(/obj/item/storage/fancy/cigarettes/cigpack_robustgold = 3, \ + /obj/item/storage/fancy/cigarettes/cigars = 1, /obj/item/storage/fancy/cigarettes/cigars/havana = 1, /obj/item/storage/fancy/cigarettes/cigars/cohiba = 1) + refill_canister = /obj/item/vending_refill/cigarette /obj/machinery/vending/cigarette/pre_throw(obj/item/I) - if(istype(I, /obj/item/weapon/lighter)) - var/obj/item/weapon/lighter/L = I + if(istype(I, /obj/item/lighter)) + var/obj/item/lighter/L = I L.set_lit(TRUE) /obj/machinery/vending/medical @@ -866,15 +866,15 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_deny = "med-deny" product_ads = "Go save some lives!;The best stuff for your medbay.;Only the finest tools.;Natural chemicals!;This stuff saves lives.;Don't you want some?;Ping!" req_access_txt = "5" - products = list(/obj/item/weapon/reagent_containers/syringe = 12, /obj/item/weapon/reagent_containers/dropper = 3, /obj/item/stack/medical/gauze = 8, /obj/item/weapon/reagent_containers/pill/patch/styptic = 5, /obj/item/weapon/reagent_containers/pill/insulin = 10, - /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/weapon/reagent_containers/glass/bottle/charcoal = 4, /obj/item/weapon/reagent_containers/spray/medical/sterilizer = 1, - /obj/item/weapon/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/weapon/reagent_containers/glass/bottle/morphine = 4, /obj/item/weapon/reagent_containers/glass/bottle/salglu_solution = 3, - /obj/item/weapon/reagent_containers/glass/bottle/toxin = 3, /obj/item/weapon/reagent_containers/syringe/antiviral = 6, /obj/item/weapon/reagent_containers/pill/salbutamol = 2, /obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 3, /obj/item/weapon/reagent_containers/pill/morphine = 4, /obj/item/weapon/reagent_containers/pill/charcoal = 6) - premium = list(/obj/item/weapon/storage/box/hug/medical = 1, /obj/item/weapon/reagent_containers/hypospray/medipen = 3, /obj/item/weapon/storage/belt/medical = 3, /obj/item/weapon/wrench/medical = 1) + products = list(/obj/item/reagent_containers/syringe = 12, /obj/item/reagent_containers/dropper = 3, /obj/item/stack/medical/gauze = 8, /obj/item/reagent_containers/pill/patch/styptic = 5, /obj/item/reagent_containers/pill/insulin = 10, + /obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/glass/bottle/charcoal = 4, /obj/item/reagent_containers/spray/medical/sterilizer = 1, + /obj/item/reagent_containers/glass/bottle/epinephrine = 4, /obj/item/reagent_containers/glass/bottle/morphine = 4, /obj/item/reagent_containers/glass/bottle/salglu_solution = 3, + /obj/item/reagent_containers/glass/bottle/toxin = 3, /obj/item/reagent_containers/syringe/antiviral = 6, /obj/item/reagent_containers/pill/salbutamol = 2, /obj/item/device/healthanalyzer = 4, /obj/item/device/sensor_device = 2) + contraband = list(/obj/item/reagent_containers/pill/tox = 3, /obj/item/reagent_containers/pill/morphine = 4, /obj/item/reagent_containers/pill/charcoal = 6) + premium = list(/obj/item/storage/box/hug/medical = 1, /obj/item/reagent_containers/hypospray/medipen = 3, /obj/item/storage/belt/medical = 3, /obj/item/wrench/medical = 1) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF - refill_canister = /obj/item/weapon/vending_refill/medical + refill_canister = /obj/item/vending_refill/medical //This one's from bay12 /obj/machinery/vending/plasmaresearch @@ -891,13 +891,13 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "wallmed" icon_deny = "wallmed-deny" density = FALSE - products = list(/obj/item/weapon/reagent_containers/syringe = 3, /obj/item/weapon/reagent_containers/pill/patch/styptic = 5, - /obj/item/weapon/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/weapon/reagent_containers/pill/charcoal = 2, - /obj/item/weapon/reagent_containers/spray/medical/sterilizer = 1) - contraband = list(/obj/item/weapon/reagent_containers/pill/tox = 2, /obj/item/weapon/reagent_containers/pill/morphine = 2) + products = list(/obj/item/reagent_containers/syringe = 3, /obj/item/reagent_containers/pill/patch/styptic = 5, + /obj/item/reagent_containers/pill/patch/silver_sulf = 5, /obj/item/reagent_containers/pill/charcoal = 2, + /obj/item/reagent_containers/spray/medical/sterilizer = 1) + contraband = list(/obj/item/reagent_containers/pill/tox = 2, /obj/item/reagent_containers/pill/morphine = 2) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF - refill_canister = /obj/item/weapon/vending_refill/medical + refill_canister = /obj/item/vending_refill/medical refill_count = 1 /obj/machinery/vending/security @@ -907,16 +907,16 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "sec" icon_deny = "sec-deny" req_access_txt = "1" - products = list(/obj/item/weapon/restraints/handcuffs = 8, /obj/item/weapon/restraints/handcuffs/cable/zipties = 10, /obj/item/weapon/grenade/flashbang = 4, /obj/item/device/assembly/flash/handheld = 5, - /obj/item/weapon/reagent_containers/food/snacks/donut = 12, /obj/item/weapon/storage/box/evidence = 6, /obj/item/device/flashlight/seclite = 4, /obj/item/weapon/restraints/legcuffs/bola/energy = 7) - contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/weapon/storage/fancy/donut_box = 2) - premium = list(/obj/item/weapon/coin/antagtoken = 1) + products = list(/obj/item/restraints/handcuffs = 8, /obj/item/restraints/handcuffs/cable/zipties = 10, /obj/item/grenade/flashbang = 4, /obj/item/device/assembly/flash/handheld = 5, + /obj/item/reagent_containers/food/snacks/donut = 12, /obj/item/storage/box/evidence = 6, /obj/item/device/flashlight/seclite = 4, /obj/item/restraints/legcuffs/bola/energy = 7) + contraband = list(/obj/item/clothing/glasses/sunglasses = 2, /obj/item/storage/fancy/donut_box = 2) + premium = list(/obj/item/coin/antagtoken = 1) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF /obj/machinery/vending/security/pre_throw(obj/item/I) - if(istype(I, /obj/item/weapon/grenade)) - var/obj/item/weapon/grenade/G = I + if(istype(I, /obj/item/grenade)) + var/obj/item/grenade/G = I G.preprime() else if(istype(I, /obj/item/device/flashlight)) var/obj/item/device/flashlight/F = I @@ -930,9 +930,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_ads = "We like plants!;Don't you want some?;The greenest thumbs ever.;We like big plants.;Soft soil..." icon_state = "nutri" icon_deny = "nutri-deny" - products = list(/obj/item/weapon/reagent_containers/glass/bottle/nutrient/ez = 30, /obj/item/weapon/reagent_containers/glass/bottle/nutrient/l4z = 20, /obj/item/weapon/reagent_containers/glass/bottle/nutrient/rh = 10, /obj/item/weapon/reagent_containers/spray/pestspray = 20, - /obj/item/weapon/reagent_containers/syringe = 5, /obj/item/weapon/storage/bag/plants = 5, /obj/item/weapon/cultivator = 3, /obj/item/weapon/shovel/spade = 3, /obj/item/device/plant_analyzer = 4) - contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/ammonia = 10, /obj/item/weapon/reagent_containers/glass/bottle/diethylamine = 5) + products = list(/obj/item/reagent_containers/glass/bottle/nutrient/ez = 30, /obj/item/reagent_containers/glass/bottle/nutrient/l4z = 20, /obj/item/reagent_containers/glass/bottle/nutrient/rh = 10, /obj/item/reagent_containers/spray/pestspray = 20, + /obj/item/reagent_containers/syringe = 5, /obj/item/storage/bag/plants = 5, /obj/item/cultivator = 3, /obj/item/shovel/spade = 3, /obj/item/device/plant_analyzer = 4) + contraband = list(/obj/item/reagent_containers/glass/bottle/ammonia = 10, /obj/item/reagent_containers/glass/bottle/diethylamine = 5) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -953,7 +953,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C contraband = list(/obj/item/seeds/amanita = 2, /obj/item/seeds/glowshroom = 2, /obj/item/seeds/liberty = 2, /obj/item/seeds/nettle = 2, /obj/item/seeds/plump = 2, /obj/item/seeds/reishi = 2, /obj/item/seeds/cannabis = 3, /obj/item/seeds/starthistle = 2, /obj/item/seeds/random = 2) - premium = list(/obj/item/weapon/reagent_containers/spray/waterflower = 1) + premium = list(/obj/item/reagent_containers/spray/waterflower = 1) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -964,8 +964,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Sling spells the proper way with MagiVend!;Be your own Houdini! Use MagiVend!" vend_reply = "Have an enchanted evening!" product_ads = "FJKLFJSD;AJKFLBJAKL;1234 LOONIES LOL!;>MFW;Kill them fuckers!;GET DAT FUKKEN DISK;HONK!;EI NATH;Destroy the station!;Admin conspiracies since forever!;Space-time bending hardware!" - products = list(/obj/item/clothing/head/wizard = 1, /obj/item/clothing/suit/wizrobe = 1, /obj/item/clothing/head/wizard/red = 1, /obj/item/clothing/suit/wizrobe/red = 1, /obj/item/clothing/head/wizard/yellow = 1, /obj/item/clothing/suit/wizrobe/yellow = 1, /obj/item/clothing/shoes/sandal/magic = 1, /obj/item/weapon/staff = 2) - contraband = list(/obj/item/weapon/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave + products = list(/obj/item/clothing/head/wizard = 1, /obj/item/clothing/suit/wizrobe = 1, /obj/item/clothing/head/wizard/red = 1, /obj/item/clothing/suit/wizrobe/red = 1, /obj/item/clothing/head/wizard/yellow = 1, /obj/item/clothing/suit/wizrobe/yellow = 1, /obj/item/clothing/shoes/sandal/magic = 1, /obj/item/staff = 2) + contraband = list(/obj/item/reagent_containers/glass/bottle/wizarditis = 1) //No one can get to the machine to hack it anyways; for the lulz - Microwave armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -982,7 +982,7 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/suit/toggle/labcoat/mad = 1, /obj/item/clothing/shoes/jackboots = 1, /obj/item/clothing/under/schoolgirl = 1, /obj/item/clothing/under/schoolgirl/red = 1, /obj/item/clothing/under/schoolgirl/green = 1, /obj/item/clothing/under/schoolgirl/orange = 1, /obj/item/clothing/head/kitty = 1, /obj/item/clothing/under/skirt/black = 1, /obj/item/clothing/head/beret = 1, /obj/item/clothing/accessory/waistcoat = 1, /obj/item/clothing/under/suit_jacket = 1, /obj/item/clothing/head/that =1, /obj/item/clothing/under/kilt = 1, /obj/item/clothing/head/beret = 1, /obj/item/clothing/accessory/waistcoat = 1, - /obj/item/clothing/glasses/monocle =1, /obj/item/clothing/head/bowler = 1, /obj/item/weapon/cane = 1, /obj/item/clothing/under/sl_suit = 1, + /obj/item/clothing/glasses/monocle =1, /obj/item/clothing/head/bowler = 1, /obj/item/cane = 1, /obj/item/clothing/under/sl_suit = 1, /obj/item/clothing/mask/fakemoustache = 1, /obj/item/clothing/suit/bio_suit/plaguedoctorsuit = 1, /obj/item/clothing/head/plaguedoctorhat = 1, /obj/item/clothing/mask/gas/plaguedoctor = 1, /obj/item/clothing/suit/toggle/owlwings = 1, /obj/item/clothing/under/owl = 1, /obj/item/clothing/mask/gas/owl_mask = 1, /obj/item/clothing/suit/toggle/owlwings/griffinwings = 1, /obj/item/clothing/under/griffin = 1, /obj/item/clothing/shoes/griffin = 1, /obj/item/clothing/head/griffin = 1, @@ -990,8 +990,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/under/pirate = 1, /obj/item/clothing/suit/pirate = 1, /obj/item/clothing/head/pirate = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/head/bandana = 1, /obj/item/clothing/under/soviet = 1, /obj/item/clothing/head/ushanka = 1, /obj/item/clothing/suit/imperium_monk = 1, /obj/item/clothing/mask/gas/cyborg = 1, /obj/item/clothing/suit/holidaypriest = 1, /obj/item/clothing/head/wizard/marisa/fake = 1, - /obj/item/clothing/suit/wizrobe/marisa/fake = 1, /obj/item/clothing/under/sundress = 1, /obj/item/clothing/head/witchwig = 1, /obj/item/weapon/staff/broom = 1, - /obj/item/clothing/suit/wizrobe/fake = 1, /obj/item/clothing/head/wizard/fake = 1, /obj/item/weapon/staff = 3, /obj/item/clothing/mask/gas/sexyclown = 1, + /obj/item/clothing/suit/wizrobe/marisa/fake = 1, /obj/item/clothing/under/sundress = 1, /obj/item/clothing/head/witchwig = 1, /obj/item/staff/broom = 1, + /obj/item/clothing/suit/wizrobe/fake = 1, /obj/item/clothing/head/wizard/fake = 1, /obj/item/staff = 3, /obj/item/clothing/mask/gas/sexyclown = 1, /obj/item/clothing/under/rank/clown/sexy = 1, /obj/item/clothing/mask/gas/sexymime = 1, /obj/item/clothing/under/sexymime = 1, /obj/item/clothing/mask/rat/bat = 1, /obj/item/clothing/mask/rat/bee = 1, /obj/item/clothing/mask/rat/bear = 1, /obj/item/clothing/mask/rat/raven = 1, /obj/item/clothing/mask/rat/jackal = 1, /obj/item/clothing/mask/rat/fox = 1, /obj/item/clothing/mask/rat/tribal = 1, /obj/item/clothing/mask/rat = 1, /obj/item/clothing/suit/apron/overalls = 1, /obj/item/clothing/head/rabbitears =1, /obj/item/clothing/head/sombrero = 1, /obj/item/clothing/head/sombrero/green = 1, /obj/item/clothing/suit/poncho = 1, /obj/item/clothing/suit/poncho/green = 1, /obj/item/clothing/suit/poncho/red = 1, @@ -1011,17 +1011,17 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/under/scratch = 1, /obj/item/clothing/under/sailor = 1, /obj/item/clothing/ears/headphones = 2) - contraband = list(/obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/weapon/gun/magic/wand = 2, /obj/item/clothing/glasses/sunglasses/garb = 2, /obj/item/clothing/glasses/sunglasses/blindfold = 1, /obj/item/clothing/mask/muzzle = 2) - premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/weapon/shield/riot/roman = 1, /obj/item/weapon/skub = 1) - refill_canister = /obj/item/weapon/vending_refill/autodrobe + contraband = list(/obj/item/clothing/suit/judgerobe = 1, /obj/item/clothing/head/powdered_wig = 1, /obj/item/gun/magic/wand = 2, /obj/item/clothing/glasses/sunglasses/garb = 2, /obj/item/clothing/glasses/sunglasses/blindfold = 1, /obj/item/clothing/mask/muzzle = 2) + premium = list(/obj/item/clothing/suit/pirate/captain = 2, /obj/item/clothing/head/pirate/captain = 2, /obj/item/clothing/head/helmet/roman = 1, /obj/item/clothing/head/helmet/roman/legionaire = 1, /obj/item/clothing/under/roman = 1, /obj/item/clothing/shoes/roman = 1, /obj/item/shield/riot/roman = 1, /obj/item/skub = 1) + refill_canister = /obj/item/vending_refill/autodrobe /obj/machinery/vending/dinnerware name = "\improper Plasteel Chef's Dinnerware Vendor" desc = "A kitchen and restaurant equipment vendor" product_ads = "Mm, food stuffs!;Food and food accessories.;Get your plates!;You like forks?;I like forks.;Woo, utensils.;You don't really need these..." icon_state = "dinnerware" - products = list(/obj/item/weapon/storage/bag/tray = 8, /obj/item/weapon/kitchen/fork = 6, /obj/item/weapon/kitchen/knife = 6, /obj/item/weapon/kitchen/rollingpin = 2, /obj/item/weapon/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/weapon/reagent_containers/food/condiment/pack/ketchup = 5, /obj/item/weapon/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/weapon/reagent_containers/food/condiment/saltshaker = 5, /obj/item/weapon/reagent_containers/food/condiment/peppermill = 5, /obj/item/weapon/reagent_containers/glass/bowl = 20) - contraband = list(/obj/item/weapon/kitchen/rollingpin = 2, /obj/item/weapon/kitchen/knife/butcher = 2) + products = list(/obj/item/storage/bag/tray = 8, /obj/item/kitchen/fork = 6, /obj/item/kitchen/knife = 6, /obj/item/kitchen/rollingpin = 2, /obj/item/reagent_containers/food/drinks/drinkingglass = 8, /obj/item/clothing/suit/apron/chef = 2, /obj/item/reagent_containers/food/condiment/pack/ketchup = 5, /obj/item/reagent_containers/food/condiment/pack/hotsauce = 5, /obj/item/reagent_containers/food/condiment/saltshaker = 5, /obj/item/reagent_containers/food/condiment/peppermill = 5, /obj/item/reagent_containers/glass/bowl = 20) + contraband = list(/obj/item/kitchen/rollingpin = 2, /obj/item/kitchen/knife/butcher = 2) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -1030,8 +1030,8 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C desc = "Old sweet water vending machine" icon_state = "sovietsoda" product_ads = "For Tsar and Country.;Have you fulfilled your nutrition quota today?;Very nice!;We are simple people, for this is all we eat.;If there is a person, there is a problem. If there is no person, then there is no problem." - products = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/soda = 30) - contraband = list(/obj/item/weapon/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) + products = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/soda = 30) + contraband = list(/obj/item/reagent_containers/food/drinks/drinkingglass/filled/cola = 20) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -1043,18 +1043,18 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C //req_access_txt = "12" //Maintenance access products = list( /obj/item/stack/cable_coil/random = 10, - /obj/item/weapon/crowbar = 5, - /obj/item/weapon/weldingtool = 3, - /obj/item/weapon/wirecutters = 5, - /obj/item/weapon/wrench = 5, + /obj/item/crowbar = 5, + /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/weapon/screwdriver = 5, + /obj/item/screwdriver = 5, /obj/item/device/flashlight/glowstick = 3, /obj/item/device/flashlight/glowstick/red = 3, /obj/item/device/flashlight = 5) contraband = list( - /obj/item/weapon/weldingtool/hugetank = 2, + /obj/item/weldingtool/hugetank = 2, /obj/item/clothing/gloves/color/fyellow = 2) premium = list( /obj/item/clothing/gloves/color/yellow = 1) @@ -1067,9 +1067,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_state = "engivend" icon_deny = "engivend-deny" req_access_txt = "11" //Engineering Equipment access - products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/device/multitool = 4, /obj/item/weapon/electronics/airlock = 10, /obj/item/weapon/electronics/apc = 10, /obj/item/weapon/electronics/airalarm = 10, /obj/item/weapon/stock_parts/cell/high = 10, /obj/item/weapon/construction/rcd/loaded = 3, /obj/item/device/geiger_counter = 5) - contraband = list(/obj/item/weapon/stock_parts/cell/potato = 3) - premium = list(/obj/item/weapon/storage/belt/utility = 3) + products = list(/obj/item/clothing/glasses/meson/engine = 2, /obj/item/device/multitool = 4, /obj/item/electronics/airlock = 10, /obj/item/electronics/apc = 10, /obj/item/electronics/airalarm = 10, /obj/item/stock_parts/cell/high = 10, /obj/item/construction/rcd/loaded = 3, /obj/item/device/geiger_counter = 5) + contraband = list(/obj/item/stock_parts/cell/potato = 3) + premium = list(/obj/item/storage/belt/utility = 3) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -1081,11 +1081,11 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_deny = "engi-deny" req_access_txt = "11" products = list(/obj/item/clothing/under/rank/chief_engineer = 4, /obj/item/clothing/under/rank/engineer = 4, /obj/item/clothing/shoes/sneakers/orange = 4, /obj/item/clothing/head/hardhat = 4, - /obj/item/weapon/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 4, /obj/item/weapon/screwdriver = 12, - /obj/item/weapon/crowbar = 12, /obj/item/weapon/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/weapon/wrench = 12, /obj/item/device/t_scanner = 12, - /obj/item/weapon/stock_parts/cell = 8, /obj/item/weapon/weldingtool = 8, /obj/item/clothing/head/welding = 8, - /obj/item/weapon/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/weapon/stock_parts/scanning_module = 5, /obj/item/weapon/stock_parts/micro_laser = 5, - /obj/item/weapon/stock_parts/matter_bin = 5, /obj/item/weapon/stock_parts/manipulator = 5, /obj/item/weapon/stock_parts/console_screen = 5) + /obj/item/storage/belt/utility = 4, /obj/item/clothing/glasses/meson/engine = 4, /obj/item/clothing/gloves/color/yellow = 4, /obj/item/screwdriver = 12, + /obj/item/crowbar = 12, /obj/item/wirecutters = 12, /obj/item/device/multitool = 12, /obj/item/wrench = 12, /obj/item/device/t_scanner = 12, + /obj/item/stock_parts/cell = 8, /obj/item/weldingtool = 8, /obj/item/clothing/head/welding = 8, + /obj/item/light/tube = 10, /obj/item/clothing/suit/fire = 4, /obj/item/stock_parts/scanning_module = 5, /obj/item/stock_parts/micro_laser = 5, + /obj/item/stock_parts/matter_bin = 5, /obj/item/stock_parts/manipulator = 5, /obj/item/stock_parts/console_screen = 5) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -1097,9 +1097,9 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C icon_deny = "robotics-deny" req_access_txt = "29" products = list(/obj/item/clothing/suit/toggle/labcoat = 4, /obj/item/clothing/under/rank/roboticist = 4, /obj/item/stack/cable_coil = 4, /obj/item/device/assembly/flash/handheld = 4, - /obj/item/weapon/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3, /obj/item/device/assembly/signaler = 3, /obj/item/device/healthanalyzer = 3, - /obj/item/weapon/scalpel = 2, /obj/item/weapon/circular_saw = 2, /obj/item/weapon/tank/internals/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, - /obj/item/weapon/screwdriver = 5, /obj/item/weapon/crowbar = 5) + /obj/item/stock_parts/cell/high = 12, /obj/item/device/assembly/prox_sensor = 3, /obj/item/device/assembly/signaler = 3, /obj/item/device/healthanalyzer = 3, + /obj/item/scalpel = 2, /obj/item/circular_saw = 2, /obj/item/tank/internals/anesthetic = 2, /obj/item/clothing/mask/breath/medical = 5, + /obj/item/screwdriver = 5, /obj/item/crowbar = 5) armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF @@ -1130,15 +1130,15 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C /obj/item/clothing/glasses/regular=1, /obj/item/clothing/glasses/regular/jamjar=1, /obj/item/clothing/head/sombrero=1, /obj/item/clothing/suit/poncho=1, /obj/item/clothing/suit/ianshirt=1, /obj/item/clothing/shoes/laceup=2, /obj/item/clothing/shoes/sneakers/black=4, /obj/item/clothing/shoes/sandal=1, /obj/item/clothing/gloves/fingerless=2, /obj/item/clothing/glasses/orange=1, /obj/item/clothing/glasses/red=1, - /obj/item/weapon/storage/belt/fannypack=1, /obj/item/weapon/storage/belt/fannypack/blue=1, /obj/item/weapon/storage/belt/fannypack/red=1, /obj/item/clothing/suit/jacket/letterman=2, + /obj/item/storage/belt/fannypack=1, /obj/item/storage/belt/fannypack/blue=1, /obj/item/storage/belt/fannypack/red=1, /obj/item/clothing/suit/jacket/letterman=2, /obj/item/clothing/head/beanie=1, /obj/item/clothing/head/beanie/black=1, /obj/item/clothing/head/beanie/red=1, /obj/item/clothing/head/beanie/green=1, /obj/item/clothing/head/beanie/darkblue=1, /obj/item/clothing/head/beanie/purple=1, /obj/item/clothing/head/beanie/yellow=1, /obj/item/clothing/head/beanie/orange=1, /obj/item/clothing/head/beanie/cyan=1, /obj/item/clothing/head/beanie/christmas=1, /obj/item/clothing/head/beanie/striped=1, /obj/item/clothing/head/beanie/stripedred=1, /obj/item/clothing/head/beanie/stripedblue=1, /obj/item/clothing/head/beanie/stripedgreen=1, /obj/item/clothing/suit/jacket/letterman_red=1, /obj/item/clothing/ears/headphones = 10) - contraband = list(/obj/item/clothing/under/syndicate/tacticool=1, /obj/item/clothing/mask/balaclava=1, /obj/item/clothing/head/ushanka=1, /obj/item/clothing/under/soviet=1, /obj/item/weapon/storage/belt/fannypack/black=2, /obj/item/clothing/suit/jacket/letterman_syndie=1, /obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1) + contraband = list(/obj/item/clothing/under/syndicate/tacticool=1, /obj/item/clothing/mask/balaclava=1, /obj/item/clothing/head/ushanka=1, /obj/item/clothing/under/soviet=1, /obj/item/storage/belt/fannypack/black=2, /obj/item/clothing/suit/jacket/letterman_syndie=1, /obj/item/clothing/under/jabroni=1, /obj/item/clothing/suit/vapeshirt=1, /obj/item/clothing/under/geisha=1) premium = list(/obj/item/clothing/under/suit_jacket/checkered=1, /obj/item/clothing/head/mailman=1, /obj/item/clothing/under/rank/mailman=1, /obj/item/clothing/suit/jacket/leather=1, /obj/item/clothing/suit/jacket/leather/overcoat=1, /obj/item/clothing/under/pants/mustangjeans=1, /obj/item/clothing/neck/necklace/dope=3, /obj/item/clothing/suit/jacket/letterman_nanotrasen=1) - refill_canister = /obj/item/weapon/vending_refill/clothing + refill_canister = /obj/item/vending_refill/clothing /obj/machinery/vending/toyliberationstation name = "\improper Syndicate Donksoft Toy Vendor" @@ -1148,20 +1148,20 @@ IF YOU MODIFY THE PRODUCTS LIST OF A MACHINE, MAKE SURE TO UPDATE ITS RESUPPLY C product_slogans = "Get your cool toys today!;Trigger a valid hunter today!;Quality toy weapons for cheap prices!;Give them to HoPs for all access!;Give them to HoS to get perma briged!" product_ads = "Feel robust with your toys!;Express your inner child today!;Toy weapons don't kill people, but valid hunters do!;Who needs responsibilities when you have toy weapons?;Make your next murder FUN!" vend_reply = "Come back for more!" - products = list(/obj/item/weapon/gun/ballistic/automatic/toy/unrestricted = 10, - /obj/item/weapon/gun/ballistic/automatic/toy/pistol/unrestricted = 10, - /obj/item/weapon/gun/ballistic/shotgun/toy/unrestricted = 10, + products = list(/obj/item/gun/ballistic/automatic/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/toy/pistol/unrestricted = 10, + /obj/item/gun/ballistic/shotgun/toy/unrestricted = 10, /obj/item/toy/sword = 10, /obj/item/ammo_box/foambox = 20, /obj/item/toy/foamblade = 10, /obj/item/toy/syndicateballoon = 10, /obj/item/clothing/suit/syndicatefake = 5, /obj/item/clothing/head/syndicatefake = 5) //OPS IN DORMS oh wait it's just a assistant - contraband = list(/obj/item/weapon/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! - /obj/item/weapon/gun/ballistic/automatic/c20r/toy/unrestricted = 10, - /obj/item/weapon/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, + contraband = list(/obj/item/gun/ballistic/shotgun/toy/crossbow = 10, //Congrats, you unlocked the +18 setting! + /obj/item/gun/ballistic/automatic/c20r/toy/unrestricted = 10, + /obj/item/gun/ballistic/automatic/l6_saw/toy/unrestricted = 10, /obj/item/ammo_box/foambox/riot = 20, /obj/item/toy/katana = 10, - /obj/item/weapon/twohanded/dualsaber/toy = 5, + /obj/item/twohanded/dualsaber/toy = 5, /obj/item/toy/cards/deck/syndicate = 10) //Gambling and it hurts, making it a +18 item armor = list(melee = 100, bullet = 100, laser = 100, energy = 100, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 50) resistance_flags = FIRE_PROOF diff --git a/code/game/machinery/washing_machine.dm b/code/game/machinery/washing_machine.dm index 3c9131ab9b7..f1384c0ea33 100644 --- a/code/game/machinery/washing_machine.dm +++ b/code/game/machinery/washing_machine.dm @@ -69,10 +69,10 @@ qdel(src) /obj/item/clothing/suit/hooded/ian_costume/machine_wash(obj/machinery/washing_machine/WM) - new /obj/item/weapon/reagent_containers/food/snacks/meat/slab/corgi(loc) + new /obj/item/reagent_containers/food/snacks/meat/slab/corgi(loc) qdel(src) -/obj/item/weapon/paper/machine_wash(obj/machinery/washing_machine/WM) +/obj/item/paper/machine_wash(obj/machinery/washing_machine/WM) if(WM.color_source) if(istype(WM.color_source, /obj/item/toy/crayon)) var/obj/item/toy/crayon/CR = WM.color_source @@ -129,7 +129,7 @@ if(chained) chained = 0 slowdown = SHOES_SLOWDOWN - new /obj/item/weapon/restraints/handcuffs(loc) + new /obj/item/restraints/handcuffs(loc) if(WM.color_source) var/wash_color = WM.color_source.item_color for(var/T in typesof(/obj/item/clothing/shoes/sneakers)) @@ -141,11 +141,11 @@ desc = "The colors are a bit dodgy." break -/obj/item/weapon/bedsheet/machine_wash(obj/machinery/washing_machine/WM) +/obj/item/bedsheet/machine_wash(obj/machinery/washing_machine/WM) if(WM.color_source) var/wash_color = WM.color_source.item_color - for(var/T in typesof(/obj/item/weapon/bedsheet)) - var/obj/item/weapon/bedsheet/B = T + for(var/T in typesof(/obj/item/bedsheet)) + var/obj/item/bedsheet/B = T if(wash_color == initial(B.item_color)) icon_state = initial(B.icon_state) item_color = wash_color @@ -188,7 +188,7 @@ if(panel_open) add_overlay("wm_panel") -/obj/machinery/washing_machine/attackby(obj/item/weapon/W, mob/user, params) +/obj/machinery/washing_machine/attackby(obj/item/W, mob/user, params) if(default_deconstruction_screwdriver(user, null, null, W)) update_icon() return @@ -211,7 +211,7 @@ to_chat(user, "\The [W] is stuck to your hand, you cannot put it in the washing machine!") return 1 - if(istype(W, /obj/item/toy/crayon) || istype(W, /obj/item/weapon/stamp)) + if(istype(W, /obj/item/toy/crayon) || istype(W, /obj/item/stamp)) color_source = W update_icon() diff --git a/code/game/mecha/combat/combat.dm b/code/game/mecha/combat/combat.dm index c4f5080bc82..4e8e42e10f5 100644 --- a/code/game/mecha/combat/combat.dm +++ b/code/game/mecha/combat/combat.dm @@ -5,8 +5,8 @@ /obj/mecha/combat/CheckParts(list/parts_list) ..() - var/obj/item/weapon/stock_parts/capacitor/C = locate() in contents - var/obj/item/weapon/stock_parts/scanning_module/SM = locate() in contents + var/obj/item/stock_parts/capacitor/C = locate() in contents + var/obj/item/stock_parts/scanning_module/SM = locate() in contents step_energy_drain = 20 - (5 * SM.rating) //10 is normal, so on lowest part its worse, on second its ok and on higher its real good up to 0 on best armor["energy"] += (C.rating * 10) //Each level of capacitor protects the mech against emp by 10% qdel(C) diff --git a/code/game/mecha/combat/gygax.dm b/code/game/mecha/combat/gygax.dm index 451f2728fad..df66127cc78 100644 --- a/code/game/mecha/combat/gygax.dm +++ b/code/game/mecha/combat/gygax.dm @@ -39,7 +39,7 @@ ME.attach(src) return -/obj/mecha/combat/gygax/dark/add_cell(obj/item/weapon/stock_parts/cell/C=null) +/obj/mecha/combat/gygax/dark/add_cell(obj/item/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C diff --git a/code/game/mecha/equipment/tools/medical_tools.dm b/code/game/mecha/equipment/tools/medical_tools.dm index 8d8a5420c2c..04fd6630042 100644 --- a/code/game/mecha/equipment/tools/medical_tools.dm +++ b/code/game/mecha/equipment/tools/medical_tools.dm @@ -296,10 +296,10 @@ /obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/action(atom/movable/target) if(!action_checks(target)) return - if(istype(target, /obj/item/weapon/reagent_containers/syringe)) + if(istype(target, /obj/item/reagent_containers/syringe)) return load_syringe(target) - if(istype(target, /obj/item/weapon/storage))//Loads syringes from boxes - for(var/obj/item/weapon/reagent_containers/syringe/S in target.contents) + if(istype(target, /obj/item/storage))//Loads syringes from boxes + for(var/obj/item/reagent_containers/syringe/S in target.contents) load_syringe(S) return if(mode) @@ -311,7 +311,7 @@ occupant_message("No available reagents to load syringe with.") return var/turf/trg = get_turf(target) - var/obj/item/weapon/reagent_containers/syringe/mechsyringe = syringes[1] + var/obj/item/reagent_containers/syringe/mechsyringe = syringes[1] mechsyringe.forceMove(get_turf(chassis)) reagents.trans_to(mechsyringe, min(mechsyringe.volume, reagents.total_volume)) syringes -= mechsyringe @@ -456,7 +456,7 @@ output += "Total: [round(reagents.total_volume,0.001)]/[reagents.maximum_volume] - Purge All" return output || "None" -/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/weapon/reagent_containers/syringe/S) +/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/load_syringe(obj/item/reagent_containers/syringe/S) if(syringes.len= 2) occupant_message("The syringe is too far away.") @@ -536,7 +536,7 @@ range = MELEE|RANGED equip_cooldown = 0 origin_tech = "combat=5;materials=6;powerstorage=7;biotech=6" - var/obj/item/weapon/gun/medbeam/mech/medigun + var/obj/item/gun/medbeam/mech/medigun materials = list(MAT_METAL = 15000, MAT_GLASS = 8000, MAT_PLASMA = 3000, MAT_GOLD = 8000, MAT_DIAMOND = 2000) /obj/item/mecha_parts/mecha_equipment/medical/mechmedbeam/New() diff --git a/code/game/mecha/equipment/weapons/weapons.dm b/code/game/mecha/equipment/weapons/weapons.dm index f323d35286e..fe0865ca244 100644 --- a/code/game/mecha/equipment/weapons/weapons.dm +++ b/code/game/mecha/equipment/weapons/weapons.dm @@ -327,7 +327,7 @@ desc = "A weapon for combat exosuits. Launches primed flashbangs." icon_state = "mecha_grenadelnchr" origin_tech = "combat=4;engineering=4" - projectile = /obj/item/weapon/grenade/flashbang + projectile = /obj/item/grenade/flashbang fire_sound = 'sound/weapons/grenadelaunch.ogg' projectiles = 6 missile_speed = 1.5 @@ -335,18 +335,18 @@ equip_cooldown = 60 var/det_time = 20 -/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/weapon/grenade/flashbang/F) +/obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/proj_init(var/obj/item/grenade/flashbang/F) var/turf/T = get_turf(src) message_admins("[ADMIN_LOOKUPFLW(chassis.occupant)] fired a [src] in [ADMIN_COORDJMP(T)]",0,1) log_game("[key_name(chassis.occupant)] fired a [src] [COORD(T)]") - addtimer(CALLBACK(F, /obj/item/weapon/grenade/flashbang.proc/prime), det_time) + addtimer(CALLBACK(F, /obj/item/grenade/flashbang.proc/prime), det_time) /obj/item/mecha_parts/mecha_equipment/weapon/ballistic/launcher/flashbang/clusterbang //Because I am a heartless bastard -Sieve //Heartless? for making the poor man's honkblast? - Kaze name = "\improper SOB-3 grenade launcher" desc = "A weapon for combat exosuits. Launches primed clusterbangs. You monster." origin_tech = "combat=4;materials=4" projectiles = 3 - projectile = /obj/item/weapon/grenade/clusterbuster + projectile = /obj/item/grenade/clusterbuster projectile_energy_cost = 1600 //getting off cheap seeing as this is 3 times the flashbangs held in the grenade launcher. equip_cooldown = 90 @@ -354,7 +354,7 @@ name = "banana mortar" desc = "Equipment for clown exosuits. Launches banana peels." icon_state = "mecha_bananamrtr" - projectile = /obj/item/weapon/grown/bananapeel + projectile = /obj/item/grown/bananapeel fire_sound = 'sound/items/bikehorn.ogg' projectiles = 15 missile_speed = 1.5 diff --git a/code/game/mecha/mech_bay.dm b/code/game/mecha/mech_bay.dm index 7db5321b9e8..10c0b7e39a6 100644 --- a/code/game/mecha/mech_bay.dm +++ b/code/game/mecha/mech_bay.dm @@ -17,7 +17,7 @@ dir = EAST icon = 'icons/mecha/mech_bay.dmi' icon_state = "recharge_port" - circuit = /obj/item/weapon/circuitboard/machine/mech_recharger + circuit = /obj/item/circuitboard/machine/mech_recharger var/obj/mecha/recharging_mech var/obj/machinery/computer/mech_bay_power_console/recharge_console var/max_charge = 50 @@ -31,7 +31,7 @@ /obj/machinery/mech_bay_recharge_port/RefreshParts() var/MC - for(var/obj/item/weapon/stock_parts/capacitor/C in component_parts) + for(var/obj/item/stock_parts/capacitor/C in component_parts) MC += C.rating max_charge = MC * 25 @@ -74,7 +74,7 @@ desc = "Used to control mechbay power ports." icon_screen = "recharge_comp" icon_keyboard = "rd_key" - circuit = /obj/item/weapon/circuitboard/computer/mech_bay_power_console + circuit = /obj/item/circuitboard/computer/mech_bay_power_console var/obj/machinery/mech_bay_recharge_port/recharge_port light_color = LIGHT_COLOR_PINK diff --git a/code/game/mecha/mech_fabricator.dm b/code/game/mecha/mech_fabricator.dm index 9865175486e..14efd0a6103 100644 --- a/code/game/mecha/mech_fabricator.dm +++ b/code/game/mecha/mech_fabricator.dm @@ -9,7 +9,7 @@ idle_power_usage = 20 active_power_usage = 5000 req_access = list(ACCESS_ROBOTICS) - circuit = /obj/item/weapon/circuitboard/machine/mechfab + circuit = /obj/item/circuitboard/machine/mechfab var/time_coeff = 1 var/component_coeff = 1 var/datum/material_container/materials @@ -44,24 +44,24 @@ var/T = 0 //maximum stocking amount (default 300000, 600000 at T4) - for(var/obj/item/weapon/stock_parts/matter_bin/M in component_parts) + for(var/obj/item/stock_parts/matter_bin/M in component_parts) T += M.rating materials.max_amount = (200000 + (T*50000)) //resources adjustment coefficient (1 -> 0.85 -> 0.7 -> 0.55) T = 1.15 - for(var/obj/item/weapon/stock_parts/micro_laser/Ma in component_parts) + for(var/obj/item/stock_parts/micro_laser/Ma in component_parts) T -= Ma.rating*0.15 component_coeff = T //building time adjustment coefficient (1 -> 0.8 -> 0.6) T = -1 - for(var/obj/item/weapon/stock_parts/manipulator/Ml in component_parts) + for(var/obj/item/stock_parts/manipulator/Ml in component_parts) T += Ml.rating time_coeff = round(initial(time_coeff) - (initial(time_coeff)*(T))/5,0.01) -/obj/machinery/mecha_part_fabricator/check_access(obj/item/weapon/card/id/I) +/obj/machinery/mecha_part_fabricator/check_access(obj/item/card/id/I) if(istype(I, /obj/item/device/pda)) var/obj/item/device/pda/pda = I I = pda.id @@ -441,7 +441,7 @@ updateUsrDialog() - else if(istype(W, /obj/item/weapon/ore/bluespace_crystal)) + else if(istype(W, /obj/item/ore/bluespace_crystal)) if(!is_insertion_ready(user)) return 1 diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 02f5b2e15a8..dceb3992bc9 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -34,7 +34,7 @@ var/deflect_chance = 10 //chance to deflect the incoming projectiles, hits, or lesser the effect of ex_act. armor = list(melee = 20, bullet = 10, laser = 0, energy = 0, bomb = 0, bio = 0, rad = 0, fire = 100, acid = 100) var/list/facing_modifiers = list(FRONT_ARMOUR = 1.5, SIDE_ARMOUR = 1, BACK_ARMOUR = 0.5) - var/obj/item/weapon/stock_parts/cell/cell + var/obj/item/stock_parts/cell/cell var/state = 0 var/list/log = new var/last_message = 0 @@ -210,7 +210,7 @@ internal_tank = new /obj/machinery/portable_atmospherics/canister/air(src) return internal_tank -/obj/mecha/proc/add_cell(var/obj/item/weapon/stock_parts/cell/C=null) +/obj/mecha/proc/add_cell(var/obj/item/stock_parts/cell/C=null) if(C) C.forceMove(src) cell = C diff --git a/code/game/mecha/mecha_construction_paths.dm b/code/game/mecha/mecha_construction_paths.dm index f2a6b6e225e..24c1c513c3e 100644 --- a/code/game/mecha/mecha_construction_paths.dm +++ b/code/game/mecha/mecha_construction_paths.dm @@ -3,22 +3,22 @@ //////////////////////////////// /datum/construction/mecha/custom_action(step, atom/used_atom, mob/user) - if(istype(used_atom, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/W = used_atom + if(istype(used_atom, /obj/item/weldingtool)) + var/obj/item/weldingtool/W = used_atom if (W.remove_fuel(0, user)) playsound(holder, 'sound/items/welder2.ogg', 50, 1) else return 0 - else if(istype(used_atom, /obj/item/weapon/wrench)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/wrench)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) - else if(istype(used_atom, /obj/item/weapon/screwdriver)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/screwdriver)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) - else if(istype(used_atom, /obj/item/weapon/wirecutters)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/wirecutters)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) else if(istype(used_atom, /obj/item/stack/cable_coil)) @@ -38,22 +38,22 @@ return 1 /datum/construction/reversible/mecha/custom_action(index as num, diff as num, atom/used_atom, mob/user) - if(istype(used_atom, /obj/item/weapon/weldingtool)) - var/obj/item/weapon/weldingtool/W = used_atom + if(istype(used_atom, /obj/item/weldingtool)) + var/obj/item/weldingtool/W = used_atom if (W.remove_fuel(0, user)) playsound(holder, 'sound/items/welder2.ogg', 50, 1) else return 0 - else if(istype(used_atom, /obj/item/weapon/wrench)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/wrench)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) - else if(istype(used_atom, /obj/item/weapon/screwdriver)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/screwdriver)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) - else if(istype(used_atom, /obj/item/weapon/wirecutters)) - var/obj/item/weapon/W = used_atom + else if(istype(used_atom, /obj/item/wirecutters)) + var/obj/item/W = used_atom playsound(holder, W.usesound, 50, 1) else if(istype(used_atom, /obj/item/stack/cable_coil)) @@ -105,59 +105,59 @@ result = "/obj/mecha/working/ripley" steps = list( //1 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //3 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Internal armor is welded."), //4 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Internal armor is wrenched."), //5 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), //6 list("key"=/obj/item/stack/sheet/metal, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //7 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed."), //8 - list("key"=/obj/item/weapon/circuitboard/mecha/ripley/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //9 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //10 - list("key"=/obj/item/weapon/circuitboard/mecha/ripley/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/ripley/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //11 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //12 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //13 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //14 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -210,7 +210,7 @@ holder.icon_state = "ripley6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "ripley4" if(8) if(diff==FORWARD) @@ -226,7 +226,7 @@ holder.icon_state = "ripley8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "ripley6" if(6) if(diff==FORWARD) @@ -314,83 +314,83 @@ result = "/obj/mecha/combat/gygax" steps = list( //1 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //3 list("key"=/obj/item/mecha_parts/part/gygax_armor, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Internal armor is welded."), //4 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Internal armor is wrenched."), //5 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), //6 list("key"=/obj/item/stack/sheet/metal, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="Advanced capacitor is secured."), //7 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Advanced capacitor is installed."), //8 - list("key"=/obj/item/weapon/stock_parts/capacitor, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/capacitor, + "backkey"=/obj/item/screwdriver, "desc"="Advanced scanner module is secured."), //9 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Advanced scanner module is installed."), //10 - list("key"=/obj/item/weapon/stock_parts/scanning_module, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/scanning_module, + "backkey"=/obj/item/screwdriver, "desc"="Weapon control module is secured."), //11 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Weapon control module is installed."), //12 - list("key"=/obj/item/weapon/circuitboard/mecha/gygax/targeting, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/gygax/targeting, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //13 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed."), //14 - list("key"=/obj/item/weapon/circuitboard/mecha/gygax/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/gygax/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //15 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //16 - list("key"=/obj/item/weapon/circuitboard/mecha/gygax/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/gygax/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //18 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //19 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //20 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -443,7 +443,7 @@ holder.icon_state = "gygax6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/gygax/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/gygax/main(get_turf(holder)) holder.icon_state = "gygax4" if(14) if(diff==FORWARD) @@ -459,7 +459,7 @@ holder.icon_state = "gygax8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/gygax/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/gygax/peripherals(get_turf(holder)) holder.icon_state = "gygax6" if(12) if(diff==FORWARD) @@ -475,7 +475,7 @@ holder.icon_state = "gygax10" else user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/gygax/targeting(get_turf(holder)) + new /obj/item/circuitboard/mecha/gygax/targeting(get_turf(holder)) holder.icon_state = "gygax8" if(10) if(diff==FORWARD) @@ -492,7 +492,7 @@ holder.icon_state = "gygax12" else user.visible_message("[user] removes the advanced scanner module from the [holder].", "You remove the scanner module from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder + var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "gygax10" if(8) @@ -510,7 +510,7 @@ holder.icon_state = "gygax14" else user.visible_message("[user] removes the capacitor from the [holder].", "You remove the capacitor from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder + var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "gygax12" if(6) @@ -599,64 +599,64 @@ result = "/obj/mecha/working/ripley/firefighter" steps = list( //1 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //3 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/crowbar, + "backkey"=/obj/item/crowbar, "desc"="External armor is being installed."), //4 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Internal armor is welded."), //5 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Internal armor is wrenched."), //6 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), //7 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //8 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed."), //9 - list("key"=/obj/item/weapon/circuitboard/mecha/ripley/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/ripley/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //10 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //11 - list("key"=/obj/item/weapon/circuitboard/mecha/ripley/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/ripley/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //12 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //13 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //14 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //15 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -709,7 +709,7 @@ holder.icon_state = "fireripley6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/ripley/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/ripley/main(get_turf(holder)) holder.icon_state = "fireripley4" if(9) if(diff==FORWARD) @@ -725,7 +725,7 @@ holder.icon_state = "fireripley8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/ripley/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/ripley/peripherals(get_turf(holder)) holder.icon_state = "fireripley6" if(7) if(diff==FORWARD) @@ -819,17 +819,17 @@ /datum/construction/mecha/honker result = "/obj/mecha/combat/honker" - steps = list(list("key"=/obj/item/weapon/bikehorn), //1 + steps = list(list("key"=/obj/item/bikehorn), //1 list("key"=/obj/item/clothing/shoes/clown_shoes), //2 - list("key"=/obj/item/weapon/bikehorn), //3 + list("key"=/obj/item/bikehorn), //3 list("key"=/obj/item/clothing/mask/gas/clown_hat), //4 - list("key"=/obj/item/weapon/bikehorn), //5 - list("key"=/obj/item/weapon/circuitboard/mecha/honker/targeting), //6 - list("key"=/obj/item/weapon/bikehorn), //7 - list("key"=/obj/item/weapon/circuitboard/mecha/honker/peripherals), //8 - list("key"=/obj/item/weapon/bikehorn), //9 - list("key"=/obj/item/weapon/circuitboard/mecha/honker/main), //10 - list("key"=/obj/item/weapon/bikehorn), //11 + list("key"=/obj/item/bikehorn), //5 + list("key"=/obj/item/circuitboard/mecha/honker/targeting), //6 + list("key"=/obj/item/bikehorn), //7 + list("key"=/obj/item/circuitboard/mecha/honker/peripherals), //8 + list("key"=/obj/item/bikehorn), //9 + list("key"=/obj/item/circuitboard/mecha/honker/main), //10 + list("key"=/obj/item/bikehorn), //11 ) /datum/construction/mecha/honker/action(atom/used_atom,mob/user) @@ -839,7 +839,7 @@ if(!..()) return 0 - if(istype(used_atom, /obj/item/weapon/bikehorn)) + if(istype(used_atom, /obj/item/bikehorn)) playsound(holder, 'sound/items/bikehorn.ogg', 50, 1) user.visible_message("HONK!") @@ -898,83 +898,83 @@ result = "/obj/mecha/combat/durand" steps = list( //1 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //3 list("key"=/obj/item/mecha_parts/part/durand_armor, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Internal armor is welded."), //4 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Internal armor is wrenched."), //5 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), //6 list("key"=/obj/item/stack/sheet/metal, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="Super capacitor is secured."), //7 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Super capacitor is installed."), //8 - list("key"=/obj/item/weapon/stock_parts/capacitor, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/capacitor, + "backkey"=/obj/item/screwdriver, "desc"="Phasic scanner module is secured."), //9 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Phasic scanner module is installed."), //10 - list("key"=/obj/item/weapon/stock_parts/scanning_module, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/scanning_module, + "backkey"=/obj/item/screwdriver, "desc"="Weapon control module is secured."), //11 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Weapon control module is installed."), //12 - list("key"=/obj/item/weapon/circuitboard/mecha/durand/targeting, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/durand/targeting, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //13 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed."), //14 - list("key"=/obj/item/weapon/circuitboard/mecha/durand/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/durand/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //15 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //16 - list("key"=/obj/item/weapon/circuitboard/mecha/durand/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/durand/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //17 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //18 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //19 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //20 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1028,7 +1028,7 @@ holder.icon_state = "durand6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/durand/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/durand/main(get_turf(holder)) holder.icon_state = "durand4" if(14) if(diff==FORWARD) @@ -1044,7 +1044,7 @@ holder.icon_state = "durand8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/durand/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/durand/peripherals(get_turf(holder)) holder.icon_state = "durand6" if(12) if(diff==FORWARD) @@ -1060,7 +1060,7 @@ holder.icon_state = "durand10" else user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/durand/targeting(get_turf(holder)) + new /obj/item/circuitboard/mecha/durand/targeting(get_turf(holder)) holder.icon_state = "durand8" if(10) if(diff==FORWARD) @@ -1077,7 +1077,7 @@ holder.icon_state = "durand12" else user.visible_message("[user] removes the scanner module from the [holder].", "You remove the scanner module from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder + var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "durand10" if(8) @@ -1095,7 +1095,7 @@ holder.icon_state = "durand14" else user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the capacitor from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder + var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "durand12" if(6) @@ -1191,95 +1191,95 @@ "desc"="Anomaly core socket is open and awaiting connection."), //2 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //3 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //4 list("key"=/obj/item/mecha_parts/part/phazon_armor, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Phase armor is welded."), //5 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Phase armor is wrenched."), //6 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Phase armor is installed."), //7 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The bluespace crystal is engaged."), //8 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wirecutters, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wirecutters, "desc"="The bluespace crystal is connected."), //9 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/crowbar, + "backkey"=/obj/item/crowbar, "desc"="The bluespace crystal is installed."), //10 - list("key"=/obj/item/weapon/ore/bluespace_crystal, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/ore/bluespace_crystal, + "backkey"=/obj/item/screwdriver, "desc"="Super capacitor is secured."), //12 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Super capacitor is installed."), //12 - list("key"=/obj/item/weapon/stock_parts/capacitor, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/capacitor, + "backkey"=/obj/item/screwdriver, "desc"="Phasic scanner module is secured."), //13 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Phasic scanner module is installed."), //14 - list("key"=/obj/item/weapon/stock_parts/scanning_module, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/stock_parts/scanning_module, + "backkey"=/obj/item/screwdriver, "desc"="Weapon control module is secured."), //15 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Weapon control is installed."), //16 - list("key"=/obj/item/weapon/circuitboard/mecha/phazon/targeting, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/phazon/targeting, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //17 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed"), //18 - list("key"=/obj/item/weapon/circuitboard/mecha/phazon/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/phazon/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //19 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //20 - list("key"=/obj/item/weapon/circuitboard/mecha/phazon/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/phazon/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //21 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //22 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //23 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //24 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1333,7 +1333,7 @@ holder.icon_state = "phazon6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/phazon/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/phazon/main(get_turf(holder)) holder.icon_state = "phazon4" if(18) if(diff==FORWARD) @@ -1349,7 +1349,7 @@ holder.icon_state = "phazon8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/phazon/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/phazon/peripherals(get_turf(holder)) holder.icon_state = "phazon6" if(16) if(diff==FORWARD) @@ -1365,7 +1365,7 @@ holder.icon_state = "phazon10" else user.visible_message("[user] removes the weapon control module from the [holder].", "You remove the weapon control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/phazon/targeting(get_turf(holder)) + new /obj/item/circuitboard/mecha/phazon/targeting(get_turf(holder)) holder.icon_state = "phazon8" if(14) if(diff==FORWARD) @@ -1382,7 +1382,7 @@ holder.icon_state = "phazon12" else user.visible_message("[user] removes the phasic scanner module from the [holder].", "You remove the scanner module from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/scanning_module) in holder + var/obj/item/I = locate(/obj/item/stock_parts/scanning_module) in holder I.loc = get_turf(holder) holder.icon_state = "phazon10" if(12) @@ -1400,7 +1400,7 @@ holder.icon_state = "phazon14" else user.visible_message("[user] removes the super capacitor from the [holder].", "You remove the capacitor from the [holder].") - var/obj/item/I = locate(/obj/item/weapon/stock_parts/capacitor) in holder + var/obj/item/I = locate(/obj/item/stock_parts/capacitor) in holder I.loc = get_turf(holder) holder.icon_state = "phazon12" if(10) @@ -1417,7 +1417,7 @@ holder.icon_state = "phazon16" else user.visible_message("[user] removes the bluespace crystal from the [holder].", "You remove the bluespace crystal from the [holder].") - new /obj/item/weapon/ore/bluespace_crystal(get_turf(holder)) + new /obj/item/ore/bluespace_crystal(get_turf(holder)) holder.icon_state = "phazon14" if(8) if(diff==FORWARD) @@ -1518,59 +1518,59 @@ result = "/obj/mecha/medical/odysseus" steps = list( //1 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="External armor is wrenched."), //2 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="External armor is installed."), //3 list("key"=/obj/item/stack/sheet/plasteel, - "backkey"=/obj/item/weapon/weldingtool, + "backkey"=/obj/item/weldingtool, "desc"="Internal armor is welded."), //4 - list("key"=/obj/item/weapon/weldingtool, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/weldingtool, + "backkey"=/obj/item/wrench, "desc"="Internal armor is wrenched."), //5 - list("key"=/obj/item/weapon/wrench, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/wrench, + "backkey"=/obj/item/crowbar, "desc"="Internal armor is installed."), //6 list("key"=/obj/item/stack/sheet/metal, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="Peripherals control module is secured."), //7 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Peripherals control module is installed."), //8 - list("key"=/obj/item/weapon/circuitboard/mecha/odysseus/peripherals, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/odysseus/peripherals, + "backkey"=/obj/item/screwdriver, "desc"="Central control module is secured."), //9 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/crowbar, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/crowbar, "desc"="Central control module is installed."), //10 - list("key"=/obj/item/weapon/circuitboard/mecha/odysseus/main, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/circuitboard/mecha/odysseus/main, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is adjusted."), //11 - list("key"=/obj/item/weapon/wirecutters, - "backkey"=/obj/item/weapon/screwdriver, + list("key"=/obj/item/wirecutters, + "backkey"=/obj/item/screwdriver, "desc"="The wiring is added."), //12 list("key"=/obj/item/stack/cable_coil, - "backkey"=/obj/item/weapon/screwdriver, + "backkey"=/obj/item/screwdriver, "desc"="The hydraulic systems are active."), //13 - list("key"=/obj/item/weapon/screwdriver, - "backkey"=/obj/item/weapon/wrench, + list("key"=/obj/item/screwdriver, + "backkey"=/obj/item/wrench, "desc"="The hydraulic systems are connected."), //14 - list("key"=/obj/item/weapon/wrench, + list("key"=/obj/item/wrench, "desc"="The hydraulic systems are disconnected.") ) @@ -1623,7 +1623,7 @@ holder.icon_state = "odysseus6" else user.visible_message("[user] removes the central control module from the [holder].", "You remove the central computer mainboard from the [holder].") - new /obj/item/weapon/circuitboard/mecha/odysseus/main(get_turf(holder)) + new /obj/item/circuitboard/mecha/odysseus/main(get_turf(holder)) holder.icon_state = "odysseus4" if(8) if(diff==FORWARD) @@ -1639,7 +1639,7 @@ holder.icon_state = "odysseus8" else user.visible_message("[user] removes the peripherals control module from the [holder].", "You remove the peripherals control module from the [holder].") - new /obj/item/weapon/circuitboard/mecha/odysseus/peripherals(get_turf(holder)) + new /obj/item/circuitboard/mecha/odysseus/peripherals(get_turf(holder)) holder.icon_state = "odysseus6" if(6) if(diff==FORWARD) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index da8c1c26c79..6f1348c7415 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -4,7 +4,7 @@ icon_screen = "mecha" icon_keyboard = "tech_key" req_access = list(ACCESS_ROBOTICS) - circuit = /obj/item/weapon/circuitboard/computer/mecha_control + circuit = /obj/item/circuitboard/computer/mecha_control var/list/located = list() var/screen = 0 var/stored_data @@ -123,10 +123,10 @@ ai_beacon = TRUE -/obj/item/weapon/storage/box/mechabeacons +/obj/item/storage/box/mechabeacons name = "exosuit tracking beacons" -/obj/item/weapon/storage/box/mechabeacons/New() +/obj/item/storage/box/mechabeacons/New() ..() new /obj/item/mecha_parts/mecha_tracking(src) new /obj/item/mecha_parts/mecha_tracking(src) diff --git a/code/game/mecha/mecha_defense.dm b/code/game/mecha/mecha_defense.dm index 94f68c66d0e..7091bfd72a7 100644 --- a/code/game/mecha/mecha_defense.dm +++ b/code/game/mecha/mecha_defense.dm @@ -171,8 +171,8 @@ if(W.GetID()) if(add_req_access || maint_access) if(internals_access_allowed(user)) - var/obj/item/weapon/card/id/id_card - if(istype(W, /obj/item/weapon/card/id)) + var/obj/item/card/id/id_card + if(istype(W, /obj/item/card/id)) id_card = W else var/obj/item/device/pda/pda = W @@ -183,7 +183,7 @@ to_chat(user, "Invalid ID: Access denied.") else to_chat(user, "Maintenance protocols disabled by operator.") - else if(istype(W, /obj/item/weapon/wrench)) + else if(istype(W, /obj/item/wrench)) if(state==1) state = 2 to_chat(user, "You undo the securing bolts.") @@ -191,7 +191,7 @@ state = 1 to_chat(user, "You tighten the securing bolts.") return - else if(istype(W, /obj/item/weapon/crowbar)) + else if(istype(W, /obj/item/crowbar)) if(state==2) state = 3 to_chat(user, "You open the hatch to the power unit.") @@ -208,7 +208,7 @@ else to_chat(user, "You need two lengths of cable to fix this mech!") return - else if(istype(W, /obj/item/weapon/screwdriver) && user.a_intent != INTENT_HARM) + else if(istype(W, /obj/item/screwdriver) && user.a_intent != INTENT_HARM) if(internal_damage & MECHA_INT_TEMP_CONTROL) clearInternalDamage(MECHA_INT_TEMP_CONTROL) to_chat(user, "You repair the damaged temperature controller.") @@ -223,12 +223,12 @@ to_chat(user, "You screw the cell in place.") return - else if(istype(W, /obj/item/weapon/stock_parts/cell)) + else if(istype(W, /obj/item/stock_parts/cell)) if(state==4) if(!cell) if(!user.drop_item()) return - var/obj/item/weapon/stock_parts/cell/C = W + var/obj/item/stock_parts/cell/C = W to_chat(user, "You install the powercell.") C.forceMove(src) cell = C @@ -237,9 +237,9 @@ to_chat(user, "There's already a powercell installed.") return - else if(istype(W, /obj/item/weapon/weldingtool) && user.a_intent != INTENT_HARM) + else if(istype(W, /obj/item/weldingtool) && user.a_intent != INTENT_HARM) user.changeNext_move(CLICK_CD_MELEE) - var/obj/item/weapon/weldingtool/WT = W + var/obj/item/weldingtool/WT = W if(obj_integrity
Name: [active1.fields["name"]]