Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

Conflicts: README.txt SQL/tgstation_schema.sql baystation12.dme code/ATMOSPHERICS/components/unary/vent_pump.dm code/ATMOSPHERICS/pipes.dm code/FEA/FEA_airgroup.dm code/FEA/FEA_fire.dm code/FEA/FEA_gas_mixture.dm code/FEA/FEA_turf_tile.dm code/TriDimension/Pipes.dm code/WorkInProgress/buildmode.dm code/WorkInProgress/organs/organs.dm code/WorkInProgress/virus2/Disease2/analyser.dm code/WorkInProgress/virus2/Disease2/biohazard destroyer.dm code/WorkInProgress/virus2/Disease2/cureimplanter.dm code/WorkInProgress/virus2/Disease2/diseasesplicer.dm code/WorkInProgress/virus2/Disease2/dishincubator.dm code/WorkInProgress/virus2/Disease2/isolator.dm code/WorkInProgress/virus2/Disease2/monkeydispensor.dm code/WorkInProgress/virus2/analyser.dm code/WorkInProgress/virus2/antibodies.dm code/WorkInProgress/virus2/base.dm code/WorkInProgress/virus2/biohazard destroyer.dm code/WorkInProgress/virus2/cureimplanter.dm code/WorkInProgress/virus2/curer.dm code/WorkInProgress/virus2/diseasesplicer.dm code/WorkInProgress/virus2/dishincubator.dm code/WorkInProgress/virus2/isolator.dm code/WorkInProgress/virus2/monkeydispensor.dm code/datums/ai_laws.dm code/datums/configuration.dm code/datums/datumvars.dm code/datums/diseases/alien_embryo.dm code/datums/diseases/appendicitis.dm code/datums/diseases/robotic_transformation.dm code/datums/diseases/xeno_transformation.dm code/datums/helper_datums/getrev.dm code/datums/helper_datums/teleport.dm code/datums/helper_datums/tension.dm code/datums/mind.dm code/datums/mixed.dm code/datums/shuttle_controller.dm code/datums/spell.dm code/datums/spells/ethereal_jaunt.dm code/datums/spells/genetic.dm code/datums/spells/wizard.dm code/defines/area/Space Station 13 areas.dm code/defines/atom.dm code/defines/global.dm code/defines/mob/dead/observer.dm code/defines/mob/living/carbon/alien.dm code/defines/mob/living/carbon/alien_humanoid.dm code/defines/mob/living/carbon/carbon.dm code/defines/mob/living/carbon/metroid.dm code/defines/mob/living/carbon/monkey.dm code/defines/mob/living/living.dm code/defines/mob/living/silicon/ai.dm code/defines/mob/living/silicon/robot.dm code/defines/obj.dm code/defines/obj/closet.dm code/defines/obj/clothing.dm code/defines/obj/clothing/costume.dm code/defines/obj/computer.dm code/defines/obj/costume.dm code/defines/obj/decal.dm code/defines/obj/door.dm code/defines/obj/hydro.dm code/defines/obj/machinery.dm code/defines/obj/storage.dm code/defines/obj/supplypacks.dm code/defines/obj/toy.dm code/defines/obj/vending.dm code/defines/obj/weapon.dm code/defines/procs/AStar.dm code/defines/procs/command_name.dm code/defines/procs/dbcore.dm code/defines/procs/forum_activation.dm code/defines/procs/gamehelpers.dm code/defines/procs/helpers.dm code/defines/procs/icon_procs.dm code/defines/procs/station_name.dm code/defines/procs/statistics.dm code/defines/turf.dm code/game/algorithm.dm code/game/area/areas.dm code/game/asteroid/artifacts.dm code/game/atom_procs.dm code/game/cellautomata.dm code/game/dna.dm code/game/events/EventProcs/clang.dm code/game/events/EventProcs/dust.dm code/game/events/EventProcs/ninja_abilities.dm code/game/events/EventProcs/ninja_equipment.dm code/game/events/EventProcs/space_ninja.dm code/game/events/EventProcs/spacevines.dm code/game/gamemodes/blob/blob.dm code/game/gamemodes/blob/blob_finish.dm code/game/gamemodes/blob/blob_report.dm code/game/gamemodes/blob/theblob.dm code/game/gamemodes/changeling/changeling.dm code/game/gamemodes/changeling/changeling_powers.dm code/game/gamemodes/changeling/modularchangling.dm code/game/gamemodes/changeling/traitor_chan.dm code/game/gamemodes/cult/cult.dm code/game/gamemodes/cult/cult_items.dm code/game/gamemodes/cult/cult_structures.dm code/game/gamemodes/events.dm code/game/gamemodes/events/black_hole.dm code/game/gamemodes/events/miniblob.dm code/game/gamemodes/factions.dm code/game/gamemodes/game_mode.dm code/game/gamemodes/gameticker.dm code/game/gamemodes/malfunction/malfunction.dm code/game/gamemodes/meteor/meteor.dm code/game/gamemodes/meteor/meteors.dm code/game/gamemodes/nuclear/nuclear.dm code/game/gamemodes/nuclear/nuclearbomb.dm code/game/gamemodes/nuclear/pinpointer.dm code/game/gamemodes/objective.dm code/game/gamemodes/revolution/revolution.dm code/game/gamemodes/sandbox/h_sandbox.dm code/game/gamemodes/sandbox/sandbox.dm code/game/gamemodes/setupgame.dm code/game/gamemodes/traitor/traitor.dm code/game/gamemodes/wizard/rightandwrong.dm code/game/gamemodes/wizard/soulstone.dm code/game/gamemodes/wizard/spellbook.dm code/game/gamemodes/wizard/spells.dm code/game/gamemodes/wizard/veilrender.dm code/game/gamemodes/wizard/wizard.dm code/game/hud.dm code/game/jobs/access.dm code/game/jobs/job/captain.dm code/game/jobs/job/civilian.dm code/game/jobs/job/civilian_chaplain.dm code/game/jobs/job/engineering.dm code/game/jobs/job/job.dm code/game/jobs/job/medical.dm code/game/jobs/job/science.dm code/game/jobs/job/security.dm code/game/jobs/job/silicon.dm code/game/jobs/job_controller.dm code/game/jobs/jobs.dm code/game/machinery/Beacon.dm code/game/machinery/OpTable.dm code/game/machinery/Sleeper.dm code/game/machinery/alarm.dm code/game/machinery/atmo_control.dm code/game/machinery/atmoalter/area_atmos_computer.dm code/game/machinery/autolathe.dm code/game/machinery/biogenerator.dm code/game/machinery/bots/bots.dm code/game/machinery/bots/cleanbot.dm code/game/machinery/bots/ed209bot.dm code/game/machinery/bots/floorbot.dm code/game/machinery/bots/medbot.dm code/game/machinery/bots/mulebot.dm code/game/machinery/camera.dm code/game/machinery/cell_charger.dm code/game/machinery/cloning.dm code/game/machinery/computer/HolodeckControl.dm code/game/machinery/computer/Operating.dm code/game/machinery/computer/ai_core.dm code/game/machinery/computer/arcade.dm code/game/machinery/computer/atmos_alert.dm code/game/machinery/computer/buildandrepair.dm code/game/machinery/computer/card.dm code/game/machinery/computer/cloning.dm code/game/machinery/computer/communications.dm code/game/machinery/computer/computer.dm code/game/machinery/computer/crew.dm code/game/machinery/computer/hologram.dm code/game/machinery/computer/law.dm code/game/machinery/computer/medical.dm code/game/machinery/computer/message.dm code/game/machinery/computer/pod.dm code/game/machinery/computer/power.dm code/game/machinery/computer/prisoner.dm code/game/machinery/computer/robot.dm code/game/machinery/computer/security.dm code/game/machinery/computer/shuttle.dm code/game/machinery/constructable_frame.dm code/game/machinery/deployable.dm code/game/machinery/door_control.dm code/game/machinery/doors/airlock.dm code/game/machinery/doors/airlock_electronics.dm code/game/machinery/doors/brigdoors.dm code/game/machinery/doors/door.dm code/game/machinery/doors/firedoor.dm code/game/machinery/doors/poddoor.dm code/game/machinery/doors/unpowered.dm code/game/machinery/doors/windowdoor.dm code/game/machinery/flasher.dm code/game/machinery/gateway.dm code/game/machinery/hologram.dm code/game/machinery/hydroponics.dm code/game/machinery/kitchen/gibber.dm code/game/machinery/morgue.dm code/game/machinery/newscaster.dm code/game/machinery/pipe/construction.dm code/game/machinery/pipe/pipe_dispenser.dm code/game/machinery/portable_turret.dm code/game/machinery/recharger.dm code/game/machinery/rechargestation.dm code/game/machinery/requests_console.dm code/game/machinery/shieldgen.dm code/game/machinery/spaceheater.dm code/game/machinery/suit_storage_unit.dm code/game/machinery/syndicatebeacon.dm code/game/machinery/telecomms/broadcaster.dm code/game/machinery/telecomms/logbrowser.dm code/game/machinery/telecomms/machine_interactions.dm code/game/machinery/telecomms/telemonitor.dm code/game/machinery/telecomms/traffic_control.dm code/game/machinery/teleporter.dm code/game/machinery/turrets.dm code/game/machinery/vending.dm code/game/magic/cultist/ritual.dm code/game/magic/cultist/runes.dm code/game/magic/library.dm code/game/magic/musician.dm code/game/master_controller.dm code/game/mecha/combat/combat.dm code/game/mecha/combat/gygax.dm code/game/mecha/equipment/mecha_equipment.dm code/game/mecha/equipment/tools/tools.dm code/game/mecha/equipment/weapons/weapons.dm code/game/mecha/mech_fabricator.dm code/game/mecha/mecha.dm code/game/mecha/mecha_construction_paths.dm code/game/mecha/mecha_wreckage.dm code/game/mecha/medical/medical.dm code/game/mecha/medical/odysseus.dm code/game/mecha/working/ripley.dm code/game/objects/alien/facehugger.dm code/game/objects/alien/resin.dm code/game/objects/bodybag.dm code/game/objects/closets.dm code/game/objects/closets/emergency.dm code/game/objects/closets/extinguisher.dm code/game/objects/closets/fireaxe.dm code/game/objects/closets/firecloset.dm code/game/objects/closets/fitnesscloset.dm code/game/objects/closets/janitor.dm code/game/objects/closets/kitchen.dm code/game/objects/closets/nuclear.dm code/game/objects/closets/secure/bar.dm code/game/objects/closets/secure/cargo.dm code/game/objects/closets/secure/engineering.dm code/game/objects/closets/secure/hydroponics.dm code/game/objects/closets/secure/medical.dm code/game/objects/closets/secure/personal.dm code/game/objects/closets/secure/scientist.dm code/game/objects/closets/secure/secure_closets.dm code/game/objects/closets/secure/security.dm code/game/objects/closets/syndicate.dm code/game/objects/closets/wardrobe.dm code/game/objects/contraband.dm code/game/objects/crates.dm code/game/objects/devices/PDA/PDA.dm code/game/objects/devices/PDA/cart.dm code/game/objects/devices/PDA/chatroom.dm code/game/objects/devices/aicard.dm code/game/objects/devices/flash.dm code/game/objects/devices/flashlight.dm code/game/objects/devices/paicard.dm code/game/objects/devices/scanners.dm code/game/objects/devices/taperecorder.dm code/game/objects/devices/traitordevices.dm code/game/objects/door_assembly.dm code/game/objects/effect_system.dm code/game/objects/electricchair.dm code/game/objects/explosion.dm code/game/objects/gibs.dm code/game/objects/grille.dm code/game/objects/items.dm code/game/objects/items/blueprints.dm code/game/objects/items/candle.dm code/game/objects/items/clothing.dm code/game/objects/items/food.dm code/game/objects/items/helper_procs.dm code/game/objects/items/item.dm code/game/objects/items/robot_items.dm code/game/objects/items/robot_parts.dm code/game/objects/items/tk_grab.dm code/game/objects/items/weapons/AI_modules.dm code/game/objects/items/weapons/RCD.dm code/game/objects/items/weapons/RSF.dm code/game/objects/items/weapons/cameras.dm code/game/objects/items/weapons/cards_ids.dm code/game/objects/items/weapons/cigs_lighters.dm code/game/objects/items/weapons/clown_items.dm code/game/objects/items/weapons/dna_injector.dm code/game/objects/items/weapons/explosives.dm code/game/objects/items/weapons/flamethrower.dm code/game/objects/items/weapons/grenades.dm code/game/objects/items/weapons/hand_lablers.dm code/game/objects/items/weapons/hydroponics.dm code/game/objects/items/weapons/implants/implant.dm code/game/objects/items/weapons/implants/implantcase.dm code/game/objects/items/weapons/implants/implantchair.dm code/game/objects/items/weapons/implants/implanter.dm code/game/objects/items/weapons/implants/implantfreedom.dm code/game/objects/items/weapons/implants/implantnanoaug.dm code/game/objects/items/weapons/implants/implantpad.dm code/game/objects/items/weapons/kitchen.dm code/game/objects/items/weapons/manuals.dm code/game/objects/items/weapons/medical.dm code/game/objects/items/weapons/mops_cleaners.dm code/game/objects/items/weapons/papers_bins.dm code/game/objects/items/weapons/stunbaton.dm code/game/objects/items/weapons/surgery_tools.dm code/game/objects/items/weapons/swords_axes_etc.dm code/game/objects/items/weapons/table_rack_parts.dm code/game/objects/items/weapons/tools.dm code/game/objects/items/weapons/twohanded.dm code/game/objects/items/weapons/wrappingpaper.dm code/game/objects/mineral_doors.dm code/game/objects/radio/beacon.dm code/game/objects/radio/electropack.dm code/game/objects/radio/encryptionkey.dm code/game/objects/radio/headset.dm code/game/objects/radio/intercom.dm code/game/objects/radio/radio.dm code/game/objects/secstorage/sbriefcase.dm code/game/objects/secstorage/ssafe.dm code/game/objects/stacks/glass.dm code/game/objects/stacks/metal.dm code/game/objects/stacks/stack.dm code/game/objects/stacks/wood.dm code/game/objects/stool.dm code/game/objects/storage/backpack.dm code/game/objects/storage/belt.dm code/game/objects/storage/bible.dm code/game/objects/storage/briefcase.dm code/game/objects/storage/lockbox.dm code/game/objects/storage/storage.dm code/game/objects/storage/uplink_kits.dm code/game/objects/structures.dm code/game/objects/tables_racks.dm code/game/objects/tank.dm code/game/objects/tanks/emergency.dm code/game/objects/tanks/jetpack.dm code/game/objects/toys.dm code/game/objects/transfer_valve.dm code/game/objects/uplinks.dm code/game/objects/watercloset.dm code/game/objects/weapons.dm code/game/objects/windoor_assembly.dm code/game/objects/window.dm code/game/prisonshuttle.dm code/game/smoothwall.dm code/game/sound.dm code/game/step_triggers.dm code/game/structure/structure.dm code/game/supplyshuttle.dm code/game/throwing.dm code/game/topic.dm code/game/turf.dm code/game/vehicles/airtight/airtight.dm code/game/vehicles/airtight/land.dm code/game/vehicles/airtight/space.dm code/game/vehicles/vehicle.dm code/game/verbs/ooc.dm code/game/verbs/sound.dm code/game/verbs/suicide.dm code/game/verbs/who.dm code/game/vote.dm code/modules/admin/IsBanned.dm code/modules/admin/NewBan.dm code/modules/admin/admin.dm code/modules/admin/admin_investigate.dm code/modules/admin/admin_memo.dm code/modules/admin/admin_verbs.dm code/modules/admin/banjob.dm code/modules/admin/create_mob.dm code/modules/admin/create_object.dm code/modules/admin/create_turf.dm code/modules/admin/player_panel.dm code/modules/admin/verbs/MC.dm code/modules/admin/verbs/adminhelp.dm code/modules/admin/verbs/adminjump.dm code/modules/admin/verbs/adminpm.dm code/modules/admin/verbs/adminsay.dm code/modules/admin/verbs/atmosdebug.dm code/modules/admin/verbs/cinematic.dm code/modules/admin/verbs/deadsay.dm code/modules/admin/verbs/debug.dm code/modules/admin/verbs/diagnostics.dm code/modules/admin/verbs/getlogs.dm code/modules/admin/verbs/mapping.dm code/modules/admin/verbs/massmodvar.dm code/modules/admin/verbs/modifyvariables.dm code/modules/admin/verbs/onlyone.dm code/modules/admin/verbs/playsound.dm code/modules/admin/verbs/possess.dm code/modules/admin/verbs/pray.dm code/modules/admin/verbs/randomverbs.dm code/modules/admin/verbs/striketeam.dm code/modules/admin/verbs/striketeam_syndicate.dm code/modules/assembly/assembly.dm code/modules/assembly/signaler.dm code/modules/chemical/Chemistry-Machinery.dm code/modules/chemical/Chemistry-Tools.dm code/modules/client/client defines.dm code/modules/client/client procs.dm code/modules/clothing/costume.dm code/modules/clothing/gimmick.dm code/modules/clothing/glasses.dm code/modules/clothing/glasses/glasses.dm code/modules/clothing/glasses/hud.dm code/modules/clothing/gloves.dm code/modules/clothing/head/hardhat.dm code/modules/clothing/jumpsuit.dm code/modules/clothing/mask.dm code/modules/clothing/shoes.dm code/modules/clothing/spacesuit.dm code/modules/clothing/spacesuits/captain.dm code/modules/clothing/spacesuits/miscellaneous.dm code/modules/clothing/spacesuits/ninja.dm code/modules/clothing/spacesuits/rig.dm code/modules/clothing/spacesuits/syndi.dm code/modules/clothing/spacesuits/void.dm code/modules/clothing/suit.dm code/modules/clothing/suits/armor.dm code/modules/clothing/suits/bio.dm code/modules/clothing/suits/bomb.dm code/modules/clothing/suits/detective.dm code/modules/clothing/suits/fire.dm code/modules/clothing/suits/heavy.dm code/modules/clothing/suits/hos.dm code/modules/clothing/suits/labcoat.dm code/modules/clothing/suits/miscellaneous.dm code/modules/clothing/suits/wiz_robe.dm code/modules/clothing/uniforms/lawyer.dm code/modules/critters/critter.dm code/modules/critters/critter_AI.dm code/modules/critters/critters.dm code/modules/critters/hivebots/hivebot.dm code/modules/flufftext/Dreaming.dm code/modules/flufftext/Hallucination.dm code/modules/flufftext/TextFilters.dm code/modules/food/food.dm code/modules/food/meat.dm code/modules/food/recipes_microwave.dm code/modules/maps/SwapMaps.dm code/modules/maps/dmm_suite.dm code/modules/maps/fromdmp.dm code/modules/maps/randomZlevel.dm code/modules/maps/reader.dm code/modules/maps/writer.dm code/modules/mining/machine_processing.dm code/modules/mining/machine_stacking.dm code/modules/mining/machine_unloading.dm code/modules/mining/mine_items.dm code/modules/mining/mine_turfs.dm code/modules/mining/mint.dm code/modules/mining/ores_materials_coins.dm code/modules/mining/satchel_ore_boxdm.dm code/modules/mob/dead/death.dm code/modules/mob/dead/observer/observer.dm code/modules/mob/death.dm code/modules/mob/living/blob/blob.dm code/modules/mob/living/carbon/alien/alien.dm code/modules/mob/living/carbon/alien/death.dm code/modules/mob/living/carbon/alien/humanoid/alien_powers.dm code/modules/mob/living/carbon/alien/humanoid/caste/drone.dm code/modules/mob/living/carbon/alien/humanoid/caste/hunter.dm code/modules/mob/living/carbon/alien/humanoid/caste/sentinel.dm code/modules/mob/living/carbon/alien/humanoid/death.dm code/modules/mob/living/carbon/alien/humanoid/hud.dm code/modules/mob/living/carbon/alien/humanoid/humanoid.dm code/modules/mob/living/carbon/alien/humanoid/life.dm code/modules/mob/living/carbon/alien/humanoid/login.dm code/modules/mob/living/carbon/alien/humanoid/queen.dm code/modules/mob/living/carbon/alien/larva/death.dm code/modules/mob/living/carbon/alien/larva/hud.dm code/modules/mob/living/carbon/alien/larva/larva.dm code/modules/mob/living/carbon/alien/larva/life.dm code/modules/mob/living/carbon/alien/larva/login.dm code/modules/mob/living/carbon/alien/larva/powers.dm code/modules/mob/living/carbon/alien/special/_main.dm code/modules/mob/living/carbon/alien/special/snakeman.dm code/modules/mob/living/carbon/brain/MMI.dm code/modules/mob/living/carbon/brain/brain.dm code/modules/mob/living/carbon/brain/death.dm code/modules/mob/living/carbon/brain/hud.dm code/modules/mob/living/carbon/brain/life.dm code/modules/mob/living/carbon/brain/say.dm code/modules/mob/living/carbon/carbon.dm code/modules/mob/living/carbon/human/death.dm code/modules/mob/living/carbon/human/emote.dm code/modules/mob/living/carbon/human/examine.dm code/modules/mob/living/carbon/human/hud.dm code/modules/mob/living/carbon/human/human.dm code/modules/mob/living/carbon/human/human_attackalien.dm code/modules/mob/living/carbon/human/human_attackhand.dm code/modules/mob/living/carbon/human/human_damage.dm code/modules/mob/living/carbon/human/human_defense.dm code/modules/mob/living/carbon/human/life.dm code/modules/mob/living/carbon/human/login.dm code/modules/mob/living/carbon/human/say.dm code/modules/mob/living/carbon/human/whisper.dm code/modules/mob/living/carbon/metroid/death.dm code/modules/mob/living/carbon/metroid/examine.dm code/modules/mob/living/carbon/metroid/life.dm code/modules/mob/living/carbon/metroid/login.dm code/modules/mob/living/carbon/metroid/metroid.dm code/modules/mob/living/carbon/metroid/powers.dm code/modules/mob/living/carbon/monkey/death.dm code/modules/mob/living/carbon/monkey/examine.dm code/modules/mob/living/carbon/monkey/hud.dm code/modules/mob/living/carbon/monkey/life.dm code/modules/mob/living/carbon/monkey/login.dm code/modules/mob/living/carbon/monkey/monkey.dm code/modules/mob/living/carbon/monkey/powers.dm code/modules/mob/living/damage_procs.dm code/modules/mob/living/living.dm code/modules/mob/living/living_defense.dm code/modules/mob/living/login.dm code/modules/mob/living/say.dm code/modules/mob/living/silicon/ai/ai.dm code/modules/mob/living/silicon/ai/death.dm code/modules/mob/living/silicon/ai/examine.dm code/modules/mob/living/silicon/ai/life.dm code/modules/mob/living/silicon/ai/login.dm code/modules/mob/living/silicon/ai/move.dm code/modules/mob/living/silicon/death.dm code/modules/mob/living/silicon/decoy/death.dm code/modules/mob/living/silicon/pai/death.dm code/modules/mob/living/silicon/pai/hud.dm code/modules/mob/living/silicon/pai/pai.dm code/modules/mob/living/silicon/pai/recruit.dm code/modules/mob/living/silicon/pai/software.dm code/modules/mob/living/silicon/robot/death.dm code/modules/mob/living/silicon/robot/emote.dm code/modules/mob/living/silicon/robot/examine.dm code/modules/mob/living/silicon/robot/hud.dm code/modules/mob/living/silicon/robot/life.dm code/modules/mob/living/silicon/robot/login.dm code/modules/mob/living/silicon/robot/robot.dm code/modules/mob/living/silicon/robot/robot_modules.dm code/modules/mob/living/silicon/robot/say.dm code/modules/mob/living/silicon/robot/wires.dm code/modules/mob/living/silicon/say.dm code/modules/mob/living/simple_animal/life.dm code/modules/mob/login.dm code/modules/mob/logout.dm code/modules/mob/mob.dm code/modules/mob/mob_cleanup.dm code/modules/mob/mob_defines.dm code/modules/mob/mob_grab.dm code/modules/mob/mob_helpers.dm code/modules/mob/mob_movement.dm code/modules/mob/mob_transformation_simple.dm code/modules/mob/new_player/login.dm code/modules/mob/new_player/new_player.dm code/modules/mob/new_player/preferences.dm code/modules/mob/new_player/preferences_setup.dm code/modules/mob/new_player/savefile.dm code/modules/mob/new_player/sprite_accessories.dm code/modules/mob/organ/organ.dm code/modules/mob/organ/organ_external.dm code/modules/mob/organ/pain.dm code/modules/mob/say.dm code/modules/mob/screen.dm code/modules/mob/simple_animal/crab.dm code/modules/mob/transform_procs.dm code/modules/paperwork/clipboard.dm code/modules/paperwork/filingcabinet.dm code/modules/paperwork/folders.dm code/modules/paperwork/handlabeler.dm code/modules/paperwork/paper.dm code/modules/paperwork/paperbin.dm code/modules/paperwork/pen.dm code/modules/paperwork/photocopier.dm code/modules/paperwork/stamps.dm code/modules/power/antimatter/computer.dm code/modules/power/antimatter/engine.dm code/modules/power/antimatter/fuel.dm code/modules/power/apc.dm code/modules/power/cable.dm code/modules/power/cable_heavyduty.dm code/modules/power/cell.dm code/modules/power/generator.dm code/modules/power/generator_type2.dm code/modules/power/gravitygenerator.dm code/modules/power/lighting.dm code/modules/power/port_gen.dm code/modules/power/sd_DynamicAreaLighting.dm code/modules/power/singularity/collector.dm code/modules/power/singularity/containment_field.dm code/modules/power/singularity/emitter.dm code/modules/power/singularity/field_generator.dm code/modules/power/singularity/generator.dm code/modules/power/singularity/investigate.dm code/modules/power/singularity/particle_accelerator/particle.dm code/modules/power/singularity/particle_accelerator/particle_accelerator.dm code/modules/power/singularity/particle_accelerator/particle_chamber.dm code/modules/power/singularity/particle_accelerator/particle_control.dm code/modules/power/singularity/particle_accelerator/particle_emitter.dm code/modules/power/singularity/particle_accelerator/particle_power.dm code/modules/power/singularity/singularity.dm code/modules/power/smes.dm code/modules/power/solar.dm code/modules/power/switch.dm code/modules/power/turbine.dm code/modules/projectiles/ammunition.dm code/modules/projectiles/gun.dm code/modules/projectiles/guns/energy.dm code/modules/projectiles/guns/energy/laser.dm code/modules/projectiles/guns/energy/nuclear.dm code/modules/projectiles/guns/energy/pulse.dm code/modules/projectiles/guns/energy/special.dm code/modules/projectiles/guns/energy/stun.dm code/modules/projectiles/guns/projectile.dm code/modules/projectiles/guns/projectile/pistol.dm code/modules/projectiles/guns/projectile/revolver.dm code/modules/projectiles/guns/projectile/shotgun.dm code/modules/projectiles/projectile.dm code/modules/projectiles/projectile/beams.dm code/modules/projectiles/projectile/bullets.dm code/modules/projectiles/projectile/change.dm code/modules/projectiles/projectile/special.dm code/modules/reagents/Chemistry-Holder.dm code/modules/reagents/Chemistry-Reagents.dm code/modules/reagents/Chemistry-Recipes.dm code/modules/recycling/conveyor2.dm code/modules/recycling/disposal-construction.dm code/modules/recycling/disposal.dm code/modules/recycling/sortingmachinery.dm code/modules/research/designs.dm code/modules/research/destructive_analyzer.dm code/modules/research/message_server.dm code/modules/research/protolathe.dm code/modules/research/rdconsole.dm code/modules/research/rdmachines.dm code/modules/research/research.dm code/modules/research/server.dm code/modules/scripting/AST/Operators/Binary Operators.dm code/modules/scripting/Implementations/Telecomms.dm code/modules/scripting/Parser/Keywords.dm code/modules/scripting/Scanner/Tokens.dm code/modules/scripting/stack.dm code/modules/security levels/keycard authentication.dm code/modules/security levels/security levels.dm code/setup.dm code/stylesheet.dm code/unused/AI_Visibility.dm code/unused/Ultralight.dm code/unused/airtunnel.dm code/unused/beast/bodypart.dm code/unused/conveyor.dm code/unused/disease2/analyser.dm code/unused/disease2/base.dm code/unused/disease2/biohazard destroyer.dm code/unused/disease2/cureimplanter.dm code/unused/disease2/curer.dm code/unused/disease2/diseasesplicer.dm code/unused/disease2/dishincubator.dm code/unused/disease2/isolator.dm code/unused/disease2/monkeydispensor.dm code/unused/dna.dm code/unused/gamemodes/deathmatch.dm code/unused/jobs.dm code/unused/mining/datum_processing_recipe.dm code/unused/mining/spaceship_builder_unused.dm code/unused/new_year.dm code/unused/spacecraft/manufacturing.dm code/unused/spacecraft/shipcore.dm config/README feedback.txt config/admins.txt config/config.txt config/rules.html data/mode.txt html/add-to-changelog.html html/archivedchangelog.html html/changelog.css html/changelog.html html/changelog.js icons/effects/blood.dmi icons/effects/genetics.dmi icons/misc/fullscreen.dmi icons/mob/AI.dmi icons/mob/alien.dmi icons/mob/animal.dmi icons/mob/back.dmi icons/mob/belt.dmi icons/mob/blob.dmi icons/mob/critter.dmi icons/mob/dam_human.dmi icons/mob/eyes.dmi icons/mob/feet.dmi icons/mob/hands.dmi icons/mob/head.dmi icons/mob/human.dmi icons/mob/human_face.dmi icons/mob/items_lefthand.dmi icons/mob/items_righthand.dmi icons/mob/livestock.dmi icons/mob/mask.dmi icons/mob/mecha.dmi icons/mob/mob.dmi icons/mob/monkey.dmi icons/mob/robots.dmi icons/mob/screen1.dmi icons/mob/screen1_Midnight.dmi icons/mob/screen1_Orange.dmi icons/mob/screen1_alien.dmi icons/mob/screen1_old.dmi icons/mob/suit.dmi icons/mob/uniform.dmi icons/mob/zone_sel.dmi icons/obj/Cryogenic2.dmi icons/obj/aibots.dmi icons/obj/ammo.dmi icons/obj/atmos.dmi icons/obj/bureaucracy.dmi icons/obj/card.dmi icons/obj/cigarettes.dmi icons/obj/closet.dmi icons/obj/clothing/glasses.dmi icons/obj/clothing/gloves.dmi icons/obj/clothing/hats.dmi icons/obj/clothing/masks.dmi icons/obj/clothing/shoes.dmi icons/obj/clothing/suits.dmi icons/obj/clothing/uniforms.dmi icons/obj/computer.dmi icons/obj/contraband.dmi icons/obj/decals.dmi icons/obj/device.dmi icons/obj/doors/DoorHazard.dmi icons/obj/doors/door_assembly.dmi icons/obj/drinks.dmi icons/obj/engine.dmi icons/obj/food.dmi icons/obj/grenade.dmi icons/obj/gun.dmi icons/obj/harvest.dmi icons/obj/hydroponics.dmi icons/obj/items.dmi icons/obj/janitor.dmi icons/obj/library.dmi icons/obj/lighting.dmi icons/obj/machines/field_generator.dmi icons/obj/machines/gateway.dmi icons/obj/machines/mining_machines.dmi icons/obj/machines/particle_accelerator.dmi icons/obj/meter.dmi icons/obj/mining.dmi icons/obj/objects.dmi icons/obj/paper.dmi icons/obj/pda.dmi icons/obj/pipes/disposal.dmi icons/obj/plants.dmi icons/obj/power.dmi icons/obj/projectiles.dmi icons/obj/robotics.dmi icons/obj/seeds.dmi icons/obj/singularity.dmi icons/obj/stationobjs.dmi icons/obj/stock_parts.dmi icons/obj/storage.dmi icons/obj/structures.dmi icons/obj/surgery.dmi icons/obj/syringe.dmi icons/obj/tank.dmi icons/obj/terminals.dmi icons/obj/toy.dmi icons/obj/vending.dmi icons/obj/watercloset.dmi icons/obj/weapons.dmi icons/obj/wizard.dmi icons/turf/areas.dmi icons/turf/floors.dmi icons/turf/walls.dmi interface/interface.dm interface/skin.dmf maps/Antiqua.dmm maps/RandomZLevels/assistantChamber.dmm maps/RandomZLevels/fileList.txt maps/tgstation.2.0.9.dmm sound/AI/animes.ogg sound/AI/newroundsexy.ogg sound/AI/newroundsexy2.ogg sound/effects/adminhelp.ogg tools/UnstandardnessTestForDM/UnstandardnessTestForDM.sln tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Form1.resx tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Program.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/AssemblyInfo.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Resources.resx tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.Designer.cs tools/UnstandardnessTestForDM/UnstandardnessTestForDM/Properties/Settings.settings tools/UnstandardnessTestForDM/UnstandardnessTestForDM/UnstandardnessTestForDM.csproj tools/UnstandardnessTestForDM/UnstandardnessTestForDM/bin/Debug/UnstandardnessTestForDM.vshost.exe.manifest tools/UnstandardnessTestForDM/UnstandardnessTestForDM/obj/x86/Debug/UnstandardnessTestForDM.csproj.FileListAbsolute.txt tools/expand_filedir_paths.py tools/readme.txt Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>
2026-07-20 11:34:19 +01:00 · 2012-08-22 04:00:11 +10:00
parent 7853488989 44fb70ffd4
commit c314b5f42b
1232 changed files with 108006 additions and 78117 deletions
@@ -1,19 +1,19 @@
-/**********************Input and output plates**************************/
-
-/obj/machinery/mineral/input
-	icon = 'screen1.dmi'
-	icon_state = "x2"
-	name = "Input area"
-	density = 0
-	anchored = 1.0
-	New()
-		icon_state = "blank"
-
-/obj/machinery/mineral/output
-	icon = 'screen1.dmi'
-	icon_state = "x"
-	name = "Output area"
-	density = 0
-	anchored = 1.0
-	New()
+/**********************Input and output plates**************************/
+
+/obj/machinery/mineral/input
+	icon = 'icons/mob/screen1.dmi'
+	icon_state = "x2"
+	name = "Input area"
+	density = 0
+	anchored = 1.0
+	New()
+		icon_state = "blank"
+
+/obj/machinery/mineral/output
+	icon = 'icons/mob/screen1.dmi'
+	icon_state = "x"
+	name = "Output area"
+	density = 0
+	anchored = 1.0
+	New()
 		icon_state = "blank"
