Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 ...

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

2017-05-26 15:29:46 -04:00

..

interaction

Adds a console to medical, engineering, security AR glasses

2017-03-06 00:33:08 -05:00

modules

Ensure computers work on centcom or when only one zlevel is accessible.

2017-05-22 16:18:26 -04:00

nanoexternal.dm

NanoUI sources can now be datums instead of atom/movable.

2015-06-08 17:06:06 +02:00

nanomanager.dm

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00

nanomapgen.dm

Updated nanomaps for tether map.

2017-05-16 20:55:26 -04:00

nanoui.dm

Revert "Merge branch 'master' of https://github.com/PolarisSS13/Polaris into NanoGrade"

2016-08-15 12:58:00 -04:00