Leshana 28c193cbdb Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04 ...

# Conflicts:
#       code/game/objects/items/devices/communicator/communicator.dm
#       code/modules/client/preference_setup/occupation/occupation.dm
#       code/modules/mob/living/simple_animal/animals/cat.dm
#       code/modules/mob/mob_helpers.dm
#       code/unit_tests/zas_tests.dm
#       maps/southern_cross/southern_cross-1.dmm
#       maps/southern_cross/southern_cross-3.dmm
#       maps/southern_cross/southern_cross-6.dmm
#       vorestation.dme

2018-01-04 22:44:04 -05:00

..

communicator

Merge remote-tracking branch 'refs/remotes/polaris-upstream/master' into polaris-sync-2018-01-04

2018-01-04 22:44:04 -05:00

PDA

Polaris Sync

2017-10-16 22:16:24 -04:00

radio

Pol Sync

2017-10-08 17:44:25 -04:00

ai_detector.dm

…

aicard.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

binoculars.dm

…

body_snatcher_vr.dm

Bodysnatcher message tweak.

2017-12-29 15:39:42 +02:00

chameleonproj.dm

…

debugger.dm

…

defib.dm

Corrects a compile error

2017-11-26 18:13:34 -06:00

flash_vr.dm

…

flash.dm

Polaris sync

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

flashlight.dm

Fixes flashlight eye exams

2018-01-01 21:23:45 -05:00

floor_painter.dm

…

geiger.dm

Tweaks Geiger Counters

2017-11-16 18:13:29 -05:00

gps.dm

Research level typos

2017-12-17 19:48:15 -08:00

hacktool.dm

…

lightreplacer.dm

Adds force to a pair of items that were lacking for some reason, and standardizes light replacer file. (#4280)

2017-11-19 02:52:56 -06:00

locker_painter.dm

…

megaphone.dm

fixed megaphone lore

2017-11-04 01:59:00 -07:00

modkit.dm

…

multitool.dm

…

paicard.dm

Reworks cryopod storage

2017-10-20 19:14:45 +01:00

pipe_painter.dm

…

powersink.dm

Transformed the machinery processor into an StonedMC subsystem

2017-12-29 15:31:59 -05:00

scanners_vr.dm

Fixes initial nif backups and adds a flashlight nifsoft.

2017-10-23 16:26:36 +03:00

scanners.dm

Adds the advanced health analyzer (#4326)

2017-12-03 17:36:51 -06:00

spy_bug.dm

Mobile Camera Pods (#4330)

2017-12-01 16:00:49 -06:00

suit_cooling.dm

…

t_scanner.dm

Adds better Tscanners.

2017-09-30 10:59:38 -04:00

taperecorder.dm

…

traitordevices.dm

…

transfer_valve.dm

…

translator.dm

…

tvcamera.dm

…

uplink_random_lists.dm

…

uplink.dm

…

violin.dm

…

whistle.dm

…