@@ -2,11 +2,10 @@

 /obj/machinery/mineral/processing_unit_console
 	name = "production machine console"
-	icon = 'mining_machines.dmi'
+	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "console"
 	density = 1
 	anchored = 1
-	var/id = ""
 	var/obj/machinery/mineral/processing_unit/machine = null
 	var/machinedir = EAST

@@ -176,11 +175,10 @@

 /obj/machinery/mineral/processing_unit
 	name = "furnace"
-	icon = 'mining_machines.dmi'
+	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "furnace"
 	density = 1
 	anchored = 1.0
-	var/id = ""
 	var/obj/machinery/mineral/input = null
 	var/obj/machinery/mineral/output = null
 	var/obj/machinery/mineral/CONSOLE = null
@@ -313,28 +311,38 @@
 					continue*/


-				// A non valid combination was selected
+				//if a non valid combination is selected
+
 				var/b = 1 //this part checks if all required ores are available

-				if (!(selected_gold || selected_silver || selected_diamond || selected_uranium || selected_plasma || selected_iron || selected_glass || selected_clown))
-					b = 0
-				else if (selected_gold == 1 && ore_gold <= 0)
-					b = 0
-				else if (selected_silver == 1 && ore_silver <= 0)
-					b = 0
-				else if (selected_diamond == 1 && ore_diamond <= 0)
-					b = 0
-				else if (selected_uranium == 1 && ore_uranium <= 0)
-					b = 0
-				else if (selected_plasma == 1 && ore_plasma <= 0)
-					b = 0
-				else if (selected_iron == 1 && ore_iron <= 0)
-					b = 0
-				else if (selected_glass == 1 && ore_glass <= 0)
-					b = 0
-				else if (selected_clown == 1 && ore_clown <= 0)
+				if (!(selected_gold || selected_silver ||selected_diamond || selected_uranium | selected_plasma || selected_iron || selected_iron))
 					b = 0

