Leshana 3c3dac7102 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19 ...

# Conflicts:
#	code/_onclick/hud/hud.dm
#	code/modules/clothing/glasses/glasses.dm
#	code/modules/mob/living/carbon/human/update_icons.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-19 17:52:25 -05:00

..

communicator

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-2018-01-19

2018-01-19 17:52:25 -05:00

PDA

Polaris Sync

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

radio

Shamelessly steal Polaris' Southern Cross jobs

2018-01-14 21:49:19 -05:00

advnifrepair.dm

Advanced NIF Repair Tool

2018-01-08 17:14:56 -05:00

ai_detector.dm

Adds the Anti-Surveillance Tool for Traitors.

2017-07-05 21:18:52 -04:00

aicard.dm

Reworks cryopod storage

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

binoculars.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

body_snatcher_vr.dm

Bodysnatcher message tweak.

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

chameleonproj.dm

Removes the datum pool, as it is not performant.

2017-05-04 01:58:33 -04:00

debugger.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

defib.dm

Corrects a compile error

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

flash_vr.dm

Security non-lethal balance

2017-02-13 15:49:35 +00:00

flash.dm

Polaris sync

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

flashlight.dm

Ports /TG/'s Marker Beacons (#4529)

2018-01-14 14:48:39 -06:00

floor_painter.dm

…

geiger.dm

Tweaks Geiger Counters

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

gps.dm

Surface Map Work (#4557)

2018-01-17 13:46:19 -06:00

hacktool.dm

Updates Tools

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

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

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

megaphone.dm

fixed megaphone lore

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

modkit.dm

Updates Tools

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

multitool.dm

Fix uses of TECH_MAGNETS to TECH_MAGNET

2018-01-15 03:27:26 -05:00

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

Updates Tools

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

t_scanner.dm

Adds better Tscanners.

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

taperecorder.dm

Updates Tools

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

traitordevices.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00

transfer_valve.dm

Port of @PsiOmegaDelta's Baystation12/Baystation12#16820

2017-06-10 22:41:51 -04:00

translator.dm

Fixes a runtime with borgs and translators

2017-04-17 21:01:42 -07:00

tvcamera.dm

Ports Bay's Journalist TV Drone

2017-01-09 05:03:40 -05:00

uplink_random_lists.dm

Adds Collapsible AM rifle. Createes new uplink entry (#3644)

2017-07-28 16:06:20 -05:00

uplink.dm

Fixes runtime in uplink.dm

2018-01-15 16:35:04 -08:00

violin.dm

…

whistle.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04:00