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
..
2018-02-07 19:30:50 -05:00
2018-02-05 15:50:13 -05:00
2018-02-05 15:50:13 -05:00
2018-01-08 17:14:56 -05:00
2017-07-05 21:18:52 -04:00
2017-10-20 19:14:45 +01:00
2017-12-29 15:39:42 +02:00
2017-11-26 18:13:34 -06:00
2017-12-21 04:01:07 -05:00
2018-02-05 15:50:13 -05:00
2017-11-16 18:13:29 -05:00
2018-02-05 15:50:13 -05:00
2017-08-03 04:49:23 -04:00
2017-11-19 02:52:56 -06:00
2017-11-04 01:59:00 -07:00
2017-08-03 04:49:23 -04:00
2018-01-15 03:27:26 -05:00
2017-10-20 19:14:45 +01:00
2017-12-29 15:31:59 -05:00
2017-10-23 16:26:36 +03:00
2018-02-04 22:18:36 -06:00
2017-12-01 16:00:49 -06:00
2017-08-03 04:49:23 -04:00
2017-09-30 10:59:38 -04:00
2017-08-03 04:49:23 -04:00
2018-02-03 22:47:01 -06:00
2017-06-10 22:41:51 -04:00
2018-02-04 13:56:25 -05:00
2018-02-05 15:50:13 -05:00
2017-07-28 16:06:20 -05:00
2018-01-15 16:35:04 -08:00