+				if (selected_gold == 1)
+					if (ore_gold <= 0)
+						b = 0
+				if (selected_silver == 1)
+					if (ore_silver <= 0)
+						b = 0
+				if (selected_diamond == 1)
+					if (ore_diamond <= 0)
+						b = 0
+				if (selected_uranium == 1)
+					if (ore_uranium <= 0)
+						b = 0
+				if (selected_plasma == 1)
+					if (ore_plasma <= 0)
+						b = 0
+				if (selected_iron == 1)
+					if (ore_iron <= 0)
+						b = 0
+				if (selected_glass == 1)
+					if (ore_glass <= 0)
+						b = 0
+				if (selected_clown == 1)
+					if (ore_clown <= 0)
+						b = 0
+
 				if (b) //if they are, deduct one from each, produce slag and shut the machine off
 					if (selected_gold == 1)
 						ore_gold--
@@ -351,46 +359,47 @@
 					if (selected_clown == 1)
 						ore_clown--
 					new /obj/item/weapon/ore/slag(output.loc)
-
-				on = 0
-
-			else // on == 0
+					on = 0
+				else
+					on = 0
+					break
+				break
+			else
 				break
-
 		for (i = 0; i < 10; i++)
 			var/obj/item/O
 			O = locate(/obj/item, input.loc)
 			if (O)
 				if (istype(O,/obj/item/weapon/ore/iron))
