diff --git a/baystation12.dme b/baystation12.dme
index e5be9e5a6d7..bb8050aed8f 100644
--- a/baystation12.dme
+++ b/baystation12.dme
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
// DM Environment file for baystation12.dme.
// All manual changes should be made outside the BEGIN_ and END_ blocks.
// New source code should be placed in .dm files: choose File/New --> Code File.
@@ -1144,3 +1145,1119 @@
#include "interface\skin.dmf"
#include "maps\tgstation.2.0.8.dmm"
// END_INCLUDE
+=======
+// DM Environment file for baystation12.dme.
+// All manual changes should be made outside the BEGIN_ and END_ blocks.
+// New source code should be placed in .dm files: choose File/New --> Code File.
+// BEGIN_INTERNALS
+// END_INTERNALS
+// BEGIN_FILE_DIR
+#define FILE_DIR .
+#define FILE_DIR "code"
+#define FILE_DIR "code/ATMOSPHERICS"
+#define FILE_DIR "code/ATMOSPHERICS/components"
+#define FILE_DIR "code/ATMOSPHERICS/components/binary_devices"
+#define FILE_DIR "code/ATMOSPHERICS/components/trinary_devices"
+#define FILE_DIR "code/ATMOSPHERICS/components/unary"
+#define FILE_DIR "code/datums"
+#define FILE_DIR "code/datums/diseases"
+#define FILE_DIR "code/datums/helper_datums"
+#define FILE_DIR "code/datums/spells"
+#define FILE_DIR "code/defines"
+#define FILE_DIR "code/defines/area"
+#define FILE_DIR "code/defines/mob"
+#define FILE_DIR "code/defines/mob/dead"
+#define FILE_DIR "code/defines/mob/living"
+#define FILE_DIR "code/defines/mob/living/carbon"
+#define FILE_DIR "code/defines/mob/living/silicon"
+#define FILE_DIR "code/defines/mob/simple_animal"
+#define FILE_DIR "code/defines/obj"
+#define FILE_DIR "code/defines/obj/clothing"
+#define FILE_DIR "code/defines/procs"
+#define FILE_DIR "code/defines/sd_procs"
+#define FILE_DIR "code/FEA"
+#define FILE_DIR "code/game"
+#define FILE_DIR "code/game/area"
+#define FILE_DIR "code/game/asteroid"
+#define FILE_DIR "code/game/events"
+#define FILE_DIR "code/game/events/EventProcs"
+#define FILE_DIR "code/game/events/Events"
+#define FILE_DIR "code/game/gamemodes"
+#define FILE_DIR "code/game/gamemodes/autotraitor"
+#define FILE_DIR "code/game/gamemodes/blob"
+#define FILE_DIR "code/game/gamemodes/changeling"
+#define FILE_DIR "code/game/gamemodes/cult"
+#define FILE_DIR "code/game/gamemodes/extended"
+#define FILE_DIR "code/game/gamemodes/malfunction"
+#define FILE_DIR "code/game/gamemodes/meteor"
+#define FILE_DIR "code/game/gamemodes/nuclear"
+#define FILE_DIR "code/game/gamemodes/revolution"
+#define FILE_DIR "code/game/gamemodes/sandbox"
+#define FILE_DIR "code/game/gamemodes/traitor"
+#define FILE_DIR "code/game/gamemodes/wizard"
+#define FILE_DIR "code/game/jobs"
+#define FILE_DIR "code/game/jobs/job"
+#define FILE_DIR "code/game/machinery"
+#define FILE_DIR "code/game/machinery/atmoalter"
+#define FILE_DIR "code/game/machinery/bots"
+#define FILE_DIR "code/game/machinery/computer"
+#define FILE_DIR "code/game/machinery/doors"
+#define FILE_DIR "code/game/machinery/embedded_controller"
+#define FILE_DIR "code/game/machinery/kitchen"
+#define FILE_DIR "code/game/machinery/pipe"
+#define FILE_DIR "code/game/machinery/telecomms"
+#define FILE_DIR "code/game/magic"
+#define FILE_DIR "code/game/magic/cultist"
+#define FILE_DIR "code/game/mecha"
+#define FILE_DIR "code/game/mecha/combat"
+#define FILE_DIR "code/game/mecha/equipment"
+#define FILE_DIR "code/game/mecha/equipment/tools"
+#define FILE_DIR "code/game/mecha/equipment/weapons"
+#define FILE_DIR "code/game/mecha/working"
+#define FILE_DIR "code/game/objects"
+#define FILE_DIR "code/game/objects/alien"
+#define FILE_DIR "code/game/objects/closets"
+#define FILE_DIR "code/game/objects/closets/secure"
+#define FILE_DIR "code/game/objects/devices"
+#define FILE_DIR "code/game/objects/devices/PDA"
+#define FILE_DIR "code/game/objects/items"
+#define FILE_DIR "code/game/objects/items/clothing"
+#define FILE_DIR "code/game/objects/items/weapons"
+#define FILE_DIR "code/game/objects/items/weapons/implants"
+#define FILE_DIR "code/game/objects/radio"
+#define FILE_DIR "code/game/objects/secstorage"
+#define FILE_DIR "code/game/objects/stacks"
+#define FILE_DIR "code/game/objects/storage"
+#define FILE_DIR "code/game/objects/tanks"
+#define FILE_DIR "code/game/player"
+#define FILE_DIR "code/game/verbs"
+#define FILE_DIR "code/js"
+#define FILE_DIR "code/modules"
+#define FILE_DIR "code/modules/admin"
+#define FILE_DIR "code/modules/admin/verbs"
+#define FILE_DIR "code/modules/assembly"
+#define FILE_DIR "code/modules/chemical"
+#define FILE_DIR "code/modules/clothing"
+#define FILE_DIR "code/modules/clothing/glasses"
+#define FILE_DIR "code/modules/clothing/spacesuits"
+#define FILE_DIR "code/modules/clothing/suits"
+#define FILE_DIR "code/modules/clothing/uniforms"
+#define FILE_DIR "code/modules/critters"
+#define FILE_DIR "code/modules/critters/hivebots"
+#define FILE_DIR "code/modules/customitems"
+#define FILE_DIR "code/modules/DetectiveWork"
+#define FILE_DIR "code/modules/flufftext"
+#define FILE_DIR "code/modules/food"
+#define FILE_DIR "code/modules/mining"
+#define FILE_DIR "code/modules/mob"
+#define FILE_DIR "code/modules/mob/dead"
+#define FILE_DIR "code/modules/mob/dead/observer"
+#define FILE_DIR "code/modules/mob/living"
+#define FILE_DIR "code/modules/mob/living/blob"
+#define FILE_DIR "code/modules/mob/living/carbon"
+#define FILE_DIR "code/modules/mob/living/carbon/alien"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/humanoid/caste"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/larva"
+#define FILE_DIR "code/modules/mob/living/carbon/alien/special"
+#define FILE_DIR "code/modules/mob/living/carbon/brain"
+#define FILE_DIR "code/modules/mob/living/carbon/human"
+#define FILE_DIR "code/modules/mob/living/carbon/metroid"
+#define FILE_DIR "code/modules/mob/living/carbon/monkey"
+#define FILE_DIR "code/modules/mob/living/silicon"
+#define FILE_DIR "code/modules/mob/living/silicon/ai"
+#define FILE_DIR "code/modules/mob/living/silicon/decoy"
+#define FILE_DIR "code/modules/mob/living/silicon/pai"
+#define FILE_DIR "code/modules/mob/living/silicon/robot"
+#define FILE_DIR "code/modules/mob/new_player"
+#define FILE_DIR "code/modules/mob/organ"
+#define FILE_DIR "code/modules/power"
+#define FILE_DIR "code/modules/power/antimatter"
+#define FILE_DIR "code/modules/power/singularity"
+#define FILE_DIR "code/modules/power/singularity/particle_accelerator"
+#define FILE_DIR "code/modules/projectiles"
+#define FILE_DIR "code/modules/projectiles/ammunition"
+#define FILE_DIR "code/modules/projectiles/guns"
+#define FILE_DIR "code/modules/projectiles/guns/energy"
+#define FILE_DIR "code/modules/projectiles/guns/projectile"
+#define FILE_DIR "code/modules/projectiles/projectile"
+#define FILE_DIR "code/modules/recycling"
+#define FILE_DIR "code/modules/research"
+#define FILE_DIR "code/modules/scripting"
+#define FILE_DIR "code/modules/scripting/AST"
+#define FILE_DIR "code/modules/scripting/AST/Operators"
+#define FILE_DIR "code/modules/scripting/Implementations"
+#define FILE_DIR "code/modules/scripting/Interpreter"
+#define FILE_DIR "code/modules/scripting/Parser"
+#define FILE_DIR "code/modules/scripting/Scanner"
+#define FILE_DIR "code/modules/security levels"
+#define FILE_DIR "code/unused"
+#define FILE_DIR "code/unused/beast"
+#define FILE_DIR "code/unused/computer2"
+#define FILE_DIR "code/unused/gamemodes"
+#define FILE_DIR "code/unused/hivebot"
+#define FILE_DIR "code/unused/mining"
+#define FILE_DIR "code/unused/optics"
+#define FILE_DIR "code/unused/pda2"
+#define FILE_DIR "code/unused/spacecraft"
+#define FILE_DIR "code/WorkInProgress"
+#define FILE_DIR "code/WorkInProgress/Apples"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn"
+#define FILE_DIR "code/WorkInProgress/Cael_Aislinn/Tajara"
+#define FILE_DIR "code/WorkInProgress/mapload"
+#define FILE_DIR "code/WorkInProgress/Mini"
+#define FILE_DIR "code/WorkInProgress/Mloc"
+#define FILE_DIR "code/WorkInProgress/organs"
+#define FILE_DIR "code/WorkInProgress/Ported"
+#define FILE_DIR "code/WorkInProgress/Ported/Abi79"
+#define FILE_DIR "code/WorkInProgress/Ported/Bureaucracy"
+#define FILE_DIR "code/WorkInProgress/Ported/Spawners"
+#define FILE_DIR "code/WorkInProgress/Ported/ZeroPoint"
+#define FILE_DIR "code/WorkInProgress/SkyMarshal"
+#define FILE_DIR "code/WorkInProgress/Tastyfish"
+#define FILE_DIR "code/WorkInProgress/virus2"
+#define FILE_DIR "code/WorkInProgress/Wrongnumber"
+#define FILE_DIR "html"
+#define FILE_DIR "icons"
+#define FILE_DIR "icons/48x48"
+#define FILE_DIR "icons/effects"
+#define FILE_DIR "icons/misc"
+#define FILE_DIR "icons/mob"
+#define FILE_DIR "icons/obj"
+#define FILE_DIR "icons/obj/assemblies"
+#define FILE_DIR "icons/obj/atmospherics"
+#define FILE_DIR "icons/obj/clothing"
+#define FILE_DIR "icons/obj/doors"
+#define FILE_DIR "icons/obj/machines"
+#define FILE_DIR "icons/obj/pipes"
+#define FILE_DIR "icons/pda_icons"
+#define FILE_DIR "icons/spideros_icons"
+#define FILE_DIR "icons/Testing"
+#define FILE_DIR "icons/turf"
+#define FILE_DIR "icons/vending_icons"
+#define FILE_DIR "interface"
+#define FILE_DIR "maps"
+#define FILE_DIR "sound"
+#define FILE_DIR "sound/ambience"
+#define FILE_DIR "sound/announcer"
+#define FILE_DIR "sound/bots"
+#define FILE_DIR "sound/effects"
+#define FILE_DIR "sound/items"
+#define FILE_DIR "sound/machines"
+#define FILE_DIR "sound/mecha"
+#define FILE_DIR "sound/misc"
+#define FILE_DIR "sound/piano"
+#define FILE_DIR "sound/scary"
+#define FILE_DIR "sound/voice"
+#define FILE_DIR "sound/weapons"
+// END_FILE_DIR
+// BEGIN_PREFERENCES
+#define DEBUG
+// END_PREFERENCES
+// BEGIN_INCLUDE
+#include "code\names.dm"
+#include "code\setup.dm"
+#include "code\stylesheet.dm"
+#include "code\ATMOSPHERICS\atmospherics.dm"
+#include "code\ATMOSPHERICS\datum_pipe_network.dm"
+#include "code\ATMOSPHERICS\datum_pipeline.dm"
+#include "code\ATMOSPHERICS\he_pipes.dm"
+#include "code\ATMOSPHERICS\pipes.dm"
+#include "code\ATMOSPHERICS\components\portables_connector.dm"
+#include "code\ATMOSPHERICS\components\tvalve.dm"
+#include "code\ATMOSPHERICS\components\valve.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\binary_atmos_base.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\circulator.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\dp_vent_pump.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\passive_gate.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\pump.dm"
+#include "code\ATMOSPHERICS\components\binary_devices\volume_pump.dm"
+#include "code\ATMOSPHERICS\components\trinary_devices\filter.dm"
+#include "code\ATMOSPHERICS\components\trinary_devices\mixer.dm"
+#include "code\ATMOSPHERICS\components\trinary_devices\trinary_base.dm"
+#include "code\ATMOSPHERICS\components\unary\cold_sink.dm"
+#include "code\ATMOSPHERICS\components\unary\generator_input.dm"
+#include "code\ATMOSPHERICS\components\unary\heat_exchanger.dm"
+#include "code\ATMOSPHERICS\components\unary\heat_source.dm"
+#include "code\ATMOSPHERICS\components\unary\outlet_injector.dm"
+#include "code\ATMOSPHERICS\components\unary\oxygen_generator.dm"
+#include "code\ATMOSPHERICS\components\unary\unary_base.dm"
+#include "code\ATMOSPHERICS\components\unary\vent_pump.dm"
+#include "code\ATMOSPHERICS\components\unary\vent_scrubber.dm"
+#include "code\datums\ai_laws.dm"
+#include "code\datums\computerfiles.dm"
+#include "code\datums\configuration.dm"
+#include "code\datums\datumvars.dm"
+#include "code\datums\disease.dm"
+#include "code\datums\mind.dm"
+#include "code\datums\mixed.dm"
+#include "code\datums\modules.dm"
+#include "code\datums\organs.dm"
+#include "code\datums\recipe.dm"
+#include "code\datums\shuttle_controller.dm"
+#include "code\datums\spell.dm"
+#include "code\datums\sun.dm"
+#include "code\datums\vote.dm"
+#include "code\datums\diseases\alien_embryo.dm"
+#include "code\datums\diseases\appendicitis.dm"
+#include "code\datums\diseases\beesease.dm"
+#include "code\datums\diseases\brainrot.dm"
+#include "code\datums\diseases\cold.dm"
+#include "code\datums\diseases\cold9.dm"
+#include "code\datums\diseases\dna_spread.dm"
+#include "code\datums\diseases\fake_gbs.dm"
+#include "code\datums\diseases\flu.dm"
+#include "code\datums\diseases\fluspanish.dm"
+#include "code\datums\diseases\gbs.dm"
+#include "code\datums\diseases\jungle_fever.dm"
+#include "code\datums\diseases\magnitis.dm"
+#include "code\datums\diseases\pierrot_throat.dm"
+#include "code\datums\diseases\plasmatoid.dm"
+#include "code\datums\diseases\retrovirus.dm"
+#include "code\datums\diseases\rhumba_beat.dm"
+#include "code\datums\diseases\robotic_transformation.dm"
+#include "code\datums\diseases\wizarditis.dm"
+#include "code\datums\diseases\xeno_transformation.dm"
+#include "code\datums\helper_datums\construction_datum.dm"
+#include "code\datums\helper_datums\getrev.dm"
+#include "code\datums\helper_datums\global_iterator.dm"
+#include "code\datums\helper_datums\teleport.dm"
+#include "code\datums\helper_datums\tension.dm"
+#include "code\datums\helper_datums\topic_input.dm"
+#include "code\datums\spells\area_teleport.dm"
+#include "code\datums\spells\conjure.dm"
+#include "code\datums\spells\emplosion.dm"
+#include "code\datums\spells\ethereal_jaunt.dm"
+#include "code\datums\spells\explosion.dm"
+#include "code\datums\spells\genetic.dm"
+#include "code\datums\spells\inflict_handler.dm"
+#include "code\datums\spells\knock.dm"
+#include "code\datums\spells\mind_transfer.dm"
+#include "code\datums\spells\projectile.dm"
+#include "code\datums\spells\trigger.dm"
+#include "code\datums\spells\turf_teleport.dm"
+#include "code\datums\spells\wizard.dm"
+#include "code\defines\atom.dm"
+#include "code\defines\client.dm"
+#include "code\defines\global.dm"
+#include "code\defines\hub.dm"
+#include "code\defines\obj.dm"
+#include "code\defines\turf.dm"
+#include "code\defines\world.dm"
+#include "code\defines\area\Space Station 13 areas.dm"
+#include "code\defines\mob\mob.dm"
+#include "code\defines\mob\dead\observer.dm"
+#include "code\defines\mob\living\living.dm"
+#include "code\defines\mob\living\carbon\alien.dm"
+#include "code\defines\mob\living\carbon\alien_humanoid.dm"
+#include "code\defines\mob\living\carbon\alien_larva.dm"
+#include "code\defines\mob\living\carbon\carbon.dm"
+#include "code\defines\mob\living\carbon\metroid.dm"
+#include "code\defines\mob\living\silicon\ai.dm"
+#include "code\defines\mob\living\silicon\decoy.dm"
+#include "code\defines\mob\living\silicon\pai.dm"
+#include "code\defines\mob\living\silicon\robot.dm"
+#include "code\defines\mob\living\silicon\silicon.dm"
+#include "code\defines\mob\simple_animal\cat.dm"
+#include "code\defines\mob\simple_animal\corgi.dm"
+#include "code\defines\mob\simple_animal\crab.dm"
+#include "code\defines\mob\simple_animal\life.dm"
+#include "code\defines\obj\closet.dm"
+#include "code\defines\obj\clothing.dm"
+#include "code\defines\obj\computer.dm"
+#include "code\defines\obj\decal.dm"
+#include "code\defines\obj\door.dm"
+#include "code\defines\obj\hydro.dm"
+#include "code\defines\obj\machinery.dm"
+#include "code\defines\obj\radio.dm"
+#include "code\defines\obj\spawner.dm"
+#include "code\defines\obj\storage.dm"
+#include "code\defines\obj\supplypacks.dm"
+#include "code\defines\obj\toy.dm"
+#include "code\defines\obj\vending.dm"
+#include "code\defines\obj\weapon.dm"
+#include "code\defines\obj\window.dm"
+#include "code\defines\obj\clothing\costume.dm"
+#include "code\defines\obj\clothing\ears.dm"
+#include "code\defines\obj\clothing\gimmick.dm"
+#include "code\defines\obj\clothing\gloves.dm"
+#include "code\defines\obj\clothing\head.dm"
+#include "code\defines\obj\clothing\jumpsuit.dm"
+#include "code\defines\obj\clothing\mask.dm"
+#include "code\defines\obj\clothing\shoes.dm"
+#include "code\defines\procs\AStar.dm"
+#include "code\defines\procs\captain_announce.dm"
+#include "code\defines\procs\church_name.dm"
+#include "code\defines\procs\command_alert.dm"
+#include "code\defines\procs\command_name.dm"
+#include "code\defines\procs\dbcore.dm"
+#include "code\defines\procs\gamehelpers.dm"
+#include "code\defines\procs\helpers.dm"
+#include "code\defines\procs\icon_procs.dm"
+#include "code\defines\procs\icon_procs_readme.dm"
+#include "code\defines\procs\logging.dm"
+#include "code\defines\procs\religion_name.dm"
+#include "code\defines\procs\station_name.dm"
+#include "code\defines\procs\statistics.dm"
+#include "code\defines\procs\syndicate_name.dm"
+#include "code\defines\procs\time_stamp.dm"
+#include "code\defines\sd_procs\base64.dm"
+#include "code\defines\sd_procs\constants.dm"
+#include "code\defines\sd_procs\direction.dm"
+#include "code\defines\sd_procs\math.dm"
+#include "code\FEA\FEA_airgroup.dm"
+#include "code\FEA\FEA_fire.dm"
+#include "code\FEA\FEA_gas_mixture.dm"
+#include "code\FEA\FEA_group_helpers.dm"
+#include "code\FEA\FEA_system.dm"
+#include "code\FEA\FEA_turf_tile.dm"
+#include "code\game\algorithm.dm"
+#include "code\game\atom_procs.dm"
+#include "code\game\cellautomata.dm"
+#include "code\game\chemistry.dm"
+#include "code\game\communications.dm"
+#include "code\game\dna.dm"
+#include "code\game\dna_mutations.dm"
+#include "code\game\hud.dm"
+#include "code\game\json.dm"
+#include "code\game\landmarks.dm"
+#include "code\game\master_controller.dm"
+#include "code\game\prisonshuttle.dm"
+#include "code\game\response_team.dm"
+#include "code\game\shuttle_engines.dm"
+#include "code\game\skincmd.dm"
+#include "code\game\smoothwall.dm"
+#include "code\game\sound.dm"
+#include "code\game\specops_shuttle.dm"
+#include "code\game\status.dm"
+#include "code\game\supplyshuttle.dm"
+#include "code\game\syndicate_shuttle.dm"
+#include "code\game\syndicate_specops_shuttle.dm"
+#include "code\game\throwing.dm"
+#include "code\game\topic.dm"
+#include "code\game\turf.dm"
+#include "code\game\vials.dm"
+#include "code\game\vote.dm"
+#include "code\game\area\ai_monitored.dm"
+#include "code\game\area\areas.dm"
+#include "code\game\events\Event.dm"
+#include "code\game\events\EventsMain.dm"
+#include "code\game\events\EventProcs\black_hole.dm"
+#include "code\game\events\EventProcs\clang.dm"
+#include "code\game\events\EventProcs\dust.dm"
+#include "code\game\events\EventProcs\kudzu.dm"
+#include "code\game\events\EventProcs\miniblob.dm"
+#include "code\game\events\EventProcs\misc.dm"
+#include "code\game\events\EventProcs\ninja_abilities.dm"
+#include "code\game\events\EventProcs\ninja_equipment.dm"
+#include "code\game\events\EventProcs\space_ninja.dm"
+#include "code\game\events\Events\AlienInfestation.dm"
+#include "code\game\events\Events\Appendicitis.dm"
+#include "code\game\events\Events\ElectricalStorm.dm"
+#include "code\game\events\Events\GravitationalAnomaly.dm"
+#include "code\game\events\Events\ImmovableRod.dm"
+#include "code\game\events\Events\IonStorm.dm"
+#include "code\game\events\Events\MeteorStorm.dm"
+#include "code\game\events\Events\MiniBlob.dm"
+#include "code\game\events\Events\PowerOffline.dm"
+#include "code\game\events\Events\PrisonBreak.dm"
+#include "code\game\events\Events\RadiationBelt.dm"
+#include "code\game\events\Events\SpaceCarp.dm"
+#include "code\game\events\Events\SpaceNinja.dm"
+#include "code\game\events\Events\VirusEpidemic.dm"
+#include "code\game\gamemodes\game_mode.dm"
+#include "code\game\gamemodes\gameticker.dm"
+#include "code\game\gamemodes\intercept_report.dm"
+#include "code\game\gamemodes\objective.dm"
+#include "code\game\gamemodes\setupgame.dm"
+#include "code\game\gamemodes\autotraitor\autotraitor.dm"
+#include "code\game\gamemodes\blob\blob.dm"
+#include "code\game\gamemodes\blob\blob_finish.dm"
+#include "code\game\gamemodes\blob\blob_report.dm"
+#include "code\game\gamemodes\blob\theblob.dm"
+#include "code\game\gamemodes\changeling\changeling.dm"
+#include "code\game\gamemodes\changeling\changeling_powers.dm"
+#include "code\game\gamemodes\changeling\traitor_chan.dm"
+#include "code\game\gamemodes\cult\cult.dm"
+#include "code\game\gamemodes\cult\cult_items.dm"
+#include "code\game\gamemodes\extended\extended.dm"
+#include "code\game\gamemodes\malfunction\Malf_Modules.dm"
+#include "code\game\gamemodes\malfunction\malfunction.dm"
+#include "code\game\gamemodes\meteor\meteor.dm"
+#include "code\game\gamemodes\meteor\meteors.dm"
+#include "code\game\gamemodes\nuclear\nuclear.dm"
+#include "code\game\gamemodes\nuclear\nuclearbomb.dm"
+#include "code\game\gamemodes\nuclear\pinpointer.dm"
+#include "code\game\gamemodes\revolution\revolution.dm"
+#include "code\game\gamemodes\sandbox\h_sandbox.dm"
+#include "code\game\gamemodes\sandbox\sandbox.dm"
+#include "code\game\gamemodes\traitor\traitor.dm"
+#include "code\game\gamemodes\wizard\soulstone.dm"
+#include "code\game\gamemodes\wizard\spellbook.dm"
+#include "code\game\gamemodes\wizard\spells.dm"
+#include "code\game\gamemodes\wizard\wizard.dm"
+#include "code\game\jobs\access.dm"
+#include "code\game\jobs\job_controller.dm"
+#include "code\game\jobs\jobprocs.dm"
+#include "code\game\jobs\jobs.dm"
+#include "code\game\jobs\whitelist.dm"
+#include "code\game\jobs\job\assistant.dm"
+#include "code\game\jobs\job\captian.dm"
+#include "code\game\jobs\job\civilian.dm"
+#include "code\game\jobs\job\civilian_chaplain.dm"
+#include "code\game\jobs\job\engineering.dm"
+#include "code\game\jobs\job\job.dm"
+#include "code\game\jobs\job\medical.dm"
+#include "code\game\jobs\job\science.dm"
+#include "code\game\jobs\job\security.dm"
+#include "code\game\jobs\job\silicon.dm"
+#include "code\game\machinery\adv_med.dm"
+#include "code\game\machinery\ai_slipper.dm"
+#include "code\game\machinery\airlock_control.dm"
+#include "code\game\machinery\alarm.dm"
+#include "code\game\machinery\atmo_control.dm"
+#include "code\game\machinery\autolathe.dm"
+#include "code\game\machinery\biogenerator.dm"
+#include "code\game\machinery\camera.dm"
+#include "code\game\machinery\camera_circuit.dm"
+#include "code\game\machinery\cell_charger.dm"
+#include "code\game\machinery\cloning.dm"
+#include "code\game\machinery\constructable_frame.dm"
+#include "code\game\machinery\cryo.dm"
+#include "code\game\machinery\deployable.dm"
+#include "code\game\machinery\dispenser.dm"
+#include "code\game\machinery\door_control.dm"
+#include "code\game\machinery\flasher.dm"
+#include "code\game\machinery\Freezer.dm"
+#include "code\game\machinery\hologram.dm"
+#include "code\game\machinery\hydroponics.dm"
+#include "code\game\machinery\igniter.dm"
+#include "code\game\machinery\lightswitch.dm"
+#include "code\game\machinery\machinery.dm"
+#include "code\game\machinery\magnet.dm"
+#include "code\game\machinery\morgue.dm"
+#include "code\game\machinery\navbeacon.dm"
+#include "code\game\machinery\OpTable.dm"
+#include "code\game\machinery\overview.dm"
+#include "code\game\machinery\portable_turret.dm"
+#include "code\game\machinery\recharger.dm"
+#include "code\game\machinery\rechargestation.dm"
+#include "code\game\machinery\requests_console.dm"
+#include "code\game\machinery\robot_fabricator.dm"
+#include "code\game\machinery\scanner.dm"
+#include "code\game\machinery\seed_extractor.dm"
+#include "code\game\machinery\shieldgen.dm"
+#include "code\game\machinery\sink.dm"
+#include "code\game\machinery\Sleeper.dm"
+#include "code\game\machinery\spaceheater.dm"
+#include "code\game\machinery\status_display.dm"
+#include "code\game\machinery\suit_storage_unit.dm"
+#include "code\game\machinery\syndicatebeacon.dm"
+#include "code\game\machinery\teleporter.dm"
+#include "code\game\machinery\turrets.dm"
+#include "code\game\machinery\vending.dm"
+#include "code\game\machinery\walllockers.dm"
+#include "code\game\machinery\atmoalter\canister.dm"
+#include "code\game\machinery\atmoalter\meter.dm"
+#include "code\game\machinery\atmoalter\portable_atmospherics.dm"
+#include "code\game\machinery\atmoalter\pump.dm"
+#include "code\game\machinery\atmoalter\scrubber.dm"
+#include "code\game\machinery\atmoalter\zvent.dm"
+#include "code\game\machinery\bots\bots.dm"
+#include "code\game\machinery\bots\cleanbot.dm"
+#include "code\game\machinery\bots\ed209bot.dm"
+#include "code\game\machinery\bots\floorbot.dm"
+#include "code\game\machinery\bots\medbot.dm"
+#include "code\game\machinery\bots\mulebot.dm"
+#include "code\game\machinery\bots\secbot.dm"
+#include "code\game\machinery\computer\AIcore.dm"
+#include "code\game\machinery\computer\aifixer.dm"
+#include "code\game\machinery\computer\arcade.dm"
+#include "code\game\machinery\computer\atmos.dm"
+#include "code\game\machinery\computer\buildandrepair.dm"
+#include "code\game\machinery\computer\camera_monitor.dm"
+#include "code\game\machinery\computer\communications.dm"
+#include "code\game\machinery\computer\computer.dm"
+#include "code\game\machinery\computer\crew.dm"
+#include "code\game\machinery\computer\explosive.dm"
+#include "code\game\machinery\computer\hologram.dm"
+#include "code\game\machinery\computer\id.dm"
+#include "code\game\machinery\computer\lockdown.dm"
+#include "code\game\machinery\computer\medical.dm"
+#include "code\game\machinery\computer\operating.dm"
+#include "code\game\machinery\computer\power.dm"
+#include "code\game\machinery\computer\robot.dm"
+#include "code\game\machinery\computer\security.dm"
+#include "code\game\machinery\computer\shuttle.dm"
+#include "code\game\machinery\doors\airlock.dm"
+#include "code\game\machinery\doors\airlock_electronics.dm"
+#include "code\game\machinery\doors\brigdoors.dm"
+#include "code\game\machinery\doors\checkForMultipleDoors.dm"
+#include "code\game\machinery\doors\door.dm"
+#include "code\game\machinery\doors\firedoor.dm"
+#include "code\game\machinery\doors\poddoor.dm"
+#include "code\game\machinery\doors\shutters.dm"
+#include "code\game\machinery\doors\windowdoor.dm"
+#include "code\game\machinery\embedded_controller\access_controller.dm"
+#include "code\game\machinery\embedded_controller\airlock_controller.dm"
+#include "code\game\machinery\embedded_controller\embedded_controller_base.dm"
+#include "code\game\machinery\kitchen\blender.dm"
+#include "code\game\machinery\kitchen\gibber.dm"
+#include "code\game\machinery\kitchen\juicer.dm"
+#include "code\game\machinery\kitchen\microwave.dm"
+#include "code\game\machinery\kitchen\processor.dm"
+#include "code\game\machinery\pipe\construction.dm"
+#include "code\game\machinery\pipe\pipe_dispenser.dm"
+#include "code\game\machinery\telecomms\broadcaster.dm"
+#include "code\game\machinery\telecomms\logbrowser.dm"
+#include "code\game\machinery\telecomms\machine_interactions.dm"
+#include "code\game\machinery\telecomms\telecommunications.dm"
+#include "code\game\machinery\telecomms\telemonitor.dm"
+#include "code\game\machinery\telecomms\traffic_control.dm"
+#include "code\game\magic\archived_book.dm"
+#include "code\game\magic\library.dm"
+#include "code\game\magic\musician.dm"
+#include "code\game\magic\cultist\ritual.dm"
+#include "code\game\magic\cultist\runes.dm"
+#include "code\game\magic\cultist\talisman.dm"
+#include "code\game\mecha\mech_bay.dm"
+#include "code\game\mecha\mech_fabricator.dm"
+#include "code\game\mecha\mecha.dm"
+#include "code\game\mecha\mecha_construction_paths.dm"
+#include "code\game\mecha\mecha_control_console.dm"
+#include "code\game\mecha\mecha_parts.dm"
+#include "code\game\mecha\mecha_wreckage.dm"
+#include "code\game\mecha\combat\combat.dm"
+#include "code\game\mecha\combat\durand.dm"
+#include "code\game\mecha\combat\gygax.dm"
+#include "code\game\mecha\combat\honker.dm"
+#include "code\game\mecha\combat\marauder.dm"
+#include "code\game\mecha\combat\phazon.dm"
+#include "code\game\mecha\equipment\mecha_equipment.dm"
+#include "code\game\mecha\equipment\tools\tools.dm"
+#include "code\game\mecha\equipment\weapons\weapons.dm"
+#include "code\game\mecha\working\firefighter.dm"
+#include "code\game\mecha\working\ripley.dm"
+#include "code\game\mecha\working\working.dm"
+#include "code\game\objects\biomass.dm"
+#include "code\game\objects\blood.dm"
+#include "code\game\objects\bodybag.dm"
+#include "code\game\objects\bombspawner.dm"
+#include "code\game\objects\cleaner.dm"
+#include "code\game\objects\closets.dm"
+#include "code\game\objects\displaycase.dm"
+#include "code\game\objects\door_assembly.dm"
+#include "code\game\objects\effect_system.dm"
+#include "code\game\objects\empulse.dm"
+#include "code\game\objects\explosion.dm"
+#include "code\game\objects\gibs.dm"
+#include "code\game\objects\glowshroom.dm"
+#include "code\game\objects\grille.dm"
+#include "code\game\objects\items.dm"
+#include "code\game\objects\kitchen.dm"
+#include "code\game\objects\lamarr.dm"
+#include "code\game\objects\mineral_doors.dm"
+#include "code\game\objects\new_year.dm"
+#include "code\game\objects\noticeboard.dm"
+#include "code\game\objects\object_procs.dm"
+#include "code\game\objects\portals.dm"
+#include "code\game\objects\shooting_range.dm"
+#include "code\game\objects\sign_decals.dm"
+#include "code\game\objects\stool.dm"
+#include "code\game\objects\structures.dm"
+#include "code\game\objects\tables_racks.dm"
+#include "code\game\objects\tank.dm"
+#include "code\game\objects\toys.dm"
+#include "code\game\objects\transfer_valve.dm"
+#include "code\game\objects\washing_machine.dm"
+#include "code\game\objects\weapons.dm"
+#include "code\game\objects\window.dm"
+#include "code\game\objects\alien\acid.dm"
+#include "code\game\objects\alien\defines.dm"
+#include "code\game\objects\alien\egg.dm"
+#include "code\game\objects\alien\facehugger.dm"
+#include "code\game\objects\alien\resin.dm"
+#include "code\game\objects\alien\weeds.dm"
+#include "code\game\objects\closets\bombsuit.dm"
+#include "code\game\objects\closets\emergency.dm"
+#include "code\game\objects\closets\firecloset.dm"
+#include "code\game\objects\closets\gimmick.dm"
+#include "code\game\objects\closets\gmcloset.dm"
+#include "code\game\objects\closets\janitor.dm"
+#include "code\game\objects\closets\kitchen.dm"
+#include "code\game\objects\closets\l3closet.dm"
+#include "code\game\objects\closets\malfunction.dm"
+#include "code\game\objects\closets\nuclear.dm"
+#include "code\game\objects\closets\syndicate.dm"
+#include "code\game\objects\closets\thunderdome.dm"
+#include "code\game\objects\closets\walllocker.dm"
+#include "code\game\objects\closets\wardrobe.dm"
+#include "code\game\objects\closets\secure\cargo.dm"
+#include "code\game\objects\closets\secure\civilian.dm"
+#include "code\game\objects\closets\secure\engineering.dm"
+#include "code\game\objects\closets\secure\medical.dm"
+#include "code\game\objects\closets\secure\personal.dm"
+#include "code\game\objects\closets\secure\research.dm"
+#include "code\game\objects\closets\secure\scientist.dm"
+#include "code\game\objects\closets\secure\secure_closets.dm"
+#include "code\game\objects\closets\secure\security.dm"
+#include "code\game\objects\devices\aicard.dm"
+#include "code\game\objects\devices\chameleonproj.dm"
+#include "code\game\objects\devices\flash.dm"
+#include "code\game\objects\devices\flashlight.dm"
+#include "code\game\objects\devices\infra_sensor.dm"
+#include "code\game\objects\devices\multitool.dm"
+#include "code\game\objects\devices\paicard.dm"
+#include "code\game\objects\devices\powersink.dm"
+#include "code\game\objects\devices\scanners.dm"
+#include "code\game\objects\devices\shields.dm"
+#include "code\game\objects\devices\taperecorder.dm"
+#include "code\game\objects\devices\PDA\cart.dm"
+#include "code\game\objects\devices\PDA\PDA.dm"
+#include "code\game\objects\devices\PDA\radio.dm"
+#include "code\game\objects\items\apc_frame.dm"
+#include "code\game\objects\items\blueprints.dm"
+#include "code\game\objects\items\candle.dm"
+#include "code\game\objects\items\clothing.dm"
+#include "code\game\objects\items\food.dm"
+#include "code\game\objects\items\helper_procs.dm"
+#include "code\game\objects\items\item.dm"
+#include "code\game\objects\items\robot_items.dm"
+#include "code\game\objects\items\robot_parts.dm"
+#include "code\game\objects\items\shock_kit.dm"
+#include "code\game\objects\items\tk_grab.dm"
+#include "code\game\objects\items\trash.dm"
+#include "code\game\objects\items\clothing\powerarmor.dm"
+#include "code\game\objects\items\clothing\powerarmorcomponents.dm"
+#include "code\game\objects\items\weapons\AI_modules.dm"
+#include "code\game\objects\items\weapons\cameras.dm"
+#include "code\game\objects\items\weapons\cards_ids.dm"
+#include "code\game\objects\items\weapons\cigs_lighters.dm"
+#include "code\game\objects\items\weapons\clown_items.dm"
+#include "code\game\objects\items\weapons\dna_injector.dm"
+#include "code\game\objects\items\weapons\explosives.dm"
+#include "code\game\objects\items\weapons\flamethrower.dm"
+#include "code\game\objects\items\weapons\grenades.dm"
+#include "code\game\objects\items\weapons\hand_lablers.dm"
+#include "code\game\objects\items\weapons\hydroponics.dm"
+#include "code\game\objects\items\weapons\kitchen.dm"
+#include "code\game\objects\items\weapons\manuals.dm"
+#include "code\game\objects\items\weapons\medical.dm"
+#include "code\game\objects\items\weapons\mops_cleaners.dm"
+#include "code\game\objects\items\weapons\paint.dm"
+#include "code\game\objects\items\weapons\paiwire.dm"
+#include "code\game\objects\items\weapons\papers_bins.dm"
+#include "code\game\objects\items\weapons\plant_bag.dm"
+#include "code\game\objects\items\weapons\RCD.dm"
+#include "code\game\objects\items\weapons\RSF.dm"
+#include "code\game\objects\items\weapons\stungloves.dm"
+#include "code\game\objects\items\weapons\surgery_tools.dm"
+#include "code\game\objects\items\weapons\swords_axes_etc.dm"
+#include "code\game\objects\items\weapons\syndie.dm"
+#include "code\game\objects\items\weapons\table_rack_parts.dm"
+#include "code\game\objects\items\weapons\teleportation.dm"
+#include "code\game\objects\items\weapons\tiles_wires.dm"
+#include "code\game\objects\items\weapons\tools.dm"
+#include "code\game\objects\items\weapons\twohanded.dm"
+#include "code\game\objects\items\weapons\implants\implant.dm"
+#include "code\game\objects\items\weapons\implants\implantcase.dm"
+#include "code\game\objects\items\weapons\implants\implantchair.dm"
+#include "code\game\objects\items\weapons\implants\implanter.dm"
+#include "code\game\objects\items\weapons\implants\implantfreedom.dm"
+#include "code\game\objects\items\weapons\implants\implantpad.dm"
+#include "code\game\objects\radio\beacon.dm"
+#include "code\game\objects\radio\electropack.dm"
+#include "code\game\objects\radio\encryptionkey.dm"
+#include "code\game\objects\radio\headset.dm"
+#include "code\game\objects\radio\intercom.dm"
+#include "code\game\objects\radio\radio.dm"
+#include "code\game\objects\secstorage\sbriefcase.dm"
+#include "code\game\objects\secstorage\secstorage.dm"
+#include "code\game\objects\secstorage\ssafe.dm"
+#include "code\game\objects\stacks\glass.dm"
+#include "code\game\objects\stacks\metal.dm"
+#include "code\game\objects\stacks\minerals.dm"
+#include "code\game\objects\stacks\stack.dm"
+#include "code\game\objects\stacks\wood.dm"
+#include "code\game\objects\storage\backpack.dm"
+#include "code\game\objects\storage\belt.dm"
+#include "code\game\objects\storage\bible.dm"
+#include "code\game\objects\storage\briefcase.dm"
+#include "code\game\objects\storage\coat.dm"
+#include "code\game\objects\storage\crates.dm"
+#include "code\game\objects\storage\firstaid.dm"
+#include "code\game\objects\storage\kit.dm"
+#include "code\game\objects\storage\lockbox.dm"
+#include "code\game\objects\storage\storage.dm"
+#include "code\game\objects\storage\toolbox.dm"
+#include "code\game\objects\tanks\emergency.dm"
+#include "code\game\objects\tanks\jetpack.dm"
+#include "code\game\objects\tanks\oxygen.dm"
+#include "code\game\player\news.dm"
+#include "code\game\verbs\AI_status.dm"
+#include "code\game\verbs\ooc.dm"
+#include "code\game\verbs\sound.dm"
+#include "code\game\verbs\suicide.dm"
+#include "code\game\verbs\who.dm"
+#include "code\js\byjax.dm"
+#include "code\js\menus.dm"
+#include "code\modules\admin\admin.dm"
+#include "code\modules\admin\admin_verbs.dm"
+#include "code\modules\admin\banjob.dm"
+#include "code\modules\admin\create_mob.dm"
+#include "code\modules\admin\create_object.dm"
+#include "code\modules\admin\create_turf.dm"
+#include "code\modules\admin\NewBan.dm"
+#include "code\modules\admin\newbanjob.dm"
+#include "code\modules\admin\player_panel.dm"
+#include "code\modules\admin\verbs\adminhelp.dm"
+#include "code\modules\admin\verbs\adminjump.dm"
+#include "code\modules\admin\verbs\adminsay.dm"
+#include "code\modules\admin\verbs\atmosdebug.dm"
+#include "code\modules\admin\verbs\BrokenInhands.dm"
+#include "code\modules\admin\verbs\custom_event.dm"
+#include "code\modules\admin\verbs\deadsay.dm"
+#include "code\modules\admin\verbs\debug.dm"
+#include "code\modules\admin\verbs\diagnostics.dm"
+#include "code\modules\admin\verbs\gimmicks.dm"
+#include "code\modules\admin\verbs\mapping.dm"
+#include "code\modules\admin\verbs\massmodvar.dm"
+#include "code\modules\admin\verbs\MC.dm"
+#include "code\modules\admin\verbs\modifyvariables.dm"
+#include "code\modules\admin\verbs\onlyone.dm"
+#include "code\modules\admin\verbs\playsound.dm"
+#include "code\modules\admin\verbs\pray.dm"
+#include "code\modules\admin\verbs\randomverbs.dm"
+#include "code\modules\admin\verbs\striketeam.dm"
+#include "code\modules\admin\verbs\striketeam_syndicate.dm"
+#include "code\modules\admin\verbs\ticklag.dm"
+#include "code\modules\admin\verbs\tripAI.dm"
+#include "code\modules\assembly\assembly.dm"
+#include "code\modules\assembly\holder.dm"
+#include "code\modules\assembly\igniter.dm"
+#include "code\modules\assembly\infrared.dm"
+#include "code\modules\assembly\proximity.dm"
+#include "code\modules\assembly\signaler.dm"
+#include "code\modules\assembly\timer.dm"
+#include "code\modules\chemical\Chemistry-Holder.dm"
+#include "code\modules\chemical\Chemistry-Machinery.dm"
+#include "code\modules\chemical\Chemistry-Reagents.dm"
+#include "code\modules\chemical\Chemistry-Recipes.dm"
+#include "code\modules\chemical\Chemistry-Tools.dm"
+#include "code\modules\clothing\glasses.dm"
+#include "code\modules\clothing\hardhat.dm"
+#include "code\modules\clothing\spacesuit.dm"
+#include "code\modules\clothing\suit.dm"
+#include "code\modules\clothing\glasses\glasses.dm"
+#include "code\modules\clothing\glasses\hud.dm"
+#include "code\modules\clothing\spacesuits\captain.dm"
+#include "code\modules\clothing\spacesuits\miscellaneous.dm"
+#include "code\modules\clothing\spacesuits\ninja.dm"
+#include "code\modules\clothing\spacesuits\rig.dm"
+#include "code\modules\clothing\spacesuits\syndi.dm"
+#include "code\modules\clothing\spacesuits\void.dm"
+#include "code\modules\clothing\suits\armor.dm"
+#include "code\modules\clothing\suits\bio.dm"
+#include "code\modules\clothing\suits\bomb.dm"
+#include "code\modules\clothing\suits\detective.dm"
+#include "code\modules\clothing\suits\fire.dm"
+#include "code\modules\clothing\suits\heavy.dm"
+#include "code\modules\clothing\suits\hos.dm"
+#include "code\modules\clothing\suits\labcoat.dm"
+#include "code\modules\clothing\suits\miscellaneous.dm"
+#include "code\modules\clothing\suits\robe.dm"
+#include "code\modules\clothing\uniforms\lawyer.dm"
+#include "code\modules\critters\critter.dm"
+#include "code\modules\critters\critter_AI.dm"
+#include "code\modules\critters\critter_defenses.dm"
+#include "code\modules\critters\critters.dm"
+#include "code\modules\critters\hivebots\hivebot.dm"
+#include "code\modules\customitems\item_defines.dm"
+#include "code\modules\customitems\item_spawning.dm"
+#include "code\modules\DetectiveWork\detective_work.dm"
+#include "code\modules\DetectiveWork\evidence.dm"
+#include "code\modules\flufftext\Dreaming.dm"
+#include "code\modules\flufftext\Hallucination.dm"
+#include "code\modules\flufftext\TextFilters.dm"
+#include "code\modules\food\food.dm"
+#include "code\modules\food\recipes_microwave.dm"
+#include "code\modules\mining\datum_processing_recipe.dm"
+#include "code\modules\mining\machine_input_output_plates.dm"
+#include "code\modules\mining\machine_processing.dm"
+#include "code\modules\mining\machine_stacking.dm"
+#include "code\modules\mining\machine_unloading.dm"
+#include "code\modules\mining\mine_areas.dm"
+#include "code\modules\mining\mine_items.dm"
+#include "code\modules\mining\mine_turfs.dm"
+#include "code\modules\mining\mint.dm"
+#include "code\modules\mining\money_bag.dm"
+#include "code\modules\mining\ores_materials_coins.dm"
+#include "code\modules\mining\satchel_ore_box.dm"
+#include "code\modules\mob\login.dm"
+#include "code\modules\mob\logout.dm"
+#include "code\modules\mob\mob.dm"
+#include "code\modules\mob\mob_grab.dm"
+#include "code\modules\mob\mob_helpers.dm"
+#include "code\modules\mob\mob_movement.dm"
+#include "code\modules\mob\say.dm"
+#include "code\modules\mob\screen.dm"
+#include "code\modules\mob\transform_procs.dm"
+#include "code\modules\mob\dead\observer\hud.dm"
+#include "code\modules\mob\dead\observer\login.dm"
+#include "code\modules\mob\dead\observer\observer.dm"
+#include "code\modules\mob\dead\observer\say.dm"
+#include "code\modules\mob\living\damage_procs.dm"
+#include "code\modules\mob\living\living.dm"
+#include "code\modules\mob\living\living_defense.dm"
+#include "code\modules\mob\living\say.dm"
+#include "code\modules\mob\living\blob\blob.dm"
+#include "code\modules\mob\living\carbon\carbon.dm"
+#include "code\modules\mob\living\carbon\give.dm"
+#include "code\modules\mob\living\carbon\shock.dm"
+#include "code\modules\mob\living\carbon\alien\alien.dm"
+#include "code\modules\mob\living\carbon\alien\say.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\alien_powers.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\death.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\emote.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\hud.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\humanoid.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\life.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\login.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\queen.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\caste\drone.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\caste\hunter.dm"
+#include "code\modules\mob\living\carbon\alien\humanoid\caste\sentinel.dm"
+#include "code\modules\mob\living\carbon\alien\larva\death.dm"
+#include "code\modules\mob\living\carbon\alien\larva\emote.dm"
+#include "code\modules\mob\living\carbon\alien\larva\hud.dm"
+#include "code\modules\mob\living\carbon\alien\larva\larva.dm"
+#include "code\modules\mob\living\carbon\alien\larva\life.dm"
+#include "code\modules\mob\living\carbon\alien\larva\login.dm"
+#include "code\modules\mob\living\carbon\alien\larva\powers.dm"
+#include "code\modules\mob\living\carbon\alien\special\_main.dm"
+#include "code\modules\mob\living\carbon\alien\special\chryssalid.dm"
+#include "code\modules\mob\living\carbon\alien\special\ethereal.dm"
+#include "code\modules\mob\living\carbon\alien\special\floater.dm"
+#include "code\modules\mob\living\carbon\alien\special\muton.dm"
+#include "code\modules\mob\living\carbon\alien\special\sectoid.dm"
+#include "code\modules\mob\living\carbon\alien\special\snakeman.dm"
+#include "code\modules\mob\living\carbon\brain\brain.dm"
+#include "code\modules\mob\living\carbon\brain\death.dm"
+#include "code\modules\mob\living\carbon\brain\hud.dm"
+#include "code\modules\mob\living\carbon\brain\life.dm"
+#include "code\modules\mob\living\carbon\brain\MMI.dm"
+#include "code\modules\mob\living\carbon\brain\say.dm"
+#include "code\modules\mob\living\carbon\human\death.dm"
+#include "code\modules\mob\living\carbon\human\emote.dm"
+#include "code\modules\mob\living\carbon\human\examine.dm"
+#include "code\modules\mob\living\carbon\human\hud.dm"
+#include "code\modules\mob\living\carbon\human\human.dm"
+#include "code\modules\mob\living\carbon\human\human_attackalien.dm"
+#include "code\modules\mob\living\carbon\human\human_attackhand.dm"
+#include "code\modules\mob\living\carbon\human\human_attackpaw.dm"
+#include "code\modules\mob\living\carbon\human\human_damage.dm"
+#include "code\modules\mob\living\carbon\human\human_defense.dm"
+#include "code\modules\mob\living\carbon\human\human_movement.dm"
+#include "code\modules\mob\living\carbon\human\life.dm"
+#include "code\modules\mob\living\carbon\human\login.dm"
+#include "code\modules\mob\living\carbon\human\say.dm"
+#include "code\modules\mob\living\carbon\human\whisper.dm"
+#include "code\modules\mob\living\carbon\metroid\death.dm"
+#include "code\modules\mob\living\carbon\metroid\emote.dm"
+#include "code\modules\mob\living\carbon\metroid\examine.dm"
+#include "code\modules\mob\living\carbon\metroid\hud.dm"
+#include "code\modules\mob\living\carbon\metroid\life.dm"
+#include "code\modules\mob\living\carbon\metroid\login.dm"
+#include "code\modules\mob\living\carbon\metroid\metroid.dm"
+#include "code\modules\mob\living\carbon\metroid\powers.dm"
+#include "code\modules\mob\living\carbon\metroid\say.dm"
+#include "code\modules\mob\living\carbon\monkey\death.dm"
+#include "code\modules\mob\living\carbon\monkey\emote.dm"
+#include "code\modules\mob\living\carbon\monkey\examine.dm"
+#include "code\modules\mob\living\carbon\monkey\hud.dm"
+#include "code\modules\mob\living\carbon\monkey\life.dm"
+#include "code\modules\mob\living\carbon\monkey\login.dm"
+#include "code\modules\mob\living\carbon\monkey\monkey.dm"
+#include "code\modules\mob\living\carbon\monkey\powers.dm"
+#include "code\modules\mob\living\carbon\monkey\say.dm"
+#include "code\modules\mob\living\silicon\say.dm"
+#include "code\modules\mob\living\silicon\silicon.dm"
+#include "code\modules\mob\living\silicon\ai\ai.dm"
+#include "code\modules\mob\living\silicon\ai\death.dm"
+#include "code\modules\mob\living\silicon\ai\examine.dm"
+#include "code\modules\mob\living\silicon\ai\hud.dm"
+#include "code\modules\mob\living\silicon\ai\laws.dm"
+#include "code\modules\mob\living\silicon\ai\life.dm"
+#include "code\modules\mob\living\silicon\ai\login.dm"
+#include "code\modules\mob\living\silicon\ai\logout.dm"
+#include "code\modules\mob\living\silicon\ai\move.dm"
+#include "code\modules\mob\living\silicon\ai\say.dm"
+#include "code\modules\mob\living\silicon\decoy\death.dm"
+#include "code\modules\mob\living\silicon\decoy\decoy.dm"
+#include "code\modules\mob\living\silicon\decoy\life.dm"
+#include "code\modules\mob\living\silicon\pai\death.dm"
+#include "code\modules\mob\living\silicon\pai\examine.dm"
+#include "code\modules\mob\living\silicon\pai\hud.dm"
+#include "code\modules\mob\living\silicon\pai\life.dm"
+#include "code\modules\mob\living\silicon\pai\pai.dm"
+#include "code\modules\mob\living\silicon\pai\personality.dm"
+#include "code\modules\mob\living\silicon\pai\recruit.dm"
+#include "code\modules\mob\living\silicon\pai\say.dm"
+#include "code\modules\mob\living\silicon\pai\software.dm"
+#include "code\modules\mob\living\silicon\robot\death.dm"
+#include "code\modules\mob\living\silicon\robot\emote.dm"
+#include "code\modules\mob\living\silicon\robot\examine.dm"
+#include "code\modules\mob\living\silicon\robot\hud.dm"
+#include "code\modules\mob\living\silicon\robot\laws.dm"
+#include "code\modules\mob\living\silicon\robot\life.dm"
+#include "code\modules\mob\living\silicon\robot\login.dm"
+#include "code\modules\mob\living\silicon\robot\robot.dm"
+#include "code\modules\mob\living\silicon\robot\robot_defense.dm"
+#include "code\modules\mob\living\silicon\robot\robot_modules.dm"
+#include "code\modules\mob\living\silicon\robot\robot_movement.dm"
+#include "code\modules\mob\living\silicon\robot\say.dm"
+#include "code\modules\mob\living\silicon\robot\wires.dm"
+#include "code\modules\mob\new_player\hud.dm"
+#include "code\modules\mob\new_player\new_player.dm"
+#include "code\modules\mob\new_player\preferences.dm"
+#include "code\modules\mob\new_player\preferences_setup.dm"
+#include "code\modules\mob\new_player\savefile.dm"
+#include "code\modules\mob\new_player\skill.dm"
+#include "code\modules\mob\new_player\sprite_accessories.dm"
+#include "code\modules\mob\organ\organ.dm"
+#include "code\modules\mob\organ\organ_external.dm"
+#include "code\modules\mob\organ\organ_internal.dm"
+#include "code\modules\mob\organ\pain.dm"
+#include "code\modules\power\apc.dm"
+#include "code\modules\power\cable.dm"
+#include "code\modules\power\cell.dm"
+#include "code\modules\power\engine.dm"
+#include "code\modules\power\generator.dm"
+#include "code\modules\power\generator_type2.dm"
+#include "code\modules\power\lighting.dm"
+#include "code\modules\power\port_gen.dm"
+#include "code\modules\power\power.dm"
+#include "code\modules\power\sd_DynamicAreaLighting.dm"
+#include "code\modules\power\smes.dm"
+#include "code\modules\power\solar.dm"
+#include "code\modules\power\terminal.dm"
+#include "code\modules\power\tracker.dm"
+#include "code\modules\power\turbine.dm"
+#include "code\modules\power\antimatter\computer.dm"
+#include "code\modules\power\antimatter\engine.dm"
+#include "code\modules\power\antimatter\fuel.dm"
+#include "code\modules\power\singularity\collector.dm"
+#include "code\modules\power\singularity\containment_field.dm"
+#include "code\modules\power\singularity\emitter.dm"
+#include "code\modules\power\singularity\field_generator.dm"
+#include "code\modules\power\singularity\generator.dm"
+#include "code\modules\power\singularity\singularity.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle_accelerator.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle_chamber.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle_control.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle_emitter.dm"
+#include "code\modules\power\singularity\particle_accelerator\particle_power.dm"
+#include "code\modules\projectiles\ammunition.dm"
+#include "code\modules\projectiles\gun.dm"
+#include "code\modules\projectiles\projectile.dm"
+#include "code\modules\projectiles\ammunition\boxes.dm"
+#include "code\modules\projectiles\ammunition\bullets.dm"
+#include "code\modules\projectiles\guns\energy.dm"
+#include "code\modules\projectiles\guns\projectile.dm"
+#include "code\modules\projectiles\guns\energy\laser.dm"
+#include "code\modules\projectiles\guns\energy\nuclear.dm"
+#include "code\modules\projectiles\guns\energy\pulse.dm"
+#include "code\modules\projectiles\guns\energy\special.dm"
+#include "code\modules\projectiles\guns\energy\stun.dm"
+#include "code\modules\projectiles\guns\energy\temperature.dm"
+#include "code\modules\projectiles\guns\projectile\automatic.dm"
+#include "code\modules\projectiles\guns\projectile\pistol.dm"
+#include "code\modules\projectiles\guns\projectile\revolver.dm"
+#include "code\modules\projectiles\guns\projectile\shotgun.dm"
+#include "code\modules\projectiles\projectile\beams.dm"
+#include "code\modules\projectiles\projectile\bullets.dm"
+#include "code\modules\projectiles\projectile\change.dm"
+#include "code\modules\projectiles\projectile\energy.dm"
+#include "code\modules\projectiles\projectile\special.dm"
+#include "code\modules\recycling\conveyor2.dm"
+#include "code\modules\recycling\disposal-construction.dm"
+#include "code\modules\recycling\disposal.dm"
+#include "code\modules\recycling\sortingmachinery.dm"
+#include "code\modules\research\circuitprinter.dm"
+#include "code\modules\research\designs.dm"
+#include "code\modules\research\destructive_analyzer.dm"
+#include "code\modules\research\message_server.dm"
+#include "code\modules\research\protolathe.dm"
+#include "code\modules\research\rd-readme.dm"
+#include "code\modules\research\rdconsole.dm"
+#include "code\modules\research\rdmachines.dm"
+#include "code\modules\research\research.dm"
+#include "code\modules\research\server.dm"
+#include "code\modules\scripting\Errors.dm"
+#include "code\modules\scripting\IDE.dm"
+#include "code\modules\scripting\Options.dm"
+#include "code\modules\scripting\stack.dm"
+#include "code\modules\scripting\AST\AST Nodes.dm"
+#include "code\modules\scripting\AST\Blocks.dm"
+#include "code\modules\scripting\AST\Statements.dm"
+#include "code\modules\scripting\AST\Operators\Binary Operators.dm"
+#include "code\modules\scripting\AST\Operators\Unary Operators.dm"
+#include "code\modules\scripting\Implementations\_Logic.dm"
+#include "code\modules\scripting\Implementations\Telecomms.dm"
+#include "code\modules\scripting\Interpreter\Evaluation.dm"
+#include "code\modules\scripting\Interpreter\Interaction.dm"
+#include "code\modules\scripting\Interpreter\Interpreter.dm"
+#include "code\modules\scripting\Interpreter\Scope.dm"
+#include "code\modules\scripting\Parser\Expressions.dm"
+#include "code\modules\scripting\Parser\Keywords.dm"
+#include "code\modules\scripting\Parser\Parser.dm"
+#include "code\modules\scripting\Scanner\Scanner.dm"
+#include "code\modules\scripting\Scanner\Tokens.dm"
+#include "code\modules\security levels\keycard authentication.dm"
+#include "code\modules\security levels\security levels.dm"
+#include "code\WorkInProgress\AI_Visibility.dm"
+#include "code\WorkInProgress\buildmode.dm"
+#include "code\WorkInProgress\explosion_particles.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Tajara\examine.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Tajara\tajara_transformation.dm"
+#include "code\WorkInProgress\Cael_Aislinn\Tajara\tajaran.dm"
+#include "code\WorkInProgress\mapload\dmm_suite.dm"
+#include "code\WorkInProgress\mapload\reader.dm"
+#include "code\WorkInProgress\Mini\atmos_control.dm"
+#include "code\WorkInProgress\Mloc\Shortcuts.dm"
+#include "code\WorkInProgress\Ported\head.dm"
+#include "code\WorkInProgress\Ported\policetape.dm"
+#include "code\WorkInProgress\Ported\Abi79\uplink_kits.dm"
+#include "code\WorkInProgress\Ported\Abi79\uplinks.dm"
+#include "code\WorkInProgress\Ported\Bureaucracy\copier.dm"
+#include "code\WorkInProgress\Ported\Bureaucracy\filing.dm"
+#include "code\WorkInProgress\Ported\ZeroPoint\Laser2.dm"
+#include "code\WorkInProgress\Ported\ZeroPoint\LaserComputer.dm"
+#include "code\WorkInProgress\Ported\ZeroPoint\SuperMatter.dm"
+#include "code\WorkInProgress\SkyMarshal\coatrack.dm"
+#include "code\WorkInProgress\SkyMarshal\traitoritems.dm"
+#include "code\WorkInProgress\SkyMarshal\wardrobes.dm"
+#include "code\WorkInProgress\Tastyfish\Eliza.dm"
+#include "code\WorkInProgress\Tastyfish\Eliza_Data.dm"
+#include "code\WorkInProgress\Tastyfish\livestock.dm"
+#include "code\WorkInProgress\Tastyfish\paiLiza.dm"
+#include "code\WorkInProgress\Tastyfish\Parser.dm"
+#include "code\WorkInProgress\Tastyfish\wallmount_frame.dm"
+#include "code\WorkInProgress\virus2\analyser.dm"
+#include "code\WorkInProgress\virus2\antibodies.dm"
+#include "code\WorkInProgress\virus2\base.dm"
+#include "code\WorkInProgress\virus2\biohazard destroyer.dm"
+#include "code\WorkInProgress\virus2\cureimplanter.dm"
+#include "code\WorkInProgress\virus2\curer.dm"
+#include "code\WorkInProgress\virus2\diseasesplicer.dm"
+#include "code\WorkInProgress\virus2\dishincubator.dm"
+#include "code\WorkInProgress\virus2\isolator.dm"
+#include "code\WorkInProgress\virus2\monkeydispensor.dm"
+#include "code\WorkInProgress\virus2\Prob.dm"
+#include "code\WorkInProgress\Wrongnumber\weldbackpack.dm"
+#include "interface\skin.dmf"
+#include "maps\tgstation.2.0.8.dmm"
+// END_INCLUDE
+
+>>>>>>> 38ac469e88283161b33d45c5b51ee39a6ee2fc67
diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
index 7f89c66afe1..2c57d87e929 100644
--- a/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
@@ -16,8 +16,8 @@
t_him = "her"
if (src.w_uniform)
- if (src.w_uniform.blood_DNA)
- usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
+ if (src.w_uniform.blood_DNA.len)
+ usr << "\red [src.name] is wearing a[src.w_uniform.blood_DNA.len ? " bloody " : " "] \icon[src.w_uniform] [src.w_uniform.name]!"
else
usr << "\blue [src.name] is wearing a \icon[src.w_uniform] [src.w_uniform.name]."
@@ -25,8 +25,8 @@
usr << "\blue [src.name] is \icon[src.handcuffed] handcuffed!"
if (src.wear_suit)
- if (src.wear_suit.blood_DNA)
- usr << "\red [src.name] has a[src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
+ if (src.wear_suit.blood_DNA.len)
+ usr << "\red [src.name] has a[src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name] on!"
else
usr << "\blue [src.name] has a \icon[src.wear_suit] [src.wear_suit.name] on."
@@ -37,39 +37,39 @@
usr << "\blue [src.name] has a \icon[src.r_ear] [src.r_ear.name] on [t_his] right ear."
if (src.wear_mask)
- if (src.wear_mask.blood_DNA)
- usr << "\red [src.name] has a[src.wear_mask.blood_DNA ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
+ if (src.wear_mask.blood_DNA.len)
+ usr << "\red [src.name] has a[src.wear_mask.blood_DNA.len ? " bloody " : " "] \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face!"
else
usr << "\blue [src.name] has a \icon[src.wear_mask] [src.wear_mask.name] on [t_his] face."
if (src.l_hand)
- if (src.l_hand.blood_DNA)
- usr << "\red [src.name] has a[src.l_hand.blood_DNA ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
+ if (src.l_hand.blood_DNA.len)
+ usr << "\red [src.name] has a[src.l_hand.blood_DNA.len ? " bloody " : " "] \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand!"
else
usr << "\blue [src.name] has a \icon[src.l_hand] [src.l_hand.name] in [t_his] left hand."
if (src.r_hand)
- if (src.r_hand.blood_DNA)
- usr << "\red [src.name] has a[src.r_hand.blood_DNA ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
+ if (src.r_hand.blood_DNA.len)
+ usr << "\red [src.name] has a[src.r_hand.blood_DNA.len ? " bloody " : " "] \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand!"
else
usr << "\blue [src.name] has a \icon[src.r_hand] [src.r_hand.name] in [t_his] right hand."
if (src.belt)
- if (src.belt.blood_DNA)
- usr << "\red [src.name] has a[src.belt.blood_DNA ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
+ if (src.belt.blood_DNA.len)
+ usr << "\red [src.name] has a[src.belt.blood_DNA.len ? " bloody " : " "] \icon[src.belt] [src.belt.name] on [t_his] belt!"
else
usr << "\blue [src.name] has a \icon[src.belt] [src.belt.name] on [t_his] belt."
if(src.s_store)
- if(src.s_store.blood_DNA)
- usr << "\red [src.name] has a[src.s_store.blood_DNA ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
+ if(src.s_store.blood_DNA.len)
+ usr << "\red [src.name] has a[src.s_store.blood_DNA.len ? " bloody " : " "] \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]!"
else
- usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
+ usr << "\blue [src.name] has a \icon[src.s_store] [src.s_store.name] on [t_his][src.wear_suit.blood_DNA.len ? " bloody " : " "] \icon[src.wear_suit] [src.wear_suit.name]."
if (src.shoes)
- usr << "[src.shoes.blood_DNA ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
+ usr << "[src.shoes.blood_DNA.len ? "\red" : "\blue"][src.name] has a[src.shoes.blood_DNA.len ? " bloody " : " "] \icon[src.shoes] [src.shoes.name] on [t_his] feet."
if (src.gloves)
- if (src.gloves.blood_DNA)
+ if (src.gloves.blood_DNA.len)
usr << "\red [src.name] has bloody \icon[src.gloves] [src.gloves.name] on [t_his] hands!"
else
usr << "\blue [src.name] has \icon[src.gloves] [src.gloves.name] on [t_his] hands."
diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm
index b3dc11b9132..62c1877b7da 100644
--- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajara_transformation.dm
@@ -30,6 +30,7 @@
viruses = list()
for(var/datum/disease/D in O.viruses)
D.affected_mob = O
+ O.flavor_text = flavor_text
if (client)
client.mob = O
diff --git a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
index b07f634aa9d..3a718e18de5 100644
--- a/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
+++ b/code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
@@ -439,6 +439,13 @@
invisibility = 2
else
invisibility = 0
+ if(targeted_by && target_locked)
+ overlays += target_locked
+ else if(targeted_by)
+ target_locked = new /obj/effect/target_locked(src)
+ overlays += target_locked
+ else if(!targeted_by && target_locked)
+ del(target_locked)
/*
for (var/mob/M in viewers(1, src))//For the love of god DO NOT REFRESH EVERY SECOND - Mport
diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm
index c20b69da825..d04a108570b 100755
--- a/code/WorkInProgress/SkyMarshal/wardrobes.dm
+++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm
@@ -62,6 +62,7 @@
update_icon()
examine()
+ set src in oview(7)
..()
if(src in usr)
usr << "It claims to contain [contents.len ? descriptor : descriptor + "... but it looks empty"]."
@@ -415,6 +416,7 @@
new /obj/item/weapon/storage/box(BPK)
new /obj/item/weapon/fcardholder(src)
new /obj/item/weapon/clipboard(src)
+ new /obj/item/weapon/notebook(src)
new /obj/item/device/detective_scanner(src)
new /obj/item/policetaperoll(src)
new /obj/item/weapon/storage/box/evidence(src)
diff --git a/code/WorkInProgress/virus2/base.dm b/code/WorkInProgress/virus2/base.dm
index d5520802310..e66a8828f09 100644
--- a/code/WorkInProgress/virus2/base.dm
+++ b/code/WorkInProgress/virus2/base.dm
@@ -427,12 +427,6 @@ proc/airborne_can_reach(turf/source, turf/target)
activate(var/mob/living/carbon/mob,var/multiplier)
mob.toxloss += 15
-/*/datum/disease2/effect/greater/hallucinations
- name = "Hallucinational Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.hallucination += 25*/
-
/datum/disease2/effect/greater/sleepy
name = "Resting syndrome"
stage = 3
@@ -514,12 +508,6 @@ proc/airborne_can_reach(turf/source, turf/target)
var/obj/effect/decal/cleanable/mucus/this = new(mob.loc)
this.virus2 = mob.virus2
-/*/datum/disease2/effect/lesser/hallucinations
- name = "Hallucinational Syndrome"
- stage = 3
- activate(var/mob/living/carbon/mob,var/multiplier)
- mob.hallucination += 5*/
-
/*/datum/disease2/effect/lesser/arm
name = "Disarming Syndrome"
stage = 4
diff --git a/code/datums/datumvars.dm b/code/datums/datumvars.dm
index 433fd4c0af4..591efbc60d7 100644
--- a/code/datums/datumvars.dm
+++ b/code/datums/datumvars.dm
@@ -172,7 +172,7 @@ client
body += "
<< [dir2text(A.dir)] >>"
if(istype(A,/mob))
var/mob/M = A
- body += "
[M.ckey ? M.ckey : "No ckey"] / [M.real_name ? M.real_name : "No real name"]"
+ body += "
[M.key ? M.key : "No key"] / [M.real_name ? M.real_name : "No real name"]"
else
body += "[D]"
diff --git a/code/datums/helper_datums/teleport.dm b/code/datums/helper_datums/teleport.dm
index 39967ecd5ca..c37cd040c0e 100644
--- a/code/datums/helper_datums/teleport.dm
+++ b/code/datums/helper_datums/teleport.dm
@@ -3,6 +3,10 @@
new /datum/teleport/instant/science(arglist(args))
return
+/proc/do_teleport_stealth(ateleatom, adestination, aprecision=0, afteleport=1, aeffectin=null, aeffectout=null, asoundin=null, asoundout=null)
+ new /datum/teleport/instant(arglist(args))
+ return
+
/datum/teleport
var/atom/movable/teleatom //atom to teleport
var/atom/destination //destination to teleport to
diff --git a/code/datums/mixed.dm b/code/datums/mixed.dm
index 81dcae78675..cbe786dbe29 100644
--- a/code/datums/mixed.dm
+++ b/code/datums/mixed.dm
@@ -1,49 +1,49 @@
/datum/data
- var/name = "data"
- var/size = 1.0
- //name = null
+ var
+ name = "data"
+ size = 1.0
+
+
/datum/data/function
name = "function"
size = 2.0
+
+
/datum/data/function/data_control
name = "data control"
+
+
/datum/data/function/id_changer
name = "id changer"
+
+
/datum/data/record
name = "record"
size = 5.0
-
var/list/fields = list( )
+
/datum/data/text
name = "text"
var/data = null
-/datum/station_state
- var/floor = 0
- var/wall = 0
- var/r_wall = 0
- var/window = 0
- var/door = 0
- var/grille = 0
- var/mach = 0
+
/datum/powernet
- var/list/cables = list() // all cables & junctions
- var/list/nodes = list() // all APCs & sources
+ var
+ list/cables = list() // all cables & junctions
+ list/nodes = list() // all APCs & sources
- var/newload = 0
- var/load = 0
- var/newavail = 0
- var/avail = 0
+ newload = 0
+ load = 0
+ newavail = 0
+ avail = 0
+ viewload = 0
+ number = 0
+ perapc = 0 // per-apc avilability
+ netexcess = 0
- var/viewload = 0
- var/number = 0
-
- var/perapc = 0 // per-apc avilability
-
- var/netexcess = 0
/datum/debug
var/list/debuglist
\ No newline at end of file
diff --git a/code/defines/area/Space Station 13 areas.dm b/code/defines/area/Space Station 13 areas.dm
index aea01c734c4..51900670bd6 100755
--- a/code/defines/area/Space Station 13 areas.dm
+++ b/code/defines/area/Space Station 13 areas.dm
@@ -557,10 +557,6 @@ proc/process_ghost_teleport_locs()
name = "Escape Shuttle Hallway"
icon_state = "escape"
-/area/hallway/secondary/construction
- name = "Construction Area"
- icon_state = "construction"
-
/area/hallway/secondary/entry
name = "Arrival Shuttle Hallway"
icon_state = "entry"
@@ -585,16 +581,24 @@ proc/process_ghost_teleport_locs()
name = "Courtroom"
icon_state = "courtroom"
-/area/crew_quarters/heads
+/area/crew_quarters/heads/hop
name = "Head of Personnel's Quarters"
icon_state = "head_quarters"
-/area/crew_quarters/hor
- name = "Research Director's Office"
+/area/crew_quarters/heads/hor
+ name = "Research Director's Quarters"
icon_state = "head_quarters"
-/area/crew_quarters/chief
- name = "Chief Engineer's Office"
+/area/crew_quarters/heads/ce
+ name = "Chief Engineer's Quarters"
+ icon_state = "head_quarters"
+
+/area/crew_quarters/heads/hos
+ name = "Head of Security's Quarters"
+ icon_state = "head_quarters"
+
+/area/crew_quarters/heads/cmo
+ name = "Chief Medical Officer's Quarters"
icon_state = "head_quarters"
/area/mint
@@ -982,6 +986,10 @@ proc/process_ghost_teleport_locs()
name = "Research Lab"
icon_state = "researchlab"
+/area/toxins/rdoffice
+ name = "Research Director's Office"
+ icon_state = "head_quarters"
+
/area/toxins/xenobiology
name = "Xenobiology Lab"
icon_state = "xenolab"
@@ -1157,6 +1165,14 @@ proc/process_ghost_teleport_locs()
name = "Construction Area"
icon_state = "yellow"
+/area/construction/under_construction_small
+ name = "Construction Area"
+ icon_state = "construction"
+
+/area/construction/under_construction_large
+ name = "Construction Area"
+ icon_state = "construction"
+
/area/construction/supplyshuttle
name = "Supply Shuttle"
icon_state = "yellow"
diff --git a/code/defines/global.dm b/code/defines/global.dm
index 6ab31cc2054..4006eb1af51 100644
--- a/code/defines/global.dm
+++ b/code/defines/global.dm
@@ -120,8 +120,6 @@ var
list/prisonsecuritywarp = list() //prison security goes to these
list/prisonwarped = list() //list of players already warped
list/blobstart = list()
- list/blobs = list()
- list/active_blobs = list()
// list/traitors = list() //traitor list
list/cardinal = list( NORTH, SOUTH, EAST, WEST )
list/alldirs = list(NORTH, SOUTH, EAST, WEST, NORTHEAST, NORTHWEST, SOUTHEAST, SOUTHWEST)
@@ -223,4 +221,4 @@ var
forumsqllogin = "root"
forumsqlpass = ""
forum_activated_group = "2"
- forum_authenticated_group = "10"*/
\ No newline at end of file
+ forum_authenticated_group = "10"*/
diff --git a/code/defines/mob/mob.dm b/code/defines/mob/mob.dm
index 6bc1b6de22d..4f67c079ec4 100644
--- a/code/defines/mob/mob.dm
+++ b/code/defines/mob/mob.dm
@@ -41,6 +41,9 @@
var/obj/screen/healths = null
var/obj/screen/throw_icon = null
var/obj/screen/nutrition_icon = null
+ var/obj/screen/gun/item/item_use_icon = null
+ var/obj/screen/gun/move/gun_move_icon = null
+ var/obj/screen/gun/run/gun_run_icon = null
var/total_luminosity = 0 //This controls luminosity for mobs, when you pick up lights and such this is edited. If you want the mob to use lights it must update its lum in its life proc or such. Note clamp this value around 7 or such to prevent massive light lag.
var/last_luminosity = 0
diff --git a/code/defines/obj.dm b/code/defines/obj.dm
index b8658dadf68..6bee2b9c542 100644
--- a/code/defines/obj.dm
+++ b/code/defines/obj.dm
@@ -135,27 +135,28 @@
for(var/datum/data/record/t in data_core.general)
var/name = t.fields["name"]
var/rank = t.fields["rank"]
+ var/real_rank = t.fields["real_rank"]
//world << "[name]: [rank]"
- if(rank in command_positions)
+ if(real_rank in command_positions)
heads[name] = rank
- if(rank in security_positions)
+ if(real_rank in security_positions)
sec[name] = rank
continue
- if(rank in engineering_positions)
+ if(real_rank in engineering_positions)
eng[name] = rank
continue
- if(rank in medical_positions)
+ if(real_rank in medical_positions)
med[name] = rank
continue
- if(rank in science_positions)
+ if(real_rank in science_positions)
sci[name] = rank
continue
- if(rank in civilian_positions)
+ if(real_rank in civilian_positions)
civ[name] = rank
continue
- if(rank in nonhuman_positions)
+ if(real_rank in nonhuman_positions)
bot[name] = rank
continue
@@ -1118,13 +1119,15 @@
origin_tech = "biotech=4"
var/POWERFLAG = 0 // sshhhhhhh
var/Flush = 30
-
+ var/Uses = 5 // uses before it goes inert
+
New()
..()
var/datum/reagents/R = new/datum/reagents(100)
reagents = R
R.my_atom = src
POWERFLAG = rand(1,10)
+ Uses = rand(2, 5)
//flags |= NOREACT
spawn()
@@ -1132,7 +1135,7 @@
proc/Life()
while(src)
- sleep(10)
+ sleep(25)
Flush--
if(Flush <= 0)
reagents.clear_reagents()
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 9a2f05631d4..f805613ea59 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -490,6 +490,19 @@
throw_range = 10
flags = ONBELT
+/obj/item/weapon/notebook
+ name = "notebook"
+ desc = "Holds paper and pens. Feels very noire."
+ icon = 'items.dmi'
+ icon_state = "notebook00"
+ var/obj/item/weapon/pen/pen = null
+ item_state = "notebook"
+ throwforce = 0
+ w_class = 2.0
+ throw_speed = 3
+ throw_range = 10
+ flags = ONBELT
+
#define MAXCOIL 30
/obj/item/weapon/cable_coil
name = "cable coil"
diff --git a/code/defines/procs/helpers.dm b/code/defines/procs/helpers.dm
index 69c99ee19d7..ad73c887926 100644
--- a/code/defines/procs/helpers.dm
+++ b/code/defines/procs/helpers.dm
@@ -1256,12 +1256,14 @@ proc/listclearnulls(list/list)
/proc/do_after(mob/M as mob, time as num)
var/turf/T = get_turf(M)
var/holding = M.equipped()
- sleep(time)
- if(M)
- if ((M.loc == T && M.equipped() == holding && !( M.stat )))
- return 1
- else
- return 0
+ for(var/i=0, i