Leshana 27c3272821 Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-01-27 ...

# Conflicts:
#	code/ZAS/_docs.dm
#	code/__defines/mobs.dm
#	code/game/turfs/flooring/flooring_decals.dm
#	code/game/turfs/simulated/walls.dm
#	code/modules/client/preference_setup/loadout/loadout_utility.dm
#	code/modules/lore_codex/codex.dm
#	code/modules/mob/living/life.dm
#	code/modules/mob/living/living_defines.dm
#	maps/southern_cross/southern_cross-1.dmm
#	maps/southern_cross/southern_cross-3.dmm
#	maps/southern_cross/southern_cross-6.dmm
#	maps/southern_cross/southern_cross-7.dmm
#	maps/southern_cross/southern_cross_jobs.dm
#	vorestation.dme

2018-01-27 23:08:53 -05:00

..

~computer_vr.dm

Fix icon of power monitor

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

ai_core.dm

Brain transplants, synthetics, and languages

2017-09-06 20:14:17 -07:00

aifixer.dm

AIs with powerloss should be restored properly now.

2017-08-02 17:22:22 -05:00

arcade.dm

more gammers (#4052)

2017-10-13 23:32:22 -05: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

Updates Tools

2017-08-03 04:49:23 -04:00

camera_circuit.dm

Updates Tools

2017-08-03 04:49:23 -04:00

camera.dm

Polaris sync

2017-08-06 19:07:17 -04:00

card.dm

Gripper Fixes and Updates

2017-08-07 12:10:23 -07:00

cloning.dm

Allows Prometheans to be cloned from their Core. (#4602)

2018-01-24 18:19:32 -06:00

communications.dm

Various and sundry admin messages

2018-01-06 19:15:54 -05:00

computer.dm

Polaris sync

2017-12-21 04:01:07 -05:00

crew.dm

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

guestpass.dm

Makes guest passes great again!

2017-09-28 19:43:57 -04:00

law.dm

Adds the Lost Drone

2017-09-22 01:17:53 -04:00

medical.dm

Several Tether Fixes + Medical Rearrange

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

message.dm

Merge remote-tracking branch 'upstream/dev' into 150722-TagPairs

2015-08-17 13:05:58 +02:00

Operating.dm

Stop turning op table!

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

pod.dm

Updates Tools

2017-08-03 04:49:23 -04:00

prisoner.dm

Update prisoner.dm

2017-12-11 11:25:50 -05: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

Hacked borgs can no longer be locked down

2017-11-21 23:19:57 -06: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

Computers are now overlay based.

2015-07-07 17:23:49 +02:00

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

Added supply shuttle export reports

2018-01-08 20:28:47 -05:00

syndicate_specops_shuttle.dm

Removes all the hard references to computer.dmi

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