-					ore_iron = ore_iron + O:amount;
+					ore_iron++;
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/glass))
-					ore_glass = ore_glass + O:amount;
+					ore_glass++;
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/diamond))
-					ore_diamond = ore_diamond + O:amount;
+					ore_diamond++;
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/plasma))
-					ore_plasma = ore_plasma + O:amount
+					ore_plasma++
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/gold))
-					ore_gold = ore_gold + O:amount
+					ore_gold++
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/silver))
-					ore_silver = ore_silver + O:amount
+					ore_silver++
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/uranium))
-					ore_uranium = ore_uranium + O:amount
+					ore_uranium++
 					del(O)
 					continue
 				if (istype(O,/obj/item/weapon/ore/clown))
-					ore_clown = ore_clown + O:amount
+					ore_clown++
 					del(O)
 					continue
 				O.loc = src.output.loc
@@ -2,11 +2,10 @@

 /obj/machinery/mineral/stacking_unit_console
 	name = "stacking machine console"
-	icon = 'mining_machines.dmi'
+	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "console"
 	density = 1
 	anchored = 1
-	var/id = ""
 	var/obj/machinery/mineral/stacking_machine/machine = null
 	var/machinedir = SOUTHEAST

@@ -43,6 +42,14 @@
 		dat += text("Uranium: [machine.ore_uranium] <A href='?src=\ref[src];release=uranium'>Release</A><br>")
 	if(machine.ore_diamond)
 		dat += text("Diamond: [machine.ore_diamond] <A href='?src=\ref[src];release=diamond'>Release</A><br>")
+	if(machine.ore_wood)
+		dat += text("Wood: [machine.ore_wood] <A href='?src=\ref[src];release=wood'>Release</A><br>")
+	if(machine.ore_cardboard)
+		dat += text("Cardboard: [machine.ore_cardboard] <A href='?src=\ref[src];release=cardboard'>Release</A><br>")
+	if(machine.ore_cloth)
+		dat += text("Cloth: [machine.ore_cloth] <A href='?src=\ref[src];release=cloth'>Release</A><br>")
+	if(machine.ore_leather)
+		dat += text("Leather: [machine.ore_leather] <A href='?src=\ref[src];release=leather'>Release</A><br>")
 	if(machine.ore_clown)
 		dat += text("Bananium: [machine.ore_clown] <A href='?src=\ref[src];release=clown'>Release</A><br>")
 	if(machine.ore_adamantine)
@@ -115,6 +122,30 @@
 					G.amount = machine.ore_plasteel
 					G.loc = machine.output.loc
 					machine.ore_plasteel = 0
+			if ("wood")
+				if (machine.ore_wood > 0)
+					var/obj/item/stack/sheet/wood/G = new /obj/item/stack/sheet/wood
+					G.amount = machine.ore_wood
+					G.loc = machine.output.loc
+					machine.ore_wood = 0
+			if ("cardboard")
+				if (machine.ore_cardboard > 0)
+					var/obj/item/stack/sheet/cardboard/G = new /obj/item/stack/sheet/cardboard
+					G.amount = machine.ore_cardboard
+					G.loc = machine.output.loc
+					machine.ore_cardboard = 0
+			if ("cloth")
+				if (machine.ore_cloth > 0)
+					var/obj/item/stack/sheet/cloth/G = new /obj/item/stack/sheet/cloth
+					G.amount = machine.ore_cloth
+					G.loc = machine.output.loc
+					machine.ore_cloth = 0
+			if ("leather")
+				if (machine.ore_leather > 0)
+					var/obj/item/stack/sheet/leather/G = new /obj/item/stack/sheet/leather
+					G.amount = machine.ore_diamond
+					G.loc = machine.output.loc
+					machine.ore_leather = 0
 			if ("clown")
 				if (machine.ore_clown > 0)
 					var/obj/item/stack/sheet/clown/G = new /obj/item/stack/sheet/clown
@@ -142,11 +173,10 @@

 /obj/machinery/mineral/stacking_machine
 	name = "stacking machine"
-	icon = 'mining_machines.dmi'
+	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "stacker"
 	density = 1
 	anchored = 1.0
-	var/id = ""
 	var/obj/machinery/mineral/stacking_unit_console/CONSOLE
 	var/stk_types = list()
 	var/stk_amt   = list()
@@ -162,6 +192,10 @@
 	var/ore_glass = 0;
 	var/ore_rglass = 0;
 	var/ore_plasteel = 0;
+	var/ore_wood = 0
+	var/ore_cardboard = 0
+	var/ore_cloth = 0;
+	var/ore_leather = 0;
 	var/ore_adamantine = 0;
 	var/ore_mythril = 0;
 	var/stack_amt = 50; //ammount to stack before releassing
@@ -232,6 +266,22 @@
 				ore_mythril+= O:amount
 				del(O)
 				continue
+			if (istype(O,/obj/item/stack/sheet/cardboard))
+				ore_cardboard+= O:amount
+				del(O)
+				continue
+			if (istype(O,/obj/item/stack/sheet/wood))
+				ore_wood+= O:amount
+				del(O)
+				continue
+			if (istype(O,/obj/item/stack/sheet/cloth))
+				ore_cloth+= O:amount
+				del(O)
+				continue
+			if (istype(O,/obj/item/stack/sheet/leather))
+				ore_leather+= O:amount
+				del(O)
+				continue
 			if (istype(O,/obj/item/weapon/ore/slag))
 				del(O)
 				continue
@@ -296,6 +346,30 @@
 		G.loc = output.loc
 		ore_plasteel -= stack_amt
 		return
+	if (ore_wood >= stack_amt)
+		var/obj/item/stack/sheet/wood/G = new /obj/item/stack/sheet/wood
+		G.amount = stack_amt
+		G.loc = output.loc
+		ore_wood -= stack_amt
+		return
+	if (ore_cardboard >= stack_amt)
+		var/obj/item/stack/sheet/cardboard/G = new /obj/item/stack/sheet/cardboard
+		G.amount = stack_amt
+		G.loc = output.loc
+		ore_cardboard -= stack_amt
+		return
+	if (ore_cloth >= stack_amt)
+		var/obj/item/stack/sheet/cloth/G = new /obj/item/stack/sheet/cloth
+		G.amount = stack_amt
+		G.loc = output.loc
+		ore_cloth -= stack_amt
+		return
+	if (ore_leather >= stack_amt)
+		var/obj/item/stack/sheet/leather/G = new /obj/item/stack/sheet/leather
+		G.amount = stack_amt
+		G.loc = output.loc
+		ore_leather -= stack_amt
+		return
 	if (ore_adamantine >= stack_amt)
 		var/obj/item/stack/sheet/adamantine/G = new /obj/item/stack/sheet/adamantine
 		G.amount = stack_amt
@@ -3,7 +3,7 @@

 /obj/machinery/mineral/unloading_machine
 	name = "unloading machine"
-	icon = 'mining_machines.dmi'
+	icon = 'icons/obj/machines/mining_machines.dmi'
 	icon_state = "unloader"
 	density = 1
 	anchored = 1.0
@@ -27,48 +27,6 @@
 	if (src.output && src.input)
 		if (locate(/obj/structure/ore_box, input.loc))
 			var/obj/structure/ore_box/BOX = locate(/obj/structure/ore_box, input.loc)
