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-01-30 12:28:45 -05:00
2018-02-03 19:35:54 -05:00
2018-02-03 19:35:26 -05:00
2017-12-27 21:19:55 -05:00
2017-10-18 20:00:01 -05:00
2017-07-21 23:32:16 -04:00
2017-09-17 16:50:27 -04:00
2018-02-05 15:50:14 -05:00
2017-12-19 19:47:50 -05:00
2017-09-04 21:52:47 -04:00
2017-12-24 17:53:58 -05:00
2017-11-10 18:36:42 -08:00
2017-10-19 09:53:20 -05:00
2017-05-26 18:57:07 -04:00
2017-11-29 22:35:01 -05:00
2018-01-14 14:58:15 -06:00
2018-01-31 16:22:02 -08:00
2017-11-21 19:21:39 -05:00
2017-12-27 21:19:55 -05:00
2017-12-29 15:31:59 -05:00
2018-01-31 00:55:13 -05:00
2018-01-14 14:58:15 -06:00
2018-01-27 23:08:53 -05:00
2018-01-27 23:08:53 -05:00
2018-01-20 23:29:24 -05:00
2017-04-18 23:34:02 -04:00
2017-12-27 19:10:15 -05:00
2018-02-05 15:50:13 -05:00
2017-02-23 18:52:48 -05:00
2017-05-20 18:11:20 +01:00
2018-01-09 12:42:20 -08:00
2018-02-07 19:30:50 -05:00
2018-01-14 14:45:15 -06:00
2017-03-25 21:00:08 -04:00
2018-01-11 01:35:14 -05:00
2018-01-30 12:28:45 -05:00