Merge pull request #104 from Hellhound1/master

merge maybe?
Merge pull request #105 from Hellhound1/master

update
Merge pull request #106 from Hellhound1/master

double reference fix
map

map
	modified:   baystation12.dme
	modified:   code/ATMOSPHERICS/datum_pipeline.dm
	modified:   code/ATMOSPHERICS/he_pipes.dm
	modified:   code/WorkInProgress/Cael_Aislinn/Rust/gyrotron.dm
	modified:   code/WorkInProgress/Cael_Aislinn/Supermatter/ZeroPointLaser.dm
	modified:   code/WorkInProgress/ZomgPonies/karma.dm
	modified:   code/WorkInProgress/ZomgPonies/mobs/metroid/powers.dm
	modified:   code/WorkInProgress/computer3/computers/camera.dm
	new file:   code/WorkInProgress/pomf/spacepods/construction.dm
	new file:   code/WorkInProgress/pomf/spacepods/parts.dm
	modified:   code/ZAS/Airflow.dm
	modified:   code/__HELPERS/experimental.dm
	modified:   code/__HELPERS/global_lists.dm
	modified:   code/__HELPERS/mobs.dm
	modified:   code/__HELPERS/time.dm
	modified:   code/__HELPERS/type2type.dm
	modified:   code/__HELPERS/unsorted.dm
	modified:   code/_onclick/click.dm
	modified:   code/controllers/configuration.dm
	new file:   code/controllers/hooks-defs.dm
	new file:   code/controllers/hooks.dm
	modified:   code/controllers/shuttle_controller.dm
	modified:   code/controllers/verbs.dm
	modified:   code/datums/ai_laws.dm
	new file:   code/datums/crafting.dm
	modified:   code/datums/datacore.dm
	modified:   code/datums/datumvars.dm
	modified:   code/datums/helper_datums/construction_datum.dm
	modified:   code/datums/mind.dm
	modified:   code/datums/uplink_item.dm
	new file:   code/datums/visibility_networks/chunk.dm
	new file:   code/datums/visibility_networks/dictionary.dm
	new file:   code/datums/visibility_networks/update_triggers.dm
	new file:   code/datums/visibility_networks/visibility_interface.dm
	new file:   code/datums/visibility_networks/visibility_network.dm
	modified:   code/defines/obj/weapon.dm
	modified:   code/game/area/Space Station 13 areas.dm
	modified:   code/game/atoms.dm
	modified:   code/game/dna/dna_modifier.dm
	modified:   code/game/dna/genes/goon_disabilities.dm
	modified:   code/game/dna/genes/goon_powers.dm
	modified:   code/game/dna/genes/vg_powers.dm
	modified:   code/game/gamemodes/changeling/changeling.dm
	modified:   code/game/gamemodes/changeling/changeling_powers.dm
	modified:   code/game/gamemodes/changeling/modularchangling.dm
	modified:   code/game/gamemodes/cult/cult.dm
	modified:   code/game/gamemodes/cult/ritual.dm
	modified:   code/game/gamemodes/cult/runes.dm
	modified:   code/game/gamemodes/events/ninja_equipment.dm
	modified:   code/game/gamemodes/events/space_ninja.dm
	modified:   code/game/gamemodes/game_mode.dm
	modified:   code/game/gamemodes/malfunction/Malf_Modules.dm
	new file:   code/game/gamemodes/mutiny/auth_key.dm
	new file:   code/game/gamemodes/mutiny/directive.dm
	new file:   code/game/gamemodes/mutiny/directives/alien_fraud_directive.dm
	new file:   code/game/gamemodes/mutiny/directives/bluespace_contagion_directive.dm
	new file:   code/game/gamemodes/mutiny/directives/financial_crisis_directive.dm
 	new file:   code/game/gamemodes/mutiny/directives/ipc_virus_directive.dm
 	new file:   code/game/gamemodes/mutiny/directives/research_to_ripleys_directive.dm
 	new file:   code/game/gamemodes/mutiny/directives/tau_ceti_needs_women_directive.dm
 	new file:   code/game/gamemodes/mutiny/directives/terminations_directive.dm
 	new file:   code/game/gamemodes/mutiny/directives/test_directive.dm
 	new file:   code/game/gamemodes/mutiny/emergency_authentication_device.dm
 	new file:   code/game/gamemodes/mutiny/key_pinpointer.dm
 	new file:   code/game/gamemodes/mutiny/mutiny.dm
 	new file:   code/game/gamemodes/mutiny/mutiny_fluff.dm
 	new file:   code/game/gamemodes/mutiny/mutiny_hooks.dm
 	modified:   code/game/gamemodes/nuclear/nuclear.dm
 	modified:   code/game/gamemodes/nuclear/pinpointer.dm
 	modified:   code/game/gamemodes/objective.dm
 	modified:   code/game/gamemodes/steal_items.dm
 	modified:   code/game/gamemodes/vampire/vampire_powers.dm
 	modified:   code/game/gamemodes/vox/heist/heist.dm
 	modified:   code/game/gamemodes/vox/trade/trade.dm
 	modified:   code/game/jobs/access.dm
 	modified:   code/game/jobs/job/engineering.dm
 	modified:   code/game/jobs/jobs.dm
 	modified:   code/game/machinery/adv_med.dm
 	modified:   code/game/machinery/atmoalter/canister.dm
 	modified:   code/game/machinery/bots/ed209bot.dm
 	modified:   code/game/machinery/bots/medbot.dm
 	modified:   code/game/machinery/camera/camera.dm
 	modified:   code/game/machinery/camera/tracking.dm
 	modified:   code/game/machinery/cloning.dm
 	modified:   code/game/machinery/computer/buildandrepair.dm
 	modified:   code/game/machinery/computer/camera.dm
 	modified:   code/game/machinery/computer/card.dm
 	modified:   code/game/machinery/computer/robot.dm
 	modified:   code/game/machinery/constructable_frame.dm
 	modified:   code/game/machinery/doors/airlock_electronics.dm
 	modified:   code/game/machinery/doors/door.dm
 	new file:   code/game/machinery/doors/spacepod.dm
 	modified:   code/game/machinery/kitchen/smartfridge.dm
 	modified:   code/game/machinery/machinery.dm
 	modified:   code/game/machinery/podmen.dm
 	modified:   code/game/machinery/turrets.dm
 	modified:   code/game/machinery/vending.dm
 	modified:   code/game/mecha/combat/durand.dm
 	modified:   code/game/mecha/mech_fabricator.dm
 	modified:   code/game/mecha/mecha_construction_paths.dm
 	modified:   code/game/mecha/mecha_parts.dm
 	modified:   code/game/mecha/mecha_wreckage.dm
 	modified:   code/game/objects/effects/anomalies.dm
 	modified:   code/game/objects/effects/decals/Cleanable/humans.dm
 	modified:   code/game/objects/effects/spawners/bombspawner.dm
 	modified:   code/game/objects/items.dm
 	modified:   code/game/objects/items/devices/handtv.dm
 	new file:   code/game/objects/items/flag.dm
 	modified:   code/game/objects/items/robot/robot_items.dm
 	modified:   code/game/objects/items/robot/robot_parts.dm
 	modified:   code/game/objects/items/stacks/sheets/glass.dm
 	modified:   code/game/objects/items/stacks/sheets/mineral.dm
 	modified:   code/game/objects/items/stacks/sheets/sheet_types.dm
 	modified:   code/game/objects/items/toys.dm
 	modified:   code/game/objects/items/weapons/AI_modules.dm
 	modified:   code/game/objects/items/weapons/dna_injector.dm
 	modified:   code/game/objects/items/weapons/explosives.dm
 	modified:   code/game/objects/structures/crates_lockers/closets/syndicate.dm
 	modified:   code/game/objects/structures/grille.dm
 	modified:   code/game/objects/structures/tables_racks.dm
 	modified:   code/game/objects/structures/window.dm
 	modified:   code/game/response_team.dm
 	modified:   code/game/socket_talk.dm
 	modified:   code/game/supplyshuttle.dm
 	modified:   code/game/turfs/simulated/walls.dm
 	modified:   code/game/turfs/space/space.dm
 	modified:   code/game/verbs/ooc.dm
 	modified:   code/game/verbs/who.dm
 	modified:   code/modules/admin/admin.dm
 	modified:   code/modules/admin/admin_ranks.dm
 	modified:   code/modules/admin/admin_verbs.dm
 	modified:   code/modules/admin/newbanjob.dm
 	modified:   code/modules/admin/player_notes.dm
 	modified:   code/modules/admin/player_panel.dm
 	modified:   code/modules/admin/topic.dm
 	modified:   code/modules/admin/verbs/adminhelp.dm
 	modified:   code/modules/admin/verbs/adminpm.dm
 	modified:   code/modules/admin/verbs/adminsay.dm
 	modified:   code/modules/admin/verbs/deadsay.dm
 	modified:   code/modules/admin/verbs/mapping.dm
 	modified:   code/modules/admin/verbs/one_click_antag.dm
 	modified:   code/modules/admin/verbs/onlyone.dm
 	modified:   code/modules/admin/verbs/randomverbs.dm
 	modified:   code/modules/admin/verbs/vox_raiders.dm
 	modified:   code/modules/client/client defines.dm
 	modified:   code/modules/client/client procs.dm
 	modified:   code/modules/client/preferences.dm
 	modified:   code/modules/client/preferences_savefile.dm
 	modified:   code/modules/clothing/clothing.dm
 	modified:   code/modules/clothing/glasses/glasses.dm
 	modified:   code/modules/clothing/masks/breath.dm
 	modified:   code/modules/clothing/masks/gasmask.dm
 	modified:   code/modules/clothing/masks/miscellaneous.dm
 	modified:   code/modules/clothing/shoes/colour.dm
 	modified:   code/modules/clothing/spacesuits/alien.dm
 	modified:   code/modules/clothing/spacesuits/captain.dm
 	modified:   code/modules/clothing/spacesuits/miscellaneous.dm
 	modified:   code/modules/clothing/spacesuits/ninja.dm
 	modified:   code/modules/clothing/spacesuits/rig.dm
 	modified:   code/modules/clothing/suits/bio.dm
 	modified:   code/modules/clothing/suits/miscellaneous.dm
 	modified:   code/modules/clothing/suits/utility.dm
 	modified:   code/modules/clothing/under/color.dm
 	modified:   code/modules/clothing/under/jobs/civilian.dm
 	modified:   code/modules/clothing/under/jobs/engineering.dm
 	modified:   code/modules/clothing/under/jobs/medsci.dm
 	modified:   code/modules/clothing/under/miscellaneous.dm
 	modified:   code/modules/customitems/item_spawning.dm
 	modified:   code/modules/economy/ATM.dm
 	modified:   code/modules/economy/Accounts.dm
 	modified:   code/modules/economy/Accounts_DB.dm
 	modified:   code/modules/economy/EFTPOS.dm
 	renamed:    code/modules/economy/economy_misc.dm -> code/modules/economy/Economy.dm
 	renamed:    code/modules/economy/Events.dm -> code/modules/economy/Economy_Events.dm
 	renamed:    code/modules/economy/Events_Mundane.dm -> code/modules/economy/Economy_Events_Mundane.dm
 	renamed:    code/modules/economy/TradeDestinations.dm -> code/modules/economy/Economy_TradeDestinations.dm
 	new file:   code/modules/economy/POS.dm
 	new file:   code/modules/economy/utils.dm
 	modified:   code/modules/events/event_dynamic.dm
 	new file:   code/modules/events/heist.dm
 	modified:   code/modules/events/tgevents/anomaly_bluespace.dm
 	modified:   code/modules/events/tgevents/anomaly_pyro.dm
 	modified:   code/modules/ext_scripts/irc.dm
 	modified:   code/modules/media/jukebox.dm
 	modified:   code/modules/media/machinery.dm
 	modified:   code/modules/mob/abilities.dm
 	modified:   code/modules/mob/death.dm
 	modified:   code/modules/mob/emote.dm
 	new file:   code/modules/mob/holder.dm
 	modified:   code/modules/mob/language.dm
 	modified:   code/modules/mob/living/carbon/alien/special/facehugger.dm
 	modified:   code/modules/mob/living/carbon/brain/brain_item.dm
 	modified:   code/modules/mob/living/carbon/human/death.dm
 	modified:   code/modules/mob/living/carbon/human/human.dm
 	modified:   code/modules/mob/living/carbon/human/human_defines.dm
 	modified:   code/modules/mob/living/carbon/human/life.dm
 	modified:   code/modules/mob/living/carbon/human/say.dm
 	modified:   code/modules/mob/living/carbon/human/update_icons.dm
 	modified:   code/modules/mob/living/carbon/monkey/diona.dm
 	modified:   code/modules/mob/living/carbon/monkey/emote.dm
 	modified:   code/modules/mob/living/carbon/monkey/life.dm
 	modified:   code/modules/mob/living/carbon/species.dm
 	modified:   code/modules/mob/living/living.dm
 	modified:   code/modules/mob/living/login.dm
 	modified:   code/modules/mob/living/silicon/ai/ai.dm
 	modified:   code/modules/mob/living/silicon/ai/freelook/cameranet.dm
 	modified:   code/modules/mob/living/silicon/ai/freelook/chunk.dm
 	modified:   code/modules/mob/living/silicon/ai/freelook/eye.dm
 	modified:   code/modules/mob/living/silicon/ai/freelook/read_me.dm
 	modified:   code/modules/mob/living/silicon/ai/freelook/update_triggers.dm
 	new file:   code/modules/mob/living/silicon/ai/freelook/visibility_interface.dm
 	modified:   code/modules/mob/living/silicon/robot/component.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone_abilities.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone_console.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone_damage.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone_items.dm
 	new file:   code/modules/mob/living/silicon/robot/drone/drone_manufacturer.dm
 	modified:   code/modules/mob/living/silicon/robot/examine.dm
 	modified:   code/modules/mob/living/silicon/robot/laws.dm
 	modified:   code/modules/mob/living/silicon/robot/life.dm
 	modified:   code/modules/mob/living/silicon/robot/robot.dm
 	modified:   code/modules/mob/living/silicon/robot/robot_modules.dm
 	modified:   code/modules/mob/living/silicon/silicon.dm
 	modified:   code/modules/mob/living/simple_animal/borer.dm
 	modified:   code/modules/mob/living/simple_animal/friendly/spiderbot.dm
 	modified:   code/modules/mob/mob.dm
 	modified:   code/modules/mob/mob_defines.dm
 	modified:   code/modules/mob/mob_helpers.dm
 	modified:   code/modules/mob/mob_movement.dm
 	modified:   code/modules/mob/new_player/new_player.dm
 	modified:   code/modules/mob/new_player/preferences_setup.dm
 	new file:   code/modules/mob/spirit/cultnet.dm
 	new file:   code/modules/mob/spirit/mask/mask.dm
 	new file:   code/modules/mob/spirit/mask/respawn.dm
 	new file:   code/modules/mob/spirit/movement.dm
 	new file:   code/modules/mob/spirit/spirit.dm
 	new file:   code/modules/mob/spirit/viewpoint.dm
 	modified:   code/modules/mob/transform_procs.dm
 	modified:   code/modules/power/apc.dm
 	modified:   code/modules/power/generator.dm
 	modified:   code/modules/power/gravitygenerator.dm
 	modified:   code/modules/power/singularity/emitter.dm
 	modified:   code/modules/projectiles/ammunition/bullets.dm
 	new file:   code/modules/projectiles/guns/alien.dm
 	modified:   code/modules/projectiles/guns/energy/laser.dm
 	modified:   code/modules/projectiles/guns/projectile/bow.dm
 	modified:   code/modules/projectiles/guns/projectile/pistol.dm
 	modified:   code/modules/projectiles/guns/projectile/pneumatic.dm
 	modified:   code/modules/projectiles/projectile.dm
 	modified:   code/modules/projectiles/projectile/beams.dm
 	modified:   code/modules/projectiles/projectile/bullets.dm
 	modified:   code/modules/projectiles/projectile/special.dm
 	modified:   code/modules/reagents/Chemistry-Reagents.dm
 	modified:   code/modules/reagents/reagent_containers/food/drinks/drinkingglass.dm
 	modified:   code/modules/recycling/disposal.dm
 	modified:   code/modules/recycling/sortingmachinery.dm
 	modified:   code/modules/research/designs.dm
 	modified:   code/modules/security levels/keycard authentication.dm
 	modified:   code/modules/supermatter/supermatter.dm
 	modified:   code/modules/surgery/ribcage.dm
 	modified:   code/modules/virus2/effect.dm
 	modified:   code/names.dm
 	modified:   code/setup.dm
 	modified:   code/stylesheet.dm
 	new file:   code/unused/goonheist/64x64.dmi
 	new file:   code/unused/goonheist/goonsmoke.dmi
 	modified:   code/unused/powerarmor/powerarmor.dm
 	modified:   code/unused/powerarmor/powerarmorcomponents.dm
 	modified:   code/world.dm
 	modified:   config-example/config.txt
 	modified:   config/example/admin_ranks.txt
 	new file:   icons/48x48/pod_construction.dmi
 	modified:   icons/effects/beam.dmi
 	modified:   icons/mecha/mech_construct.dmi
 	modified:   icons/mecha/mech_construction.dmi
 	modified:   icons/mecha/mecha.dmi
 	modified:   icons/mob/feet.dmi
 	modified:   icons/mob/hands.dmi
 	modified:   icons/mob/head.dmi
 	modified:   icons/mob/hud.dmi
 	new file:   icons/mob/human_races/r_armalis.dmi
 	modified:   icons/mob/human_races/r_diona.dmi
 	modified:   icons/mob/items_lefthand.dmi
 	modified:   icons/mob/items_righthand.dmi
 	modified:   icons/mob/mask.dmi
 	modified:   icons/mob/mob.dmi
 	modified:   icons/mob/robots.dmi
 	new file:   icons/mob/species/vox/armalis/hands.dmi
 	new file:   icons/mob/species/vox/armalis/mask.dmi
 	new file:   icons/mob/species/vox/armalis/shoes.dmi
 	new file:   icons/mob/species/vox/masks.dmi
 	new file:   icons/mob/species/vox/shoes.dmi
 	new file:   icons/mob/species/vox/uniform.dmi
 	new file:   icons/mob/spirits/mask.dmi
 	modified:   icons/mob/suit.dmi
 	modified:   icons/mob/uniform.dmi
 	modified:   icons/mob/vox.dmi
 	modified:   icons/obj/clothing/gloves.dmi
 	modified:   icons/obj/clothing/masks.dmi
 	modified:   icons/obj/clothing/shoes.dmi
 	modified:   icons/obj/clothing/uniforms.dmi
 	modified:   icons/obj/device.dmi
 	modified:   icons/obj/gun.dmi
 	modified:   icons/obj/jukebox.dmi
 	new file:   icons/obj/machines/drone_fab.dmi
 	new file:   icons/obj/machines/gravity_generator.dmi
 	new file:   icons/obj/machines/particle_accelerator2.dmi
 	new file:   icons/obj/machines/pos.dmi
 	modified:   icons/obj/objects.dmi
 	modified:   icons/obj/weapons.dmi
 	new file:   icons/pods/equipment.dmi
 	modified:   maps/NSS Cyberiad- WIP.dmm
 	new file:   maps/backup/NSS Cyberiad- WIP.dmm
 	modified:   maps/tgstation-redux-WIP.dmm
 	modified:   nano/css/shared.css
 	modified:   nano/debug.html
 	new file:   nano/templates/accounts_terminal.tmpl
 	new file:   nano/templates/identification_computer.tmpl
 	new file:   sound/effects/basscannon.ogg
 	new file:   sound/misc/nymphchirp.ogg
 	new file:   sound/voice/shriek1.ogg
 	new file:   sound/weapons/Gunshot_silenced.ogg
Merge branch 'master' of https://github.com/Hellhound1/Sigurd-Testbed

Conflicts:
	code/game/machinery/atmoalter/canister.dm
	code/modules/mob/mob.dm
Merge pull request #15 from melandor0/master

f