-			BOX.update()
-			if (BOX.amt_diamond > 0)
-				var/obj/item/weapon/ore/diamond/G = new /obj/item/weapon/ore/diamond
-				G.amount = BOX.amt_diamond
-				G.loc = output.loc
-				BOX.amt_diamond = 0
-			if (BOX.amt_glass > 0)
-				var/obj/item/weapon/ore/glass/G = new /obj/item/weapon/ore/glass
-				G.amount = BOX.amt_glass
-				G.loc = output.loc
-				BOX.amt_glass = 0
-			if (BOX.amt_plasma > 0)
-				var/obj/item/weapon/ore/plasma/G = new /obj/item/weapon/ore/plasma
-				G.amount = BOX.amt_plasma
-				G.loc = output.loc
-				BOX.amt_plasma = 0
-			if (BOX.amt_iron > 0)
-				var/obj/item/weapon/ore/iron/G = new /obj/item/weapon/ore/iron
-				G.amount = BOX.amt_iron
-				G.loc = output.loc
-				BOX.amt_iron = 0
-			if (BOX.amt_silver > 0)
-				var/obj/item/weapon/ore/silver/G = new /obj/item/weapon/ore/silver
-				G.amount = BOX.amt_silver
-				G.loc = output.loc
-				BOX.amt_silver = 0
-			if (BOX.amt_gold > 0)
-				var/obj/item/weapon/ore/gold/G = new /obj/item/weapon/ore/gold
-				G.amount = BOX.amt_gold
-				G.loc = output.loc
-				BOX.amt_gold = 0
-			if (BOX.amt_uranium > 0)
-				var/obj/item/weapon/ore/uranium/G = new /obj/item/weapon/ore/uranium
-				G.amount = BOX.amt_uranium
-				G.loc = output.loc
-				BOX.amt_uranium = 0
-			if (BOX.amt_clown > 0)
-				var/obj/item/weapon/ore/clown/G = new /obj/item/weapon/ore/clown
-				G.amount = BOX.amt_clown
-				G.loc = output.loc
-				BOX.amt_clown = 0
-
 			var/i = 0
 			for (var/obj/item/weapon/ore/O in BOX.contents)
 				BOX.contents -= O
@@ -1,53 +1,53 @@
-/**********************Mine areas**************************/
-
-/area/mine
-	icon_state = "mining"
-
-/area/mine/explored
-	name = "Mine"
-	icon_state = "explored"
-	music = null
-
-/area/mine/unexplored
-	name = "Mine"
-	icon_state = "unexplored"
-	music = null
-
-/area/mine/lobby
-	name = "Mining station"
-
-/area/mine/storage
-	name = "Mining station Storage"
-
-/area/mine/production
-	name = "Mining station Production Area"
-	icon_state = "mining_production"
-
-/area/mine/abandoned
-	name = "Abandoned Mining Station"
-
-/area/mine/living_quarters
-	name = "Mining Station Living Quarters"
-	icon_state = "mining_living"
-
-/area/mine/eva
-	name = "Mining station EVA"
-	icon_state = "mining_eva"
-
-/area/mine/maintenance
-	name = "Mining station Maintenance"
-
-/area/mine/cafeteria
-	name = "Mining station Cafeteria"
-
-/area/mine/hydroponics
-	name = "Mining station Hydroponics"
-
-/area/mine/sleeper
-	name = "Mining station Emergency Sleeper"
-
-/area/mine/north_outpost
-	name = "North Mining Outpost"
-
-/area/mine/west_outpost
+/**********************Mine areas**************************/
+
+/area/mine
+	icon_state = "mining"
+
+/area/mine/explored
+	name = "Mine"
+	icon_state = "explored"
+	music = null
+
+/area/mine/unexplored
+	name = "Mine"
+	icon_state = "unexplored"
+	music = null
+
+/area/mine/lobby
+	name = "Mining station"
+
+/area/mine/storage
+	name = "Mining station Storage"
+
+/area/mine/production
+	name = "Mining Station Starboard Wing"
+	icon_state = "mining_production"
+
+/area/mine/abandoned
+	name = "Abandoned Mining Station"
+
+/area/mine/living_quarters
+	name = "Mining Station Port Wing"
+	icon_state = "mining_living"
+
+/area/mine/eva
+	name = "Mining Station EVA"
+	icon_state = "mining_eva"
+
+/area/mine/maintenance
+	name = "Mining Station Communications"
+
+/area/mine/cafeteria
+	name = "Mining station Cafeteria"
+
+/area/mine/hydroponics
+	name = "Mining station Hydroponics"
+
+/area/mine/sleeper
+	name = "Mining station Emergency Sleeper"
+
+/area/mine/north_outpost
+	name = "North Mining Outpost"
+
+/area/mine/west_outpost
 	name = "West Mining Outpost"
@@ -2,7 +2,7 @@

 //this item is intended to give the effect of entering the mine, so that light gradually fades
 /obj/effect/light_emitter
-	name = "Light-emitter"
+	name = "Light-emtter"
 	anchored = 1
 	unacidable = 1
 	luminosity = 8
@@ -17,14 +17,25 @@
 	icon_opened = "miningsecopen"
 	icon_broken = "miningsecbroken"
 	icon_off = "miningsecoff"
-	req_access = list(ACCESS_MINING)
+	req_access = list(access_mining)

 /obj/structure/closet/secure_closet/miner/New()
 	..()
 	sleep(2)
-	new /obj/item/wardrobe/mining(src)
-	new /obj/item/wardrobe/mining(src)
-	new /obj/item/wardrobe/mining(src)
+	if(prob(50))
+		new /obj/item/weapon/storage/backpack/industrial(src)
+	else
+		new /obj/item/weapon/storage/backpack/satchel_eng(src)
+	new /obj/item/device/radio/headset/headset_mine(src)
+	new /obj/item/clothing/under/rank/miner(src)
+	new /obj/item/clothing/gloves/black(src)
+	new /obj/item/clothing/shoes/black(src)
+	new /obj/item/device/analyzer(src)
+	new /obj/item/weapon/storage/satchel(src)
+	new /obj/item/device/flashlight/lantern(src)
+	new /obj/item/weapon/shovel(src)
+	new /obj/item/weapon/pickaxe(src)
+	new /obj/item/clothing/glasses/meson(src)


 /**********************Shuttle Computer**************************/
@@ -85,9 +96,9 @@ proc/move_mining_shuttle()

 /obj/machinery/computer/mining_shuttle
 	name = "Mining Shuttle Console"
-	icon = 'computer.dmi'
+	icon = 'icons/obj/computer.dmi'
 	icon_state = "shuttle"
-	req_access = list(ACCESS_MINING)
+	req_access = list(access_mining)
 	circuit = "/obj/item/weapon/circuitboard/mining_shuttle"
 	var/hacked = 0
 	var/location = 0 //0 = station, 1 = mining base
@@ -118,17 +129,12 @@ proc/move_mining_shuttle()
 /obj/machinery/computer/mining_shuttle/attackby(obj/item/weapon/W as obj, mob/user as mob)

 	if (istype(W, /obj/item/weapon/card/emag))
-		var/obj/item/weapon/card/emag/E = W
-		if(E.uses)
-			E.uses--
-		else
-			return
 		src.req_access = list()
 		hacked = 1
 		usr << "You fried the consoles ID checking system. It's now available to everyone!"

 	else if(istype(W, /obj/item/weapon/screwdriver))
-		playsound(src.loc, 'Screwdriver.ogg', 50, 1)
+		playsound(src.loc, 'sound/items/Screwdriver.ogg', 50, 1)
 		if(do_after(user, 20))
 			var/obj/structure/computerframe/A = new /obj/structure/computerframe( src.loc )
 			var/obj/item/weapon/circuitboard/mining_shuttle/M = new /obj/item/weapon/circuitboard/mining_shuttle( A )
@@ -175,7 +181,7 @@ proc/move_mining_shuttle()

 /obj/item/weapon/pickaxe
 	name = "Miner's pickaxe"
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "pickaxe"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	slot_flags = SLOT_BELT
@@ -186,6 +192,7 @@ proc/move_mining_shuttle()
 	m_amt = 3750 //one sheet, but where can you make them?
 	var/digspeed = 40 //moving the delay to an item var so R&D can make improved picks. --NEO
 	origin_tech = "materials=1;engineering=1"
+	attack_verb = list("hit", "pierced", "sliced", "attacked")

 	hammer
 		name = "Mining Sledge Hammer"
@@ -240,13 +247,13 @@ proc/move_mining_shuttle()
 		item_state = "dpickaxe"
 		digspeed = 10
 		origin_tech = "materials=6;engineering=4"
-		desc = "A pickaxe with a diamond pick head."
+		desc = "A pickaxe with a diamond pick head, this is just like minecraft."

 	diamonddrill //When people ask about the badass leader of the mining tools, they are talking about ME!
 		name = "Diamond Mining Drill"
 		icon_state = "diamonddrill"
 		item_state = "jackhammer"
-		digspeed = 0 //Digs through walls, girders, and can dig up sand
+		digspeed = 5 //Digs through walls, girders, and can dig up sand
 		origin_tech = "materials=6;powerstorage=4;engineering=5"
 		desc = "Yours is the drill that will pierce the heavens!"

@@ -262,7 +269,7 @@ proc/move_mining_shuttle()
 /obj/item/weapon/shovel
 	name = "shovel"
 	desc = "A large tool for digging and moving dirt."
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	icon_state = "shovel"
 	flags = FPRINT | TABLEPASS| CONDUCT
 	slot_flags = SLOT_BELT
@@ -272,6 +279,7 @@ proc/move_mining_shuttle()
 	w_class = 3.0
 	m_amt = 50
 	origin_tech = "materials=1;engineering=1"
+	attack_verb = list("bashed", "bludgeoned", "thrashed", "whacked")

 /obj/item/weapon/shovel/spade
 	name = "spade"
@@ -288,7 +296,7 @@ proc/move_mining_shuttle()
 /obj/structure/closet/crate/miningcar
 	desc = "A mining car. This one doesn't work on rails, but has to be dragged."
 	name = "Mining car (not for rails)"
-	icon = 'storage.dmi'
+	icon = 'icons/obj/storage.dmi'
 	icon_state = "miningcar"
 	density = 1
 	icon_opened = "miningcaropen"
@@ -2,7 +2,7 @@

 /turf/simulated/mineral //wall piece
 	name = "Rock"
-	icon = 'walls.dmi'
+	icon = 'icons/turf/walls.dmi'
 	icon_state = "rock"
 	oxygen = 0
 	nitrogen = 0
@@ -14,8 +14,7 @@
 	var/mineralAmt = 0
 	var/spread = 0 //will the seam spread?
 	var/spreadChance = 0 //the percentual chance of an ore spreading to the neighbouring tiles
-	var/artifactChance = 0.3	//percent chance to spawn a xenoarchaelogical artifact
-	var/datum/geosample/geological_data		//todo: set this up
+	var/last_act = 0

 /turf/simulated/mineral/Del()
 	return
@@ -40,19 +39,19 @@
 		if((istype(get_step(src, NORTH), /turf/simulated/floor)) || (istype(get_step(src, NORTH), /turf/space)) || (istype(get_step(src, NORTH), /turf/simulated/shuttle/floor)))
 			T = get_step(src, NORTH)
 			if (T)
-				T.overlays += image('walls.dmi', "rock_side_s")
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_s")
 		if((istype(get_step(src, SOUTH), /turf/simulated/floor)) || (istype(get_step(src, SOUTH), /turf/space)) || (istype(get_step(src, SOUTH), /turf/simulated/shuttle/floor)))
 			T = get_step(src, SOUTH)
 			if (T)
