Leshana
1d0f5262d8
Merge remote-tracking branch 'upstream-polaris/master' into polaris-sync-2018-02-07
# Conflicts:
# code/__defines/subsystems.dm
# code/controllers/master_controller.dm
# code/controllers/subsystems/atoms.dm
# code/game/machinery/Sleeper.dm
# code/game/machinery/doors/airlock.dm
# code/game/machinery/vr_console.dm
# code/game/objects/items/devices/communicator/phone.dm
# code/game/turfs/flooring/flooring_decals.dm
# code/modules/admin/admin_verbs.dm
# code/modules/mob/living/carbon/carbon.dm
# code/modules/multiz/movement.dm
# code/modules/projectiles/gun.dm
# code/modules/shuttles/shuttle.dm
# code/modules/shuttles/shuttles_web.dm
# icons/obj/doors/doormed.dmi
# maps/southern_cross/items/headset_sc.dm
# maps/southern_cross/southern_cross-3.dmm
# vorestation.dme
2018-02-07 19:30:50 -05:00
..
2017-02-27 07:36:41 -05:00
2017-05-24 17:08:39 -04:00
2017-11-29 22:35:01 -05:00
2017-03-20 02:18:27 -04:00
2017-02-27 07:36:41 -05:00
2017-03-11 19:02:24 -05:00
2017-04-13 14:11:10 -05:00
2015-07-27 09:32:51 +02:00
2015-12-14 15:43:53 -05:00
2015-12-21 04:01:05 -05:00
2015-12-21 04:01:05 -05:00
2017-11-29 20:27:42 +01:00
2017-05-25 18:43:56 -04:00
2016-11-20 19:41:25 +00:00
2016-07-30 17:39:47 -04:00
2015-07-03 16:02:02 +02:00
2017-05-24 17:14:03 -04:00
2016-10-21 12:47:57 -04:00
2017-10-11 13:29:31 -04:00
2017-03-02 23:34:43 -05:00
2016-06-09 01:37:54 -04:00
2017-11-13 17:38:19 -05:00
2018-01-17 11:04:20 -05:00
2015-12-21 04:01:05 -05:00
2016-07-30 03:19:47 -04:00
2017-02-27 07:36:41 -05:00
2017-02-27 07:36:41 -05:00
2016-07-30 03:19:47 -04:00
2017-06-01 17:27:00 -04:00
2015-06-21 18:08:26 +09:30
2018-02-05 23:21:20 -08:00
2017-01-14 18:34:34 -06:00
2017-05-25 18:43:56 -04:00
2015-07-03 16:02:02 +02:00
2017-02-27 07:36:41 -05:00
2017-03-16 00:26:14 -04:00
2016-01-27 11:44:41 +03:00
2017-12-29 20:01:23 -05:00
2017-02-27 07:36:41 -05:00
2015-12-21 04:01:05 -05:00