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

..

~computer_vr.dm

Fix icon of power monitor

2017-05-11 12:59:16 -04:00

ai_core.dm

…

aifixer.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

arcade.dm

Reworks empulse and emp_act

2017-03-05 12:22:45 -06:00

atmos_alert.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

atmos_control.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

buildandrepair.dm

…

camera_circuit.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

camera.dm

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

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

card.dm

world time fix

2016-07-30 03:19:47 -04:00

cloning.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

communications.dm

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

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

computer.dm

Move to Eris Computers

2017-04-19 16:51:10 -04:00

crew.dm

…

guestpass.dm

Use sanitizeName for the guest pass terminal name input to prevent excessively long names.

2016-09-19 15:04:00 +01:00

law.dm

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

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

medical.dm

Several Tether Fixes + Medical Rearrange

2017-05-23 16:50:55 -04:00

message.dm

…

Operating.dm

Stop turning op table!

2017-05-17 20:16:36 -04:00

pod.dm

…

prisoner.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

prisonshuttle.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

RCON_Console.dm

Eris Computer Icon Tweaks

2017-04-19 23:53:53 -04:00

robot.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

security.dm

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

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

shuttle.dm

…

skills.dm

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

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

specops_shuttle.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

station_alert.dm

Ports event system from Bay

2016-06-01 22:05:04 +01:00

supply.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00

syndicate_specops_shuttle.dm

Removes all the hard references to computer.dmi

2017-04-19 16:54:16 -04:00