-				T.overlays += image('walls.dmi', "rock_side_n", layer=6)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_n", layer=6)
 		if((istype(get_step(src, EAST), /turf/simulated/floor)) || (istype(get_step(src, EAST), /turf/space)) || (istype(get_step(src, EAST), /turf/simulated/shuttle/floor)))
 			T = get_step(src, EAST)
 			if (T)
-				T.overlays += image('walls.dmi', "rock_side_w", layer=6)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)
 		if((istype(get_step(src, WEST), /turf/simulated/floor)) || (istype(get_step(src, WEST), /turf/space)) || (istype(get_step(src, WEST), /turf/simulated/shuttle/floor)))
 			T = get_step(src, WEST)
 			if (T)
-				T.overlays += image('walls.dmi', "rock_side_e", layer=6)
+				T.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)

 	if (mineralName && mineralAmt && spread && spreadChance)
 		if(prob(spreadChance))
@@ -71,8 +70,8 @@

 /turf/simulated/mineral/random
 	name = "Mineral deposit"
-	var/mineralAmtList = list("Uranium" = 5, "Iron" = 5, "Diamond" = 5, "Gold" = 5, "Silver" = 5, "Plasma" = 5, "Archaeo" = 3/*, "Adamantine" = 5*/)
-	var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25, "Archaeo" = 5/*, "Adamantine" =5*/)//Currently, Adamantine won't spawn as it has no uses. -Durandan
+	var/mineralAmtList = list("Uranium" = 5, "Iron" = 5, "Diamond" = 5, "Gold" = 5, "Silver" = 5, "Plasma" = 5/*, "Adamantine" = 5*/)
+	var/mineralSpawnChanceList = list("Uranium" = 5, "Iron" = 50, "Diamond" = 1, "Gold" = 5, "Silver" = 5, "Plasma" = 25/*, "Adamantine" =5*/)//Currently, Adamantine won't spawn as it has no uses. -Durandan
 	var/mineralChance = 10  //means 10% chance of this plot changing to a mineral deposit

 /turf/simulated/mineral/random/New()
@@ -95,21 +94,16 @@
 					M = new/turf/simulated/mineral/silver(src)
 				if("Plasma")
 					M = new/turf/simulated/mineral/plasma(src)
-				if("Archaeo")
-					M = new/turf/simulated/mineral/archaeo(src)
 				/*if("Adamantine")
 					M = new/turf/simulated/mineral/adamantine(src)*/
 			if(M)
 				src = M
 				M.levelupdate()
-	else if (prob(artifactChance))
-		//spawn a rare, xeno-arch artifact here
-		new/obj/machinery/artifact(src)
 	return

 /turf/simulated/mineral/random/high_chance
 	mineralChance = 25
-	mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Plasma" = 25, "Archaeo" = 2)
+	mineralSpawnChanceList = list("Uranium" = 10, "Iron" = 30, "Diamond" = 2, "Gold" = 10, "Silver" = 10, "Plasma" = 25)

 /turf/simulated/mineral/random/Del()
 	return
@@ -169,15 +163,6 @@
 	spread = 1


-/turf/simulated/mineral/archaeo
-	name = "Strange rock formation"
-	icon_state = "rock_Archaeo"
-	mineralName = "Archaeo"
-	mineralAmt = 3
-	spreadChance = 25
-	spread = 1
-
-
 /turf/simulated/mineral/clown
 	name = "Bananium deposit"
 	icon_state = "rock_Clown"
@@ -209,8 +194,8 @@
 	if(old_icon) W.icon_state = old_icon
 	*/
 	W.opacity = 1
-	W.ul_SetOpacity(0)
-	W.ul_Recalculate()
+	W.sd_SetOpacity(0)
+	W.sd_LumReset()
 	W.levelupdate()
 	return W

@@ -232,28 +217,21 @@
 			return
 */
 //Watch your tabbing, microwave. --NEO
+		if(last_act+W:digspeed > world.time)//prevents message spam
+			return
+		last_act = world.time
+		user << "\red You start picking."
+		playsound(user, 'sound/weapons/Genhit.ogg', 20, 1)

-		if(istype(W, /obj/item/weapon/pickaxe/hand_pick) || istype(W, /obj/item/weapon/pickaxe/mini_pick))
-			user << "\red You carefully start clearing away the rock."
-			playsound(user, 'Genhit.ogg', 20, 1)
-
-			if(do_after(user,W:digspeed))
-				user << "\blue You finish clearing away the rock."
-				gets_drilled(1)
-		else
-			user << "\red You start picking."
-			playsound(user, 'Genhit.ogg', 20, 1)
-
-			if(do_after(user,W:digspeed))
-				user << "\blue You finish cutting into the rock."
-				gets_drilled()
+		if(do_after(user,W:digspeed))
+			user << "\blue You finish cutting into the rock."
+			gets_drilled()

 	else
 		return attack_hand(user)
 	return

-/turf/simulated/mineral/proc/gets_drilled(var/delicate = 0)
-	var/destroyed = 0
+/turf/simulated/mineral/proc/gets_drilled()
 	if ((src.mineralName != "") && (src.mineralAmt > 0) && (src.mineralAmt < 11))
 		var/i
 		for (i=0;i<mineralAmt;i++)
@@ -269,20 +247,9 @@
 				new /obj/item/weapon/ore/plasma(src)
 			if (src.mineralName == "Diamond")
 				new /obj/item/weapon/ore/diamond(src)
-			if (src.mineralName == "Archaeo")
-				//spawn strange rocks here
-				if(prob(10) || delicate)
-					new /obj/item/weapon/ore/strangerock(src)
-				else
-					destroyed = 1
 			if (src.mineralName == "Clown")
 				new /obj/item/weapon/ore/clown(src)
-	if (prob(src.artifactChance))
-		//spawn a rare, xeno-archaelogical artifact here
-		new /obj/machinery/artifact(src)
 	ReplaceWithFloor()
-	if(destroyed)
-		usr << "\red You destroy some of the rocks!"
 	return

 /*
@@ -299,12 +266,34 @@
 			mineralAmt = 5
 	return*/

