First Local commit
Merge remote-tracking branch 'origin/master'

Conflicts:
	README.txt
	SQL/tgstation_schema.sql
	bot/CORE_DATA.py
	bot/C_eightball.py
	bot/C_heaortai.py
	bot/C_makequote.py
	bot/C_maths.py
	bot/C_rot13.py
	bot/C_rtd.py
	bot/C_sarcasticball.py
	bot/C_srtd.py
	bot/D_help.py
	bot/FMLformatter.py
	bot/Marakov/Marakov.Cache
	bot/Marakov_Chain.py
	bot/Namecheck.py
	bot/NanoTrasenBot.py
	bot/Shortname.py
	bot/Timeconverter.py
	bot/Weather.py
	bot/YTCv3.py
	bot/YTCv4.py
	bot/_____Readme.txt
	bot/gen_fml.py
	bot/htmltagremove.py
	bot/irchat.py
	bot/linereader.py
	bot/nudge.py
	bot/save_load.py
	bot/some_but_not_all_2.py
	bot/xkcdparser.py
	code/ATMOSPHERICS/atmospherics.dm
	code/ATMOSPHERICS/components/binary_devices/binary_atmos_base.dm
	code/ATMOSPHERICS/components/binary_devices/circulator.dm
	code/ATMOSPHERICS/components/binary_devices/dp_vent_pump.dm
	code/ATMOSPHERICS/components/binary_devices/passive_gate.dm
	code/ATMOSPHERICS/components/binary_devices/pump.dm
	code/ATMOSPHERICS/components/binary_devices/volume_pump.dm
	code/ATMOSPHERICS/components/portables_connector.dm
	code/ATMOSPHERICS/components/trinary_devices/filter.dm
	code/ATMOSPHERICS/components/trinary_devices/mixer.dm
	code/ATMOSPHERICS/components/trinary_devices/trinary_base.dm
	code/ATMOSPHERICS/components/unary/cold_sink.dm
	code/ATMOSPHERICS/components/unary/generator_input.dm
	code/ATMOSPHERICS/components/unary/heat_exchanger.dm
	code/ATMOSPHERICS/components/unary/heat_source.dm
	code/ATMOSPHERICS/components/unary/outlet_injector.dm
	code/ATMOSPHERICS/components/unary/oxygen_generator.dm
	code/ATMOSPHERICS/components/unary/unary_base.dm
	code/ATMOSPHERICS/components/unary/vent_pump.dm
	code/ATMOSPHERICS/components/unary/vent_scrubber.dm
	code/ATMOSPHERICS/components/valve.dm
	code/ATMOSPHERICS/datum_pipe_network.dm
	code/ATMOSPHERICS/datum_pipeline.dm
	code/ATMOSPHERICS/he_pipes.dm
	code/ATMOSPHERICS/pipes.dm
	code/FEA/DEBUG_REMOVE_BEFORE_RELEASE.dm
	code/FEA/FEA_airgroup.dm
	code/FEA/FEA_fire.dm
	code/FEA/FEA_gas_mixture.dm
	code/FEA/FEA_group_helpers.dm
	code/FEA/FEA_system.dm
	code/FEA/FEA_turf_tile.dm
	code/WorkInProgress/Sigyn/Department Sec/__README.dm
	code/WorkInProgress/Sigyn/Department Sec/jobs.dm
	code/WorkInProgress/Sigyn/Softcurity/__README.dm
	code/WorkInProgress/Sigyn/Softcurity/access.dm
	code/WorkInProgress/Sigyn/Softcurity/clothing.dm
	code/WorkInProgress/Sigyn/Softcurity/jobs.dm
	code/WorkInProgress/Sigyn/Softcurity/secure_closet.dm
	code/WorkInProgress/Sigyn/Softcurity/wardrobe.dm
	code/WorkInProgress/buildmode.dm
	code/WorkInProgress/carn/Explosion2.dm
	code/WorkInProgress/carn/debug_locnull.dm
	code/WorkInProgress/carn/debug_powernets.dm
	code/WorkInProgress/carn/master_controller_old.dm
	code/WorkInProgress/carn/master_controller_semi-seq.dm
	code/WorkInProgress/explosion_particles.dm
	code/WorkInProgress/mapload/dmm_suite.dm
	code/WorkInProgress/mapload/reader.dm
	code/WorkInProgress/organs/implants.dm
	code/WorkInProgress/organs/organs.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/__DEFINES.dm
	code/__HELPERS/files.dm
	code/__HELPERS/game.dm
	code/__HELPERS/global_lists.dm
	code/__HELPERS/icons.dm
	code/__HELPERS/lists.dm
	code/__HELPERS/logging.dm
	code/__HELPERS/maths.dm
	code/__HELPERS/mobs.dm
	code/__HELPERS/names.dm
	code/__HELPERS/sanitize_values.dm
	code/__HELPERS/text.dm
	code/__HELPERS/time.dm
	code/__HELPERS/type2type.dm
	code/__HELPERS/unsorted.dm
	code/_compile_options.dm
	code/controllers/_DynamicAreaLighting_TG.dm
	code/controllers/configuration.dm
	code/controllers/failsafe.dm
	code/controllers/lighting_controller.dm
	code/controllers/master_controller.dm
	code/controllers/shuttle_controller.dm
	code/controllers/verbs.dm
	code/controllers/voting.dm
	code/datums/ai_laws.dm
	code/datums/browser.dm
	code/datums/computerfiles.dm
	code/datums/datacore.dm
	code/datums/datumvars.dm
	code/datums/disease.dm
	code/datums/diseases/advance/advance.dm
	code/datums/diseases/advance/presets.dm
	code/datums/diseases/advance/symptoms/beard.dm
	code/datums/diseases/advance/symptoms/choking.dm
	code/datums/diseases/advance/symptoms/confusion.dm
	code/datums/diseases/advance/symptoms/cough.dm
	code/datums/diseases/advance/symptoms/damage_converter.dm
	code/datums/diseases/advance/symptoms/deafness.dm
	code/datums/diseases/advance/symptoms/dizzy.dm
	code/datums/diseases/advance/symptoms/fever.dm
	code/datums/diseases/advance/symptoms/flesh_eating.dm
	code/datums/diseases/advance/symptoms/hallucigen.dm
	code/datums/diseases/advance/symptoms/headache.dm
	code/datums/diseases/advance/symptoms/heal.dm
	code/datums/diseases/advance/symptoms/itching.dm
	code/datums/diseases/advance/symptoms/oxygen.dm
	code/datums/diseases/advance/symptoms/shedding.dm
	code/datums/diseases/advance/symptoms/shivering.dm
	code/datums/diseases/advance/symptoms/sneeze.dm
	code/datums/diseases/advance/symptoms/stimulant.dm
	code/datums/diseases/advance/symptoms/symptoms.dm
	code/datums/diseases/advance/symptoms/visionloss.dm
	code/datums/diseases/advance/symptoms/voice_change.dm
	code/datums/diseases/advance/symptoms/vomit.dm
	code/datums/diseases/advance/symptoms/weight.dm
	code/datums/diseases/advance/symptoms/youth.dm
	code/datums/diseases/appendicitis.dm
	code/datums/diseases/beesease.dm
	code/datums/diseases/brainrot.dm
	code/datums/diseases/cold.dm
	code/datums/diseases/cold9.dm
	code/datums/diseases/dna_spread.dm
	code/datums/diseases/fake_gbs.dm
	code/datums/diseases/flu.dm
	code/datums/diseases/fluspanish.dm
	code/datums/diseases/gbs.dm
	code/datums/diseases/jungle_fever.dm
	code/datums/diseases/magnitis.dm
	code/datums/diseases/pierrot_throat.dm
	code/datums/diseases/plasmatoid.dm
	code/datums/diseases/retrovirus.dm
	code/datums/diseases/robotic_transformation.dm
	code/datums/diseases/wizarditis.dm
	code/datums/diseases/xeno_transformation.dm
	code/datums/helper_datums/construction_datum.dm
	code/datums/helper_datums/events.dm
	code/datums/helper_datums/getrev.dm
	code/datums/helper_datums/global_iterator.dm
	code/datums/helper_datums/teleport.dm
	code/datums/helper_datums/topic_input.dm
	code/datums/hud.dm
	code/datums/limbs.dm
	code/datums/mind.dm
	code/datums/mixed.dm
	code/datums/modules.dm
	code/datums/recipe.dm
	code/datums/spell.dm
	code/datums/spells/area_teleport.dm
	code/datums/spells/conjure.dm
	code/datums/spells/construct_spells.dm
	code/datums/spells/dumbfire.dm
	code/datums/spells/emplosion.dm
	code/datums/spells/ethereal_jaunt.dm
	code/datums/spells/explosion.dm
	code/datums/spells/genetic.dm
	code/datums/spells/horsemask.dm
	code/datums/spells/inflict_handler.dm
	code/datums/spells/knock.dm
	code/datums/spells/mind_transfer.dm
	code/datums/spells/projectile.dm
	code/datums/spells/trigger.dm
	code/datums/spells/turf_teleport.dm
	code/datums/spells/wizard.dm
	code/datums/sun.dm
	code/datums/supplypacks.dm
	code/datums/uplink_item.dm
	code/datums/wires/airlock.dm
	code/datums/wires/apc.dm
	code/datums/wires/camera.dm
	code/datums/wires/explosive.dm
	code/datums/wires/mulebot.dm
	code/datums/wires/particle_accelerator.dm
	code/datums/wires/radio.dm
	code/datums/wires/robot.dm
	code/datums/wires/vending.dm
	code/datums/wires/wires.dm
	code/defines/obj.dm
	code/defines/obj/weapon.dm
	code/defines/procs/AStar.dm
	code/defines/procs/captain_announce.dm
	code/defines/procs/command_alert.dm
	code/defines/procs/dbcore.dm
	code/defines/procs/statistics.dm
	code/game/area/Space Station 13 areas.dm
	code/game/area/ai_monitored.dm
	code/game/area/areas.dm
	code/game/asteroid.dm
	code/game/atoms.dm
	code/game/atoms_movable.dm
	code/game/communications.dm
	code/game/dna.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/blobs/core.dm
	code/game/gamemodes/blob/blobs/factory.dm
	code/game/gamemodes/blob/blobs/node.dm
	code/game/gamemodes/blob/blobs/shield.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/cult/ritual.dm
	code/game/gamemodes/cult/runes.dm
	code/game/gamemodes/cult/talisman.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/extended/extended.dm
	code/game/gamemodes/factions.dm
	code/game/gamemodes/game_mode.dm
	code/game/gamemodes/gameticker.dm
	code/game/gamemodes/intercept_report.dm
	code/game/gamemodes/malfunction/Malf_Modules.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/artefact.dm
	code/game/gamemodes/wizard/rightandwrong.dm
	code/game/gamemodes/wizard/soulstone.dm
	code/game/gamemodes/wizard/spellbook.dm
	code/game/gamemodes/wizard/wizard.dm
	code/game/jobs/access.dm
	code/game/jobs/job/assistant.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/jobprocs.dm
	code/game/jobs/jobs.dm
	code/game/jobs/whitelist.dm
	code/game/machinery/Beacon.dm
	code/game/machinery/Freezer.dm
	code/game/machinery/Sleeper.dm
	code/game/machinery/airlock_control.dm
	code/game/machinery/alarm.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/atmoalter/canister.dm
	code/game/machinery/atmoalter/meter.dm
	code/game/machinery/atmoalter/portable_atmospherics.dm
	code/game/machinery/atmoalter/pump.dm
	code/game/machinery/atmoalter/scrubber.dm
	code/game/machinery/atmoalter/zvent.dm
	code/game/machinery/autolathe.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/bots/secbot.dm
	code/game/machinery/buttons.dm
	code/game/machinery/camera/camera.dm
	code/game/machinery/camera/camera_assembly.dm
	code/game/machinery/camera/motion.dm
	code/game/machinery/camera/presets.dm
	code/game/machinery/camera/tracking.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/aifixer.dm
	code/game/machinery/computer/arcade.dm
	code/game/machinery/computer/atmos_alert.dm
	code/game/machinery/computer/buildandrepair.dm
	code/game/machinery/computer/camera.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/prisonshuttle.dm
	code/game/machinery/computer/robot.dm
	code/game/machinery/computer/security.dm
	code/game/machinery/computer/shuttle.dm
	code/game/machinery/computer/station_alert.dm
	code/game/machinery/computer/syndicate_shuttle.dm
	code/game/machinery/constructable_frame.dm
	code/game/machinery/cryo.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/alarmlock.dm
	code/game/machinery/doors/brigdoors.dm
	code/game/machinery/doors/checkForMultipleDoors.dm
	code/game/machinery/doors/door.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/doors/poddoor.dm
	code/game/machinery/doors/shutters.dm
	code/game/machinery/doors/unpowered.dm
	code/game/machinery/doors/windowdoor.dm
	code/game/machinery/doppler_array.dm
	code/game/machinery/embedded_controller/access_controller.dm
	code/game/machinery/embedded_controller/airlock_controller.dm
	code/game/machinery/embedded_controller/embedded_controller_base.dm
	code/game/machinery/embedded_controller/simple_vent_controller.dm
	code/game/machinery/flasher.dm
	code/game/machinery/hologram.dm
	code/game/machinery/igniter.dm
	code/game/machinery/kitchen/gibber.dm
	code/game/machinery/kitchen/juicer.dm
	code/game/machinery/kitchen/microwave.dm
	code/game/machinery/kitchen/monkeyrecycler.dm
	code/game/machinery/kitchen/processor.dm
	code/game/machinery/kitchen/smartfridge.dm
	code/game/machinery/lightswitch.dm
	code/game/machinery/machinery.dm
	code/game/machinery/magnet.dm
	code/game/machinery/mass_driver.dm
	code/game/machinery/navbeacon.dm
	code/game/machinery/newscaster.dm
	code/game/machinery/overview.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/robot_fabricator.dm
	code/game/machinery/shieldgen.dm
	code/game/machinery/spaceheater.dm
	code/game/machinery/status_display.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/presets.dm
	code/game/machinery/telecomms/telecomunications.dm
	code/game/machinery/telecomms/telemonitor.dm
	code/game/machinery/telecomms/traffic_control.dm
	code/game/machinery/teleporter.dm
	code/game/machinery/transformer.dm
	code/game/machinery/turrets.dm
	code/game/machinery/vending.dm
	code/game/machinery/washing_machine.dm
	code/game/machinery/wishgranter.dm
	code/game/mecha/combat/combat.dm
	code/game/mecha/combat/durand.dm
	code/game/mecha/combat/gygax.dm
	code/game/mecha/combat/honker.dm
	code/game/mecha/combat/marauder.dm
	code/game/mecha/combat/phazon.dm
	code/game/mecha/equipment/mecha_equipment.dm
	code/game/mecha/equipment/tools/medical_tools.dm
	code/game/mecha/equipment/tools/tools.dm
	code/game/mecha/equipment/tools/unused_tools.dm
	code/game/mecha/equipment/weapons/weapons.dm
	code/game/mecha/mech_bay.dm
	code/game/mecha/mech_fabricator.dm
	code/game/mecha/mecha.dm
	code/game/mecha/mecha_construction_paths.dm
	code/game/mecha/mecha_control_console.dm
	code/game/mecha/mecha_parts.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/mecha/working/working.dm
	code/game/objects/effects/aliens.dm
	code/game/objects/effects/bump_teleporter.dm
	code/game/objects/effects/decals/Cleanable/aliens.dm
	code/game/objects/effects/decals/Cleanable/humans.dm
	code/game/objects/effects/decals/Cleanable/misc.dm
	code/game/objects/effects/decals/Cleanable/robots.dm
	code/game/objects/effects/decals/cleanable.dm
	code/game/objects/effects/decals/contraband.dm
	code/game/objects/effects/decals/crayon.dm
	code/game/objects/effects/decals/misc.dm
	code/game/objects/effects/decals/remains.dm
	code/game/objects/effects/effect_system.dm
	code/game/objects/effects/forcefields.dm
	code/game/objects/effects/gibs.dm
	code/game/objects/effects/glowshroom.dm
	code/game/objects/effects/landmarks.dm
	code/game/objects/effects/manifest.dm
	code/game/objects/effects/mines.dm
	code/game/objects/effects/misc.dm
	code/game/objects/effects/overlays.dm
	code/game/objects/effects/portals.dm
	code/game/objects/effects/spawners/bombspawner.dm
	code/game/objects/effects/spawners/gibspawner.dm
	code/game/objects/effects/spawners/vaultspawner.dm
	code/game/objects/effects/spiders.dm
	code/game/objects/effects/step_triggers.dm
	code/game/objects/empulse.dm
	code/game/objects/explosion.dm
	code/game/objects/explosion_recursive.dm
	code/game/objects/items.dm
	code/game/objects/items/apc_frame.dm
	code/game/objects/items/blueprints.dm
	code/game/objects/items/bodybag.dm
	code/game/objects/items/candle.dm
	code/game/objects/items/crayons.dm
	code/game/objects/items/devices/PDA/PDA.dm
	code/game/objects/items/devices/PDA/cart.dm
	code/game/objects/items/devices/PDA/chatroom.dm
	code/game/objects/items/devices/PDA/radio.dm
	code/game/objects/items/devices/aicard.dm
	code/game/objects/items/devices/chameleonproj.dm
	code/game/objects/items/devices/flash.dm
	code/game/objects/items/devices/flashlight.dm
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/items/devices/multitool.dm
	code/game/objects/items/devices/paicard.dm
	code/game/objects/items/devices/powersink.dm
	code/game/objects/items/devices/radio/beacon.dm
	code/game/objects/items/devices/radio/electropack.dm
	code/game/objects/items/devices/radio/encryptionkey.dm
	code/game/objects/items/devices/radio/headset.dm
	code/game/objects/items/devices/radio/intercom.dm
	code/game/objects/items/devices/radio/radio.dm
	code/game/objects/items/devices/scanners.dm
	code/game/objects/items/devices/taperecorder.dm
	code/game/objects/items/devices/traitordevices.dm
	code/game/objects/items/devices/transfer_valve.dm
	code/game/objects/items/devices/uplinks.dm
	code/game/objects/items/devices/violin.dm
	code/game/objects/items/latexballoon.dm
	code/game/objects/items/robot/robot_items.dm
	code/game/objects/items/robot/robot_parts.dm
	code/game/objects/items/robot/robot_upgrades.dm
	code/game/objects/items/shooting_range.dm
	code/game/objects/items/stacks/medical.dm
	code/game/objects/items/stacks/rods.dm
	code/game/objects/items/stacks/sheets/glass.dm
	code/game/objects/items/stacks/sheets/leather.dm
	code/game/objects/items/stacks/sheets/light.dm
	code/game/objects/items/stacks/sheets/mineral.dm
	code/game/objects/items/stacks/sheets/sheets.dm
	code/game/objects/items/stacks/stack.dm
	code/game/objects/items/stacks/tiles/light.dm
	code/game/objects/items/stacks/tiles/plasteel.dm
	code/game/objects/items/stacks/tiles/tile_types.dm
	code/game/objects/items/tk_grab.dm
	code/game/objects/items/toys.dm
	code/game/objects/items/trash.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/cards_ids.dm
	code/game/objects/items/weapons/cigs_lighters.dm
	code/game/objects/items/weapons/clown_items.dm
	code/game/objects/items/weapons/cosmetics.dm
	code/game/objects/items/weapons/dice.dm
	code/game/objects/items/weapons/dna_injector.dm
	code/game/objects/items/weapons/explosives.dm
	code/game/objects/items/weapons/extinguisher.dm
	code/game/objects/items/weapons/flamethrower.dm
	code/game/objects/items/weapons/gift_wrappaper.dm
	code/game/objects/items/weapons/grenades/chem_grenade.dm
	code/game/objects/items/weapons/grenades/emgrenade.dm
	code/game/objects/items/weapons/grenades/flashbang.dm
	code/game/objects/items/weapons/grenades/grenade.dm
	code/game/objects/items/weapons/grenades/smokebomb.dm
	code/game/objects/items/weapons/grenades/spawnergrenade.dm
	code/game/objects/items/weapons/handcuffs.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/implantpad.dm
	code/game/objects/items/weapons/implants/implantuplink.dm
	code/game/objects/items/weapons/kitchen.dm
	code/game/objects/items/weapons/manuals.dm
	code/game/objects/items/weapons/melee/energy.dm
	code/game/objects/items/weapons/melee/misc.dm
	code/game/objects/items/weapons/mop.dm
	code/game/objects/items/weapons/paint.dm
	code/game/objects/items/weapons/paiwire.dm
	code/game/objects/items/weapons/power_cells.dm
	code/game/objects/items/weapons/scrolls.dm
	code/game/objects/items/weapons/shields.dm
	code/game/objects/items/weapons/singularityhammer.dm
	code/game/objects/items/weapons/storage/backpack.dm
	code/game/objects/items/weapons/storage/bags.dm
	code/game/objects/items/weapons/storage/belt.dm
	code/game/objects/items/weapons/storage/bible.dm
	code/game/objects/items/weapons/storage/boxes.dm
	code/game/objects/items/weapons/storage/briefcase.dm
	code/game/objects/items/weapons/storage/fancy.dm
	code/game/objects/items/weapons/storage/firstaid.dm
	code/game/objects/items/weapons/storage/lockbox.dm
	code/game/objects/items/weapons/storage/secure.dm
	code/game/objects/items/weapons/storage/storage.dm
	code/game/objects/items/weapons/storage/toolbox.dm
	code/game/objects/items/weapons/storage/uplink_kits.dm
	code/game/objects/items/weapons/stunbaton.dm
	code/game/objects/items/weapons/swords_axes_etc.dm
	code/game/objects/items/weapons/table_rack_parts.dm
	code/game/objects/items/weapons/tanks/jetpack.dm
	code/game/objects/items/weapons/tanks/tank_types.dm
	code/game/objects/items/weapons/tanks/tanks.dm
	code/game/objects/items/weapons/teleportation.dm
	code/game/objects/items/weapons/tools.dm
	code/game/objects/items/weapons/twohanded.dm
	code/game/objects/items/weapons/weaponry.dm
	code/game/objects/objs.dm
	code/game/objects/structures.dm
	code/game/objects/structures/OpTable.dm
	code/game/objects/structures/bedsheet_bin.dm
	code/game/objects/structures/crates_lockers/closets.dm
	code/game/objects/structures/crates_lockers/closets/coffin.dm
	code/game/objects/structures/crates_lockers/closets/crittercrate.dm
	code/game/objects/structures/crates_lockers/closets/fireaxe.dm
	code/game/objects/structures/crates_lockers/closets/fitness.dm
	code/game/objects/structures/crates_lockers/closets/gimmick.dm
	code/game/objects/structures/crates_lockers/closets/job_closets.dm
	code/game/objects/structures/crates_lockers/closets/l3closet.dm
	code/game/objects/structures/crates_lockers/closets/malfunction.dm
	code/game/objects/structures/crates_lockers/closets/secure/bar.dm
	code/game/objects/structures/crates_lockers/closets/secure/cargo.dm
	code/game/objects/structures/crates_lockers/closets/secure/engineering.dm
	code/game/objects/structures/crates_lockers/closets/secure/freezer.dm
	code/game/objects/structures/crates_lockers/closets/secure/hydroponics.dm
	code/game/objects/structures/crates_lockers/closets/secure/medical.dm
	code/game/objects/structures/crates_lockers/closets/secure/personal.dm
	code/game/objects/structures/crates_lockers/closets/secure/scientist.dm
	code/game/objects/structures/crates_lockers/closets/secure/secure_closets.dm
	code/game/objects/structures/crates_lockers/closets/secure/security.dm
	code/game/objects/structures/crates_lockers/closets/syndicate.dm
	code/game/objects/structures/crates_lockers/closets/utility_closets.dm
	code/game/objects/structures/crates_lockers/closets/wardrobe.dm
	code/game/objects/structures/crates_lockers/crates.dm
	code/game/objects/structures/crates_lockers/largecrate.dm
	code/game/objects/structures/displaycase.dm
	code/game/objects/structures/door_assembly.dm
	code/game/objects/structures/electricchair.dm
	code/game/objects/structures/extinguisher.dm
	code/game/objects/structures/false_walls.dm
	code/game/objects/structures/flora.dm
	code/game/objects/structures/girders.dm
	code/game/objects/structures/grille.dm
	code/game/objects/structures/janicart.dm
	code/game/objects/structures/kitchen_spike.dm
	code/game/objects/structures/ladders.dm
	code/game/objects/structures/lamarr_cage.dm
	code/game/objects/structures/lattice.dm
	code/game/objects/structures/mineral_doors.dm
	code/game/objects/structures/mirror.dm
	code/game/objects/structures/mop_bucket.dm
	code/game/objects/structures/morgue.dm
	code/game/objects/structures/musician.dm
	code/game/objects/structures/noticeboard.dm
	code/game/objects/structures/safe.dm
	code/game/objects/structures/signs.dm
	code/game/objects/structures/stool_bed_chair_nest/alien_nests.dm
	code/game/objects/structures/stool_bed_chair_nest/bed.dm
	code/game/objects/structures/stool_bed_chair_nest/chairs.dm
	code/game/objects/structures/stool_bed_chair_nest/stools.dm
	code/game/objects/structures/tables_racks.dm
	code/game/objects/structures/tank_dispenser.dm
	code/game/objects/structures/target_stake.dm
	code/game/objects/structures/watercloset.dm
	code/game/objects/structures/windoor_assembly.dm
	code/game/objects/structures/window.dm
	code/game/objects/weapons.dm
	code/game/shuttle_engines.dm
	code/game/skincmd.dm
	code/game/smoothwall.dm
	code/game/sound.dm
	code/game/supplyshuttle.dm
	code/game/turfs/simulated.dm
	code/game/turfs/simulated/floor.dm
	code/game/turfs/simulated/floor_types.dm
	code/game/turfs/simulated/walls.dm
	code/game/turfs/simulated/walls_mineral.dm
	code/game/turfs/simulated/walls_misc.dm
	code/game/turfs/simulated/walls_reinforced.dm
	code/game/turfs/space/space.dm
	code/game/turfs/space/transit.dm
	code/game/turfs/turf.dm
	code/game/turfs/unsimulated.dm
	code/game/turfs/unsimulated/beach.dm
	code/game/turfs/unsimulated/floor.dm
	code/game/turfs/unsimulated/walls.dm
	code/game/verbs/atom_verbs.dm
	code/game/verbs/ooc.dm
	code/game/verbs/suicide.dm
	code/game/verbs/who.dm
	code/global.dm
	code/hub.dm
	code/js/byjax.dm
	code/js/menus.dm
	code/modules/admin/DB ban/functions.dm
	code/modules/admin/IsBanned.dm
	code/modules/admin/NewBan.dm
	code/modules/admin/ToRban.dm
	code/modules/admin/admin.dm
	code/modules/admin/admin_investigate.dm
	code/modules/admin/admin_memo.dm
	code/modules/admin/admin_ranks.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/holder2.dm
	code/modules/admin/newbanjob.dm
	code/modules/admin/permissionverbs/permissionedit.dm
	code/modules/admin/player_notes.dm
	code/modules/admin/player_panel.dm
	code/modules/admin/topic.dm
	code/modules/admin/verbs/BrokenInhands.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/one_click_antag.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/ticklag.dm
	code/modules/admin/verbs/tripAI.dm
	code/modules/assembly/assembly.dm
	code/modules/assembly/bomb.dm
	code/modules/assembly/helpers.dm
	code/modules/assembly/holder.dm
	code/modules/assembly/igniter.dm
	code/modules/assembly/infrared.dm
	code/modules/assembly/mousetrap.dm
	code/modules/assembly/proximity.dm
	code/modules/assembly/shock_kit.dm
	code/modules/assembly/signaler.dm
	code/modules/assembly/timer.dm
	code/modules/awaymissions/bluespaceartillery.dm
	code/modules/awaymissions/corpse.dm
	code/modules/awaymissions/exile.dm
	code/modules/awaymissions/gateway.dm
	code/modules/awaymissions/loot.dm
	code/modules/awaymissions/maploader/dmm_suite.dm
	code/modules/awaymissions/maploader/reader.dm
	code/modules/awaymissions/maploader/swapmaps.dm
	code/modules/awaymissions/maploader/writer.dm
	code/modules/awaymissions/pamphlet.dm
	code/modules/awaymissions/trigger.dm
	code/modules/awaymissions/zlevel.dm
	code/modules/client/client defines.dm
	code/modules/client/client procs.dm
	code/modules/client/preferences.dm
	code/modules/client/preferences_savefile.dm
	code/modules/client/preferences_toggles.dm
	code/modules/clothing/clothing.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/clothing/glasses/hud.dm
	code/modules/clothing/gloves/boxing.dm
	code/modules/clothing/gloves/color.dm
	code/modules/clothing/gloves/miscellaneous.dm
	code/modules/clothing/head/collectable.dm
	code/modules/clothing/head/hardhat.dm
	code/modules/clothing/head/helmet.dm
	code/modules/clothing/head/jobs.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/head/misc_special.dm
	code/modules/clothing/head/soft_caps.dm
	code/modules/clothing/masks/boxing.dm
	code/modules/clothing/masks/breath.dm
	code/modules/clothing/masks/gasmask.dm
	code/modules/clothing/masks/miscellaneous.dm
	code/modules/clothing/shoes/colour.dm
	code/modules/clothing/shoes/magboots.dm
	code/modules/clothing/shoes/miscellaneous.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/suits/armor.dm
	code/modules/clothing/suits/bio.dm
	code/modules/clothing/suits/jobs.dm
	code/modules/clothing/suits/labcoat.dm
	code/modules/clothing/suits/miscellaneous.dm
	code/modules/clothing/suits/utility.dm
	code/modules/clothing/suits/wiz_robe.dm
	code/modules/clothing/under/chameleon.dm
	code/modules/clothing/under/color.dm
	code/modules/clothing/under/jobs/civilian.dm
	code/modules/clothing/under/jobs/engineering.dm
	code/modules/clothing/under/jobs/medsci.dm
	code/modules/clothing/under/jobs/security.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/clothing/under/shorts.dm
	code/modules/clothing/under/syndicate.dm
	code/modules/clothing/under/ties.dm
	code/modules/detectivework/detective_work.dm
	code/modules/detectivework/evidence.dm
	code/modules/detectivework/footprints_and_rag.dm
	code/modules/detectivework/scanner.dm
	code/modules/events/alien_infestation.dm
	code/modules/events/blob.dm
	code/modules/events/bluespaceanomaly.dm
	code/modules/events/brand_intelligence.dm
	code/modules/events/carp_migration.dm
	code/modules/events/communications_blackout.dm
	code/modules/events/disease_outbreak.dm
	code/modules/events/dust.dm
	code/modules/events/electrical_storm.dm
	code/modules/events/energetic_flux.dm
	code/modules/events/event.dm
	code/modules/events/event_manager.dm
	code/modules/events/gravitational_anomaly.dm
	code/modules/events/holiday/xmas.dm
	code/modules/events/immovable_rod.dm
	code/modules/events/ion_storm.dm
	code/modules/events/mass_hallucination.dm
	code/modules/events/meteor_wave.dm
	code/modules/events/ninja.dm
	code/modules/events/prison_break.dm
	code/modules/events/radiation_storm.dm
	code/modules/events/spacevine.dm
	code/modules/events/spider_infestation.dm
	code/modules/events/spontaneous_appendicitis.dm
	code/modules/events/weightless.dm
	code/modules/events/wormholes.dm
	code/modules/flufftext/Dreaming.dm
	code/modules/flufftext/Hallucination.dm
	code/modules/flufftext/TextFilters.dm
	code/modules/food/recipes_microwave.dm
	code/modules/hydroponics/biogenerator.dm
	code/modules/hydroponics/grown.dm
	code/modules/hydroponics/growninedible.dm
	code/modules/hydroponics/hydroitemcode.dm
	code/modules/hydroponics/hydroitemdefines.dm
	code/modules/hydroponics/hydroponics.dm
	code/modules/hydroponics/seed_extractor.dm
	code/modules/hydroponics/seeds.dm
	code/modules/library/lib_items.dm
	code/modules/library/lib_machines.dm
	code/modules/library/lib_readme.dm
	code/modules/mining/machine_input_output_plates.dm
	code/modules/mining/machine_processing.dm
	code/modules/mining/machine_stacking.dm
	code/modules/mining/machine_unloading.dm
	code/modules/mining/mine_areas.dm
	code/modules/mining/mine_items.dm
	code/modules/mining/mine_turfs.dm
	code/modules/mining/mint.dm
	code/modules/mining/money_bag.dm
	code/modules/mining/ores_coins.dm
	code/modules/mining/satchel_ore_boxdm.dm
	code/modules/mob/dead/death.dm
	code/modules/mob/dead/observer/hud.dm
	code/modules/mob/dead/observer/login.dm
	code/modules/mob/dead/observer/login.dm.bak
	code/modules/mob/dead/observer/logout.dm
	code/modules/mob/dead/observer/observer.dm
	code/modules/mob/dead/observer/observer.dm.bak
	code/modules/mob/dead/observer/say.dm
	code/modules/mob/dead/observer/say.dm.bak
	code/modules/mob/death.dm
	code/modules/mob/inventory.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/emote.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/inventory.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/humanoid/update_icons.dm
	code/modules/mob/living/carbon/alien/larva/death.dm
	code/modules/mob/living/carbon/alien/larva/emote.dm
	code/modules/mob/living/carbon/alien/larva/hud.dm
	code/modules/mob/living/carbon/alien/larva/inventory.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/larva/update_icons.dm
	code/modules/mob/living/carbon/alien/login.dm
	code/modules/mob/living/carbon/alien/logout.dm
	code/modules/mob/living/carbon/alien/powers.dm
	code/modules/mob/living/carbon/alien/say.dm
	code/modules/mob/living/carbon/alien/screen.dm
	code/modules/mob/living/carbon/alien/special/alien_embryo.dm
	code/modules/mob/living/carbon/alien/special/facehugger.dm
	code/modules/mob/living/carbon/brain/MMI.dm
	code/modules/mob/living/carbon/brain/brain.dm
	code/modules/mob/living/carbon/brain/brain_item.dm
	code/modules/mob/living/carbon/brain/death.dm
	code/modules/mob/living/carbon/brain/emote.dm
	code/modules/mob/living/carbon/brain/hud.dm
	code/modules/mob/living/carbon/brain/life.dm
	code/modules/mob/living/carbon/brain/login.dm
	code/modules/mob/living/carbon/brain/say.dm
	code/modules/mob/living/carbon/carbon.dm
	code/modules/mob/living/carbon/carbon_defines.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_attackpaw.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/human_defines.dm
	code/modules/mob/living/carbon/human/human_movement.dm
	code/modules/mob/living/carbon/human/inventory.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/update_icons.dm
	code/modules/mob/living/carbon/human/whisper.dm
	code/modules/mob/living/carbon/metroid/death.dm
	code/modules/mob/living/carbon/metroid/emote.dm
	code/modules/mob/living/carbon/metroid/examine.dm
	code/modules/mob/living/carbon/metroid/hud.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/metroid/say.dm
	code/modules/mob/living/carbon/metroid/subtypes.dm
	code/modules/mob/living/carbon/metroid/update_icons.dm
	code/modules/mob/living/carbon/monkey/death.dm
	code/modules/mob/living/carbon/monkey/emote.dm
	code/modules/mob/living/carbon/monkey/examine.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/living/carbon/monkey/inventory.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/carbon/monkey/say.dm
	code/modules/mob/living/carbon/monkey/update_icons.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/living_defines.dm
	code/modules/mob/living/login.dm
	code/modules/mob/living/logout.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/freelook/cameranet.dm
	code/modules/mob/living/silicon/ai/freelook/chunk.dm
	code/modules/mob/living/silicon/ai/freelook/eye.dm
	code/modules/mob/living/silicon/ai/freelook/read_me.dm
	code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
	code/modules/mob/living/silicon/ai/hud.dm
	code/modules/mob/living/silicon/ai/laws.dm
	code/modules/mob/living/silicon/ai/life.dm
	code/modules/mob/living/silicon/ai/login.dm
	code/modules/mob/living/silicon/ai/logout.dm
	code/modules/mob/living/silicon/ai/say.dm
	code/modules/mob/living/silicon/death.dm
	code/modules/mob/living/silicon/decoy/death.dm
	code/modules/mob/living/silicon/decoy/decoy.dm
	code/modules/mob/living/silicon/decoy/life.dm
	code/modules/mob/living/silicon/login.dm
	code/modules/mob/living/silicon/pai/death.dm
	code/modules/mob/living/silicon/pai/examine.dm
	code/modules/mob/living/silicon/pai/hud.dm
	code/modules/mob/living/silicon/pai/life.dm
	code/modules/mob/living/silicon/pai/pai.dm
	code/modules/mob/living/silicon/pai/personality.dm
	code/modules/mob/living/silicon/pai/recruit.dm
	code/modules/mob/living/silicon/pai/say.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/inventory.dm
	code/modules/mob/living/silicon/robot/laws.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/robot_movement.dm
	code/modules/mob/living/silicon/robot/say.dm
	code/modules/mob/living/silicon/say.dm
	code/modules/mob/living/silicon/silicon.dm
	code/modules/mob/living/simple_animal/constructs.dm
	code/modules/mob/living/simple_animal/corpse.dm
	code/modules/mob/living/simple_animal/friendly/cat.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/friendly/crab.dm
	code/modules/mob/living/simple_animal/friendly/farm_animals.dm
	code/modules/mob/living/simple_animal/friendly/lizard.dm
	code/modules/mob/living/simple_animal/friendly/mouse.dm
	code/modules/mob/living/simple_animal/friendly/mushroom.dm
	code/modules/mob/living/simple_animal/friendly/slime.dm
	code/modules/mob/living/simple_animal/friendly/tomato.dm
	code/modules/mob/living/simple_animal/hostile/alien.dm
	code/modules/mob/living/simple_animal/hostile/bear.dm
	code/modules/mob/living/simple_animal/hostile/carp.dm
	code/modules/mob/living/simple_animal/hostile/creature.dm
	code/modules/mob/living/simple_animal/hostile/faithless.dm
	code/modules/mob/living/simple_animal/hostile/giant_spider.dm
	code/modules/mob/living/simple_animal/hostile/hivebot.dm
	code/modules/mob/living/simple_animal/hostile/hostile.dm
	code/modules/mob/living/simple_animal/hostile/mimic.dm
	code/modules/mob/living/simple_animal/hostile/pirate.dm
	code/modules/mob/living/simple_animal/hostile/retaliate/clown.dm
	code/modules/mob/living/simple_animal/hostile/retaliate/retaliate.dm
	code/modules/mob/living/simple_animal/hostile/russian.dm
	code/modules/mob/living/simple_animal/hostile/syndicate.dm
	code/modules/mob/living/simple_animal/hostile/tree.dm
	code/modules/mob/living/simple_animal/parrot.dm
	code/modules/mob/living/simple_animal/shade.dm
	code/modules/mob/living/simple_animal/simple_animal.dm
	code/modules/mob/living/simple_animal/worm.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/hud.dm
	code/modules/mob/new_player/login.dm
	code/modules/mob/new_player/logout.dm
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/poll.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/mob/say.dm
	code/modules/mob/screen.dm
	code/modules/mob/transform_procs.dm
	code/modules/mob/update_icons.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/photography.dm
	code/modules/paperwork/stamps.dm
	code/modules/power/antimatter/containment_jar.dm
	code/modules/power/antimatter/control.dm
	code/modules/power/antimatter/shielding.dm
	code/modules/power/apc.dm
	code/modules/power/cable.dm
	code/modules/power/cell.dm
	code/modules/power/engine.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/power.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/terminal.dm
	code/modules/power/tracker.dm
	code/modules/power/turbine.dm
	code/modules/projectiles/ammunition.dm
	code/modules/projectiles/ammunition/boxes.dm
	code/modules/projectiles/ammunition/bullets.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/energy/temperature.dm
	code/modules/projectiles/guns/projectile.dm
	code/modules/projectiles/guns/projectile/automatic.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/animate.dm
	code/modules/projectiles/projectile/beams.dm
	code/modules/projectiles/projectile/bullets.dm
	code/modules/projectiles/projectile/change.dm
	code/modules/projectiles/projectile/energy.dm
	code/modules/projectiles/projectile/special.dm
	code/modules/reagents/Chemistry-Colours.dm
	code/modules/reagents/Chemistry-Holder.dm
	code/modules/reagents/Chemistry-Machinery.dm
	code/modules/reagents/Chemistry-Readme.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/modules/reagents/grenade_launcher.dm
	code/modules/reagents/reagent_containers.dm
	code/modules/reagents/reagent_containers/borghydro.dm
	code/modules/reagents/reagent_containers/dropper.dm
	code/modules/reagents/reagent_containers/food.dm
	code/modules/reagents/reagent_containers/food/condiment.dm
	code/modules/reagents/reagent_containers/food/drinks.dm
	code/modules/reagents/reagent_containers/food/drinks/bottle.dm
	code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
	code/modules/reagents/reagent_containers/food/drinks/jar.dm
	code/modules/reagents/reagent_containers/food/snacks.dm
	code/modules/reagents/reagent_containers/food/snacks/meat.dm
	code/modules/reagents/reagent_containers/glass.dm
	code/modules/reagents/reagent_containers/glass/bottle.dm
	code/modules/reagents/reagent_containers/glass/bottle/robot.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/spray.dm
	code/modules/reagents/reagent_containers/syringes.dm
	code/modules/reagents/reagent_dispenser.dm
	code/modules/reagents/syringe_gun.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/circuitprinter.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/rd-readme.dm
	code/modules/research/rdconsole.dm
	code/modules/research/rdmachines.dm
	code/modules/research/server.dm
	code/modules/scripting/AST/AST Nodes.dm
	code/modules/scripting/AST/Blocks.dm
	code/modules/scripting/AST/Operators/Binary Operators.dm
	code/modules/scripting/AST/Operators/Unary Operators.dm
	code/modules/scripting/AST/Statements.dm
	code/modules/scripting/Errors.dm
	code/modules/scripting/IDE.dm
	code/modules/scripting/Implementations/Telecomms.dm
	code/modules/scripting/Implementations/_Logic.dm
	code/modules/scripting/Interpreter/Evaluation.dm
	code/modules/scripting/Interpreter/Interaction.dm
	code/modules/scripting/Interpreter/Interpreter.dm
	code/modules/scripting/Interpreter/Scope.dm
	code/modules/scripting/Options.dm
	code/modules/scripting/Parser/Expressions.dm
	code/modules/scripting/Parser/Keywords.dm
	code/modules/scripting/Parser/Parser.dm
	code/modules/scripting/Scanner/Scanner.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/modules/surgery/appendectomy.dm
	code/modules/surgery/brain_removal.dm
	code/modules/surgery/cavity_implant.dm
	code/modules/surgery/core_removal.dm
	code/modules/surgery/eye_surgery.dm
	code/modules/surgery/gender_reassignment.dm
	code/modules/surgery/generic_steps.dm
	code/modules/surgery/helpers.dm
	code/modules/surgery/implant_removal.dm
	code/modules/surgery/lipoplasty.dm
	code/modules/surgery/organs/helpers.dm
	code/modules/surgery/organs/organ.dm
	code/modules/surgery/plastic_surgery.dm
	code/modules/surgery/surgery.dm
	code/modules/surgery/surgery_step.dm
	code/modules/surgery/tools.dm
	code/modules/surgery/xenomorph_removal.dm
	code/names.dm
	code/stylesheet.dm
	code/unused/Agouri_stuff.dm
	code/unused/BrokenInhands.dm
	code/unused/Ultralight.dm
	code/unused/Virus2Prob.dm
	code/unused/_debug.dm
	code/unused/ai_lockdown.dm
	code/unused/airtunnel.dm
	code/unused/alien_embryo.dm
	code/unused/assemblies.dm
	code/unused/asteroiddevice.dm
	code/unused/authorize.dm
	code/unused/beast/bodypart.dm
	code/unused/beast/death.dm
	code/unused/biomass_rift.dm
	code/unused/blender.dm
	code/unused/brewing.dm
	code/unused/cable_heavyduty.dm
	code/unused/cable_logic.dm
	code/unused/carpetsplosion.dm
	code/unused/computer2/airlock_control.dm
	code/unused/computer2/arcade.dm
	code/unused/computer2/base_program.dm
	code/unused/computer2/buildandrepair.dm
	code/unused/computer2/computerII.dm
	code/unused/computer2/filebrowse.dm
	code/unused/computer2/med_rec.dm
	code/unused/computer2/messenger.dm
	code/unused/computer2/peripherals.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/dna_mutations.dm
	code/unused/filter_control.dm
	code/unused/game_kit.dm
	code/unused/gamemodes/ctf.dm
	code/unused/gamemodes/ctf_items.dm
	code/unused/gamemodes/deathmatch.dm
	code/unused/gamemodes/monkey.dm
	code/unused/gamemodes/restructuring.dm
	code/unused/gamemodes/ruby.dm
	code/unused/heater.dm
	code/unused/hivebot/death.dm
	code/unused/hivebot/emote.dm
	code/unused/hivebot/examine.dm
	code/unused/hivebot/hive_modules.dm
	code/unused/hivebot/hivebot.dm
	code/unused/hivebot/hivebotdefine.dm
	code/unused/hivebot/hud.dm
	code/unused/hivebot/life.dm
	code/unused/hivebot/login.dm
	code/unused/hivebot/mainframe.dm
	code/unused/hivebot/say.dm
	code/unused/jobs.dm
	code/unused/mining/datum_processing_recipe.dm
	code/unused/mining/machine_craftlathe_unused.dm
	code/unused/mining/machine_gas_extractor_unused.dm
	code/unused/mining/machine_purifier_unused.dm
	code/unused/mining/mine_generator_unused.dm
	code/unused/mining/rail_unused.dm
	code/unused/mining/spaceship_builder_unused.dm
	code/unused/musicplayer.dm
	code/unused/new_year.dm
	code/unused/newcombatsystem.dm
	code/unused/optics/beam.dm
	code/unused/optics/laser-pointer.dm
	code/unused/optics/mirror.dm
	code/unused/pain.dm
	code/unused/pda2/base_os.dm
	code/unused/pda2/base_program.dm
	code/unused/pda2/pda2.dm
	code/unused/pda2/record_progs.dm
	code/unused/pda2/scanners.dm
	code/unused/pda2/smallprogs.dm
	code/unused/pipe.dm
	code/unused/pipe_filter.dm
	code/unused/powerarmor/powerarmor.dm
	code/unused/powerarmor/powerarmorcomponents.dm
	code/unused/scrap.dm
	code/unused/shuttle_engines.dm
	code/unused/siphs.dm
	code/unused/spacecraft/manufacturing.dm
	code/unused/spacecraft/shipcore.dm
	code/unused/specops.dm
	code/unused/specops_shuttle.dm
	code/unused/spells.dm
	code/unused/splash_simulation.dm
	code/unused/tensioner.dm
	code/unused/traps.dm
	code/unused/travel.dm
	code/unused/vehicle.dm
	code/world.dm
	config/access levels.txt
	config/admin_ranks.txt
	config/admins.txt
	config/config.txt
	config/dbconfig.txt
	config/game_options.txt
	config/jobs.txt
	config/motd.txt
	config/names/adjectives.txt
	config/names/ai.txt
	config/names/clown.txt
	config/names/death_commando.txt
	config/names/first.txt
	config/names/first_female.txt
	config/names/first_male.txt
	config/names/last.txt
	config/names/ninjaname.txt
	config/names/ninjatitle.txt
	config/names/verbs.txt
	config/names/wizardfirst.txt
	config/names/wizardsecond.txt
	config/rules.html
	data/mode.txt
	html/admin_pm.html
	html/archivedchangelog.html
	html/browser/common.css
	html/browser/cryo.css
	html/browser/scannernew.css
	html/browser/sleeper.css
	html/changelog.css
	html/changelog.html
	html/changelog.js
	html/create_object.html
	html/help.html
	html/old_add-to-changelog.html
	html/panels.css
	html/search.js
	icons/misc/fullscreen.dmi
	icons/mob/back.dmi
	icons/mob/human.dmi
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi
	icons/obj/basketball.dmi
	icons/obj/bureaucracy.dmi
	icons/obj/lighting.dmi
	icons/obj/objects.dmi
	icons/obj/stationobjs.dmi
	icons/obj/storage.dmi
	icons/obj/structures.dmi
	interface/interface.dm
	interface/skin.dmf
	maps/MetaStation v27G-II.dmm
	maps/RandomZLevels/Academy.dm
	maps/RandomZLevels/Academy.dmm
	maps/RandomZLevels/arcticwaste.dmm
	maps/RandomZLevels/beach.dmm
	maps/RandomZLevels/blackmarketpackers.dmm
	maps/RandomZLevels/challenge.dm
	maps/RandomZLevels/challenge.dmm
	maps/RandomZLevels/example.dmm
	maps/RandomZLevels/fileList.txt
	maps/RandomZLevels/listeningpost.dmm
	maps/RandomZLevels/spacebattle.dmm
	maps/RandomZLevels/stationCollision.dm
	maps/RandomZLevels/stationCollision.dmm
	maps/RandomZLevels/wildwest.dm
	maps/RandomZLevels/wildwest.dmm
	maps/tgstation.2.1.2.dmm
	tgstation.dme
	tools/Redirector/Configurations.dm
	tools/Redirector/Redirect_Tgstation.dme
	tools/Redirector/Redirector.dm
	tools/Redirector/config.txt
	tools/Redirector/skin.dmf
	tools/Redirector/textprocs.dm
	tools/Runtime Condenser/Input.txt
	tools/Runtime Condenser/Main.cpp
	tools/Runtime Condenser/Output.txt
	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
Copying settings over
Added back the sweet custom splash screen art.