+/turf/simulated/mineral/Bumped(AM as mob|obj)
+	..()
+	if(istype(AM,/mob/living/carbon/human))
+		var/mob/living/carbon/human/H = AM
+		if((istype(H.l_hand,/obj/item/weapon/pickaxe)) && (!H.hand))
+			src.attackby(H.l_hand,H)
+		else if((istype(H.r_hand,/obj/item/weapon/pickaxe)) && H.hand)
+			src.attackby(H.r_hand,H)
+		return
+	else if(istype(AM,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = AM
+		if(istype(R.module_active,/obj/item/weapon/pickaxe))
+			src.attackby(R.module_active,R)
+			return
+/*	else if(istype(AM,/obj/mecha))
+		var/obj/mecha/M = AM
+		if(istype(M.selected,/obj/item/mecha_parts/mecha_equipment/tool/drill))
+			src.attackby(M.selected,M)
+			return*/
+//Aparantly mechs are just TOO COOL to call Bump(), so fuck em (for now)
+	else
+		return

 /**********************Asteroid**************************/

 /turf/simulated/floor/plating/airless/asteroid //floor piece
 	name = "Asteroid"
-	icon = 'floors.dmi'
+	icon = 'icons/turf/floors.dmi'
 	icon_state = "asteroid"
 	oxygen = 0.01
 	nitrogen = 0.01
@@ -325,6 +314,14 @@
 		updateMineralOverlays()

 /turf/simulated/floor/plating/airless/asteroid/ex_act(severity)
+	switch(severity)
+		if(3.0)
+			return
+		if(2.0)
+			if (prob(70))
+				src.gets_dug()
+		if(1.0)
+			src.gets_dug()
 	return

 /turf/simulated/floor/plating/airless/asteroid/attackby(obj/item/weapon/W as obj, mob/user as mob)
@@ -337,83 +334,74 @@
 		if (!( istype(T, /turf) ))
 			return

-		if (dug == 1)
+		if (dug)
 			user << "\red This area has already been dug"
 			return

 		user << "\red You start digging."
-		playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better

 		sleep(40)
-		if ((user.loc == T && user.equipped() == W) && !dug)
+		if ((user.loc == T && user.get_active_hand() == W))
 			user << "\blue You dug a hole."
 			gets_dug()
-			dug = 1
-			icon_plating = "asteroid_dug"
-			icon_state = "asteroid_dug"
-			return
-		else
-			return
-	else
-		..(W,user)
+
 	if ((istype(W,/obj/item/weapon/pickaxe/drill)))
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
 			return

-		if (dug == 1)
-			user << "\red This area has already been dug."
+		if (dug)
+			user << "\red This area has already been dug"
 			return

 		user << "\red You start digging."
-		playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better

 		sleep(30)
-		if ((user.loc == T && user.equipped() == W))
+		if ((user.loc == T && user.get_active_hand() == W))
 			user << "\blue You dug a hole."
 			gets_dug()
-			dug = 1
-			icon_plating = "asteroid_dug"
-			icon_state = "asteroid_dug"
-			return
-		else
-			return
-	else
-		..(W,user)

 	if ((istype(W,/obj/item/weapon/pickaxe/diamonddrill)) || (istype(W,/obj/item/weapon/pickaxe/borgdrill)))
 		var/turf/T = user.loc
 		if (!( istype(T, /turf) ))
 			return

-		if (dug == 1)
-			user << "\red This area has already been dug."
+		if (dug)
+			user << "\red This area has already been dug"
 			return

 		user << "\red You start digging."
-		playsound(src.loc, 'rustle1.ogg', 50, 1) //russle sounds sounded better
+		playsound(src.loc, 'sound/effects/rustle1.ogg', 50, 1) //russle sounds sounded better

 		sleep(0)
-		if ((user.loc == T && user.equipped() == W))
+		if ((user.loc == T && user.get_active_hand() == W))
 			user << "\blue You dug a hole."
 			gets_dug()
-			dug = 1
-			icon_plating = "asteroid_dug"
-			icon_state = "asteroid_dug"
-			return
-		else
-			return
+
+	if(istype(W,/obj/item/weapon/storage/satchel))
+		var/obj/item/weapon/storage/satchel/S = W
+		if(S.collection_mode)
+			for(var/obj/item/weapon/ore/O in src.contents)
+				O.attackby(W,user)
+				return
+
 	else
 		..(W,user)
-
 	return

 /turf/simulated/floor/plating/airless/asteroid/proc/gets_dug()
+	if(dug)
+		return
 	new/obj/item/weapon/ore/glass(src)
 	new/obj/item/weapon/ore/glass(src)
 	new/obj/item/weapon/ore/glass(src)
 	new/obj/item/weapon/ore/glass(src)
 	new/obj/item/weapon/ore/glass(src)
+	dug = 1
+	icon_plating = "asteroid_dug"
+	icon_state = "asteroid_dug"
 	return

 /turf/simulated/floor/plating/airless/asteroid/proc/updateMineralOverlays()
@@ -421,13 +409,13 @@
 	src.overlays = null

 	if(istype(get_step(src, NORTH), /turf/simulated/mineral))
-		src.overlays += image('walls.dmi', "rock_side_n")
+		src.overlays += image('icons/turf/walls.dmi', "rock_side_n")
 	if(istype(get_step(src, SOUTH), /turf/simulated/mineral))
-		src.overlays += image('walls.dmi', "rock_side_s", layer=6)
+		src.overlays += image('icons/turf/walls.dmi', "rock_side_s", layer=6)
 	if(istype(get_step(src, EAST), /turf/simulated/mineral))
-		src.overlays += image('walls.dmi', "rock_side_e", layer=6)
+		src.overlays += image('icons/turf/walls.dmi', "rock_side_e", layer=6)
 	if(istype(get_step(src, WEST), /turf/simulated/mineral))
-		src.overlays += image('walls.dmi', "rock_side_w", layer=6)
+		src.overlays += image('icons/turf/walls.dmi', "rock_side_w", layer=6)


 /turf/simulated/floor/plating/airless/asteroid/proc/fullUpdateMineralOverlays()
@@ -456,4 +444,18 @@
 	if(istype(get_step(src, SOUTH), /turf/simulated/floor/plating/airless/asteroid))
 		A = get_step(src, SOUTH)
 		A.updateMineralOverlays()
-	src.updateMineralOverlays()
+	src.updateMineralOverlays()
+
+/turf/simulated/floor/plating/airless/asteroid/Entered(atom/movable/M as mob|obj)
+	..()
+	if(istype(M,/mob/living/silicon/robot))
+		var/mob/living/silicon/robot/R = M
+		if(istype(R.module, /obj/item/weapon/robot_module/miner))
+			if(istype(R.module_state_1,/obj/item/weapon/storage/satchel))
+				src.attackby(R.module_state_1,R)
+			else if(istype(R.module_state_2,/obj/item/weapon/storage/satchel))
+				src.attackby(R.module_state_2,R)
+			else if(istype(R.module_state_3,/obj/item/weapon/storage/satchel))
+				src.attackby(R.module_state_3,R)
+			else
+				return
@@ -3,7 +3,7 @@

 /obj/machinery/mineral/mint
 	name = "Coin press"
-	icon = 'stationobjs.dmi'
+	icon = 'icons/obj/stationobjs.dmi'
 	icon_state = "coinpress0"
 	density = 1
 	anchored = 1.0
@@ -1,114 +1,114 @@
-/*****************************Money bag********************************/
-
-/obj/item/weapon/moneybag
-	icon = 'storage.dmi'
-	name = "Money bag"
-	icon_state = "moneybag"
-	flags = FPRINT | TABLEPASS| CONDUCT
-	force = 10.0
-	throwforce = 2.0
-	w_class = 4.0
-
-/obj/item/weapon/moneybag/attack_hand(user as mob)
-	var/amt_gold = 0
-	var/amt_silver = 0
-	var/amt_diamond = 0
-	var/amt_iron = 0
-	var/amt_plasma = 0
-	var/amt_uranium = 0
-	var/amt_clown = 0
-	var/amt_adamantine = 0
-
-	for (var/obj/item/weapon/coin/C in contents)
-		if (istype(C,/obj/item/weapon/coin/diamond))
-			amt_diamond++;
-		if (istype(C,/obj/item/weapon/coin/plasma))
-			amt_plasma++;
-		if (istype(C,/obj/item/weapon/coin/iron))
-			amt_iron++;
-		if (istype(C,/obj/item/weapon/coin/silver))
-			amt_silver++;
-		if (istype(C,/obj/item/weapon/coin/gold))
-			amt_gold++;
-		if (istype(C,/obj/item/weapon/coin/uranium))
-			amt_uranium++;
-		if (istype(C,/obj/item/weapon/coin/clown))
-			amt_clown++;
-		if (istype(C,/obj/item/weapon/coin/adamantine))
-			amt_adamantine++;
-
-	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
-	if (amt_gold)
-		dat += text("Gold coins: [amt_gold] <A href='?src=\ref[src];remove=gold'>Remove one</A><br>")
-	if (amt_silver)
-		dat += text("Silver coins: [amt_silver] <A href='?src=\ref[src];remove=silver'>Remove one</A><br>")
-	if (amt_iron)
-		dat += text("Metal coins: [amt_iron] <A href='?src=\ref[src];remove=iron'>Remove one</A><br>")
-	if (amt_diamond)
-		dat += text("Diamond coins: [amt_diamond] <A href='?src=\ref[src];remove=diamond'>Remove one</A><br>")
-	if (amt_plasma)
-		dat += text("Plasma coins: [amt_plasma] <A href='?src=\ref[src];remove=plasma'>Remove one</A><br>")
-	if (amt_uranium)
-		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
-	if (amt_clown)
-		dat += text("Bananium coins: [amt_clown] <A href='?src=\ref[src];remove=clown'>Remove one</A><br>")
-	if (amt_adamantine)
-		dat += text("Adamantine coins: [amt_adamantine] <A href='?src=\ref[src];remove=adamantine'>Remove one</A><br>")
-	user << browse("[dat]", "window=moneybag")
-
-/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/weapon/coin))
-		var/obj/item/weapon/coin/C = W
-		user << "\blue You add the [C.name] into the bag."
-		usr.drop_item()
-		contents += C
-	if (istype(W, /obj/item/weapon/moneybag))
-		var/obj/item/weapon/moneybag/C = W
-		for (var/obj/O in C.contents)
-			contents += O;
-		user << "\blue You empty the [C.name] into the bag."
-	return
-
-/obj/item/weapon/moneybag/Topic(href, href_list)
-	if(..())
-		return
-	usr.machine = src
-	src.add_fingerprint(usr)
-	if(href_list["remove"])
-		var/obj/item/weapon/coin/COIN
-		switch(href_list["remove"])
-			if("gold")
-				COIN = locate(/obj/item/weapon/coin/gold,src.contents)
-			if("silver")
-				COIN = locate(/obj/item/weapon/coin/silver,src.contents)
-			if("iron")
-				COIN = locate(/obj/item/weapon/coin/iron,src.contents)
-			if("diamond")
-				COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
-			if("plasma")
-				COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
-			if("uranium")
-				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
-			if("clown")
-				COIN = locate(/obj/item/weapon/coin/clown,src.contents)
-			if("adamantine")
-				COIN = locate(/obj/item/weapon/coin/adamantine,src.contents)
-		if(!COIN)
-			return
-		COIN.loc = src.loc
-	return
-
-
-
-/obj/item/weapon/moneybag/vault
-
-/obj/item/weapon/moneybag/vault/New()
-	..()
-	new /obj/item/weapon/coin/silver(src)
-	new /obj/item/weapon/coin/silver(src)
-	new /obj/item/weapon/coin/silver(src)
-	new /obj/item/weapon/coin/silver(src)
-	new /obj/item/weapon/coin/gold(src)
-	new /obj/item/weapon/coin/gold(src)
+/*****************************Money bag********************************/
+
+/obj/item/weapon/moneybag
+	icon = 'icons/obj/storage.dmi'
+	name = "Money bag"
+	icon_state = "moneybag"
+	flags = FPRINT | TABLEPASS| CONDUCT
+	force = 10.0
+	throwforce = 2.0
+	w_class = 4.0
+
+/obj/item/weapon/moneybag/attack_hand(user as mob)
+	var/amt_gold = 0
+	var/amt_silver = 0
+	var/amt_diamond = 0
+	var/amt_iron = 0
+	var/amt_plasma = 0
+	var/amt_uranium = 0
+	var/amt_clown = 0
+	var/amt_adamantine = 0
+
+	for (var/obj/item/weapon/coin/C in contents)
+		if (istype(C,/obj/item/weapon/coin/diamond))
+			amt_diamond++;
+		if (istype(C,/obj/item/weapon/coin/plasma))
+			amt_plasma++;
+		if (istype(C,/obj/item/weapon/coin/iron))
+			amt_iron++;
+		if (istype(C,/obj/item/weapon/coin/silver))
+			amt_silver++;
+		if (istype(C,/obj/item/weapon/coin/gold))
+			amt_gold++;
+		if (istype(C,/obj/item/weapon/coin/uranium))
+			amt_uranium++;
+		if (istype(C,/obj/item/weapon/coin/clown))
+			amt_clown++;
+		if (istype(C,/obj/item/weapon/coin/adamantine))
+			amt_adamantine++;
+
+	var/dat = text("<b>The contents of the moneybag reveal...</b><br>")
+	if (amt_gold)
+		dat += text("Gold coins: [amt_gold] <A href='?src=\ref[src];remove=gold'>Remove one</A><br>")
+	if (amt_silver)
+		dat += text("Silver coins: [amt_silver] <A href='?src=\ref[src];remove=silver'>Remove one</A><br>")
+	if (amt_iron)
+		dat += text("Metal coins: [amt_iron] <A href='?src=\ref[src];remove=iron'>Remove one</A><br>")
+	if (amt_diamond)
+		dat += text("Diamond coins: [amt_diamond] <A href='?src=\ref[src];remove=diamond'>Remove one</A><br>")
+	if (amt_plasma)
+		dat += text("Plasma coins: [amt_plasma] <A href='?src=\ref[src];remove=plasma'>Remove one</A><br>")
+	if (amt_uranium)
+		dat += text("Uranium coins: [amt_uranium] <A href='?src=\ref[src];remove=uranium'>Remove one</A><br>")
+	if (amt_clown)
+		dat += text("Bananium coins: [amt_clown] <A href='?src=\ref[src];remove=clown'>Remove one</A><br>")
+	if (amt_adamantine)
+		dat += text("Adamantine coins: [amt_adamantine] <A href='?src=\ref[src];remove=adamantine'>Remove one</A><br>")
+	user << browse("[dat]", "window=moneybag")
+
+/obj/item/weapon/moneybag/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/weapon/coin))
+		var/obj/item/weapon/coin/C = W
+		user << "\blue You add the [C.name] into the bag."
+		usr.drop_item()
+		contents += C
+	if (istype(W, /obj/item/weapon/moneybag))
+		var/obj/item/weapon/moneybag/C = W
+		for (var/obj/O in C.contents)
+			contents += O;
+		user << "\blue You empty the [C.name] into the bag."
+	return
+
+/obj/item/weapon/moneybag/Topic(href, href_list)
+	if(..())
+		return
+	usr.machine = src
+	src.add_fingerprint(usr)
+	if(href_list["remove"])
+		var/obj/item/weapon/coin/COIN
+		switch(href_list["remove"])
+			if("gold")
+				COIN = locate(/obj/item/weapon/coin/gold,src.contents)
+			if("silver")
+				COIN = locate(/obj/item/weapon/coin/silver,src.contents)
+			if("iron")
+				COIN = locate(/obj/item/weapon/coin/iron,src.contents)
+			if("diamond")
+				COIN = locate(/obj/item/weapon/coin/diamond,src.contents)
+			if("plasma")
+				COIN = locate(/obj/item/weapon/coin/plasma,src.contents)
+			if("uranium")
+				COIN = locate(/obj/item/weapon/coin/uranium,src.contents)
+			if("clown")
+				COIN = locate(/obj/item/weapon/coin/clown,src.contents)
+			if("adamantine")
+				COIN = locate(/obj/item/weapon/coin/adamantine,src.contents)
+		if(!COIN)
+			return
+		COIN.loc = src.loc
+	return
+
+
+
+/obj/item/weapon/moneybag/vault
+
+/obj/item/weapon/moneybag/vault/New()
+	..()
+	new /obj/item/weapon/coin/silver(src)
+	new /obj/item/weapon/coin/silver(src)
+	new /obj/item/weapon/coin/silver(src)
+	new /obj/item/weapon/coin/silver(src)
+	new /obj/item/weapon/coin/gold(src)
+	new /obj/item/weapon/coin/gold(src)
 	new /obj/item/weapon/coin/adamantine(src)
@@ -2,28 +2,8 @@

 /obj/item/weapon/ore
 	name = "Rock"
-	icon = 'Mining.dmi'
+	icon = 'icons/obj/mining.dmi'
 	icon_state = "ore"
-	var/amount = 1
-
-/obj/item/weapon/ore/attackby(obj/item/weapon/W as obj, mob/user as mob)
-	..()
-	if (istype(W, /obj/item/weapon/satchel))
-		var/obj/item/weapon/satchel/S = W
-		if (S.mode == 1)
-			for (var/obj/item/weapon/ore/O in locate(src.x,src.y,src.z))
-				if (S.contents.len < S.capacity)
-					S.contents += O;
-				else
-					user << "\blue The satchel is full."
-					return
-			user << "\blue You pick up all the ores."
-		else
-			if (S.contents.len < S.capacity)
-				S.contents += src;
-			else
-				user << "\blue The satchel is full."
-	return


 /obj/item/weapon/ore/uranium
@@ -79,15 +59,6 @@
 	desc = "Completely useless"
 	icon_state = "slag"

-/obj/item/weapon/ore/strangerock		//see artifact_archaeo.dm in modules/research for more info
-	name = "Strange rock"
-	desc = "Seems to have some unusal strata evident throughout it."
-	icon_state = "strange"
-	var/obj/inside
-	var/method // 0 = fire, 1+ = acid
-	origin_tech = "materials=5"
-
-
 /obj/item/weapon/ore/New()
 	pixel_x = rand(0,16)-8
 	pixel_y = rand(0,8)-8
@@ -96,7 +67,7 @@
 /*****************************Coin********************************/

 /obj/item/weapon/coin
-	icon = 'items.dmi'
+	icon = 'icons/obj/items.dmi'
 	name = "Coin"
 	icon_state = "coin"
 	flags = FPRINT | TABLEPASS| CONDUCT
@@ -157,7 +128,7 @@
 			del(CC)
 			return

-		overlays += image('items.dmi',"coin_string_overlay")
+		overlays += image('icons/obj/items.dmi',"coin_string_overlay")
 		string_attached = 1
 		user << "\blue You attach a string to the coin."
 		CC.use(1)
@@ -0,0 +1,254 @@
+
+/**********************Ore box**************************/
+
+/obj/structure/ore_box
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "orebox"
+	name = "Ore Box"
+	desc = "It's heavy"
+	density = 1
+
+/obj/structure/ore_box/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if (istype(W, /obj/item/weapon/ore))
+		src.contents += W;
+	if (istype(W, /obj/item/weapon/storage))
+		var/obj/item/weapon/storage/S = W
+		S.hide_from(usr)
+		for(var/obj/item/weapon/ore/O in S.contents)
+			S.remove_from_storage(O, src) //This will move the item to this item's contents
+		user << "\blue You empty the satchel into the box."
+	return
+
+/obj/structure/ore_box/attack_hand(obj, mob/user as mob)
+	var/amt_gold = 0
+	var/amt_silver = 0
+	var/amt_diamond = 0
+	var/amt_glass = 0
+	var/amt_iron = 0
+	var/amt_plasma = 0
+	var/amt_uranium = 0
+	var/amt_clown = 0
+
+	for (var/obj/item/weapon/ore/C in contents)
+		if (istype(C,/obj/item/weapon/ore/diamond))
+			amt_diamond++;
+		if (istype(C,/obj/item/weapon/ore/glass))
+			amt_glass++;
+		if (istype(C,/obj/item/weapon/ore/plasma))
+			amt_plasma++;
+		if (istype(C,/obj/item/weapon/ore/iron))
+			amt_iron++;
+		if (istype(C,/obj/item/weapon/ore/silver))
+			amt_silver++;
+		if (istype(C,/obj/item/weapon/ore/gold))
+			amt_gold++;
+		if (istype(C,/obj/item/weapon/ore/uranium))
+			amt_uranium++;
+		if (istype(C,/obj/item/weapon/ore/clown))
+			amt_clown++;
+
+	var/dat = text("<b>The contents of the ore box reveal...</b><br>")
+	if (amt_gold)
+		dat += text("Gold ore: [amt_gold]<br>")
+	if (amt_silver)
+		dat += text("Silver ore: [amt_silver]<br>")
+	if (amt_iron)
+		dat += text("Metal ore: [amt_iron]<br>")
+	if (amt_glass)
+		dat += text("Sand: [amt_glass]<br>")
+	if (amt_diamond)
+		dat += text("Diamond ore: [amt_diamond]<br>")
+	if (amt_plasma)
+		dat += text("Plasma ore: [amt_plasma]<br>")
+	if (amt_uranium)
+		dat += text("Uranium ore: [amt_uranium]<br>")
+	if (amt_clown)
+		dat += text("Bananium ore: [amt_clown]<br>")
+
+	dat += text("<br><br><A href='?src=\ref[src];removeall=1'>Empty box</A>")
+	user << browse("[dat]", "window=orebox")
+	return
+
+/obj/structure/ore_box/Topic(href, href_list)
+	if(..())
+		return
+	usr.machine = src
+	src.add_fingerprint(usr)
+	if(href_list["removeall"])
+		for (var/obj/item/weapon/ore/O in contents)
+			contents -= O
+			O.loc = src.loc
+		usr << "\blue You empty the box"
+	src.updateUsrDialog()
+	return
+
+/**********************Sheet Snatcher**************************/
+//Stolen satchel code, making it a box just wouldn't work well for this -Sieve
+
+/obj/item/weapon/sheetsnatcher
+	icon = 'icons/obj/mining.dmi'
+	icon_state = "sheetsnatcher"
+	name = "Sheet Snatcher"
+	desc = "A patented Nanotrasen storage system designed for any kind of mineral sheet."
+	var/mode = 1;  //0 = pick one at a time, 1 = pick all on tile
+	var/capacity = 300; //the number of sheets it can carry.
+	flags = FPRINT | TABLEPASS
+	w_class = 3
+	var/metal = 0//Holder values, to have a count of how much of each type is in the snatcher
+	var/glass = 0
+	var/gold = 0
+	var/silver = 0
+	var/diamond = 0
+	var/plasma = 0
+	var/uranium = 0
+	var/clown = 0
+	var/euranium = 0
+	var/plasteel = 0
+	var/rglass = 0
+
+/obj/item/weapon/sheetsnatcher/attack_self(mob/user as mob)//Credit goes to carn on this one
+	var/location = get_turf(src)    //fetches the turf containing the object. (so stuff spawns on the floor)
+	while(metal)
+		var/obj/item/stack/sheet/metal/S = new (location)
+		var/stacksize = min(metal,50)  //maximum stack size is 50!
+		S.amount = stacksize
+		metal -= stacksize
+	while(glass)
+		var/obj/item/stack/sheet/glass/S = new (location)
+		var/stacksize = min(glass,50)
+		S.amount = stacksize
+		glass -= stacksize
+	while(gold)
+		var/obj/item/stack/sheet/gold/S = new (location)
+		var/stacksize = min(gold,50)
+		S.amount = stacksize
+		gold -= stacksize
+	while(silver)
+		var/obj/item/stack/sheet/silver/S = new (location)
+		var/stacksize = min(silver,50)
+		S.amount = stacksize
+		silver -= stacksize
+	while(diamond)
+		var/obj/item/stack/sheet/diamond/S = new (location)
+		var/stacksize = min(diamond,50)
+		S.amount = stacksize
+		diamond -= stacksize
+	while(plasma)
+		var/obj/item/stack/sheet/plasma/S = new (location)
+		var/stacksize = min(plasma,50)
+		S.amount = stacksize
+		plasma -= stacksize
+	while(uranium)
+		var/obj/item/stack/sheet/uranium/S = new (location)
+		var/stacksize = min(uranium,50)
+		S.amount = stacksize
+		uranium -= stacksize
+	while(clown)
+		var/obj/item/stack/sheet/clown/S = new (location)
+		var/stacksize = min(clown,50)
+		S.amount = stacksize
+		clown -= stacksize
+	while(euranium)
+		var/obj/item/stack/sheet/enruranium/S = new (location)
+		var/stacksize = min(euranium,50)
+		S.amount = stacksize
+		euranium -= stacksize
+	while(plasteel)
+		var/obj/item/stack/sheet/plasteel/S = new (location)
+		var/stacksize = min(plasteel,50)
+		S.amount = stacksize
+		plasteel -= stacksize
+	while(rglass)
+		var/obj/item/stack/sheet/rglass/S = new (location)
+		var/stacksize = min(rglass,50)
+		S.amount = stacksize
+		rglass -= stacksize
+	if(!metal && !glass && !gold && !silver && !diamond && !plasma && !uranium && !clown && !euranium && !plasteel && !rglass)
+		user << "\blue You empty the snatch."
+		return
+
+
+/obj/item/weapon/sheetsnatcher/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	..()
+	if (istype(W, /obj/item/stack/sheet))
+		var/obj/item/stack/sheet/O = W
+		src.add(O,user)
+	return
+
+/obj/item/weapon/sheetsnatcher/verb/toggle_mode()
+	set name = "Switch Sheet Snatcher Method"
+	set category = "Object"
+
+	mode = !mode
+	switch (mode)
+		if(1)
+			usr << "The snatcher now picks up all sheets on a tile at once."
+		if(0)
+			usr << "The snatcher now picks up one sheet at a time."
+
+/obj/item/weapon/sheetsnatcher/proc/add(var/obj/item/stack/sheet/S as obj, mob/user as mob)//Handles sheets, adds them to the holder values
+	if((S.name == "Sandstone Bricks") || (S.name == "Wood Planks"))//Does not pick up sandstone or wood, as they are not true sheets
+		return
+	var/current = metal+glass+gold+silver+diamond+plasma+uranium+clown+euranium+plasteel+rglass
+	if(capacity == current)//If it's full, you're done
+		user << "\red The snatcher is full."
+		return
+	if(capacity < current + S.amount)//If the stack will fill it up
+		var/diff = capacity - current
+		switch(S.name)
+			if("metal")
+				metal += diff
+			if("glass")
+				glass += diff
+			if("silver")
+				silver += diff
+			if("gold")
+				gold += diff
+			if("diamond")
+				diamond += diff
+			if("solid plasma")
+				plasma += diff
+			if("uranium")
+				uranium += diff
+			if("bananium")
+				clown += diff
+			if("enriched uranium")
+				euranium += diff
+			if("plasteel")
+				plasteel += diff
+			if("reinforced glass")
+				rglass += diff
+		S.amount -= diff
+		user << "\blue You add the [S.name] to the [name]"
+	else
+		switch(S.name)
+			if("metal")
+				metal += S.amount
+			if("glass")
+				glass += S.amount
+			if("silver")
+				silver += S.amount
+			if("gold")
+				gold += S.amount
+			if("diamond")
+				diamond += S.amount
+			if("solid plasma")
+				plasma += S.amount
+			if("uranium")
+				uranium += S.amount
+			if("bananium")
+				clown += S.amount
+			if("enriched uranium")
+				euranium += S.amount
+			if("plasteel")
+				plasteel += S.amount
+			if("reinforced glass")
+				rglass += S.amount
+		user << "\blue You add the [S.name] to the [name]"
+		del (S)
+	return
+
+/obj/item/weapon/sheetsnatcher/borg
+	name = "Sheet Snatcher 9000"
+	desc = ""
+	capacity = 500//Borgs get more because >specialization