Leshana 5f5ea3ea3b Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26 ...

# Conflicts:
#	code/game/gamemodes/technomancer/spells/insert/mend_burns.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_metal.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_organs.dm
#	code/game/gamemodes/technomancer/spells/insert/mend_wires.dm
#	code/game/machinery/computer/Operating.dm
#	code/game/machinery/computer/camera.dm
#	code/game/machinery/computer/communications.dm
#	code/game/machinery/computer/security.dm
#	code/game/machinery/computer/skills.dm
#	code/game/objects/items/devices/radio/jammer.dm
#	html/changelogs/.all_changelog.yml
#	maps/~map_system/maps.dm
#	nano/images/nanomap_z1.png
#	nano/images/nanomap_z5.png

2017-05-26 15:29:46 -04:00

..

communicator

Merge pull request #1481 from VOREStation/aro-jammer

2017-05-17 20:47:32 -04:00

PDA

Merge pull request #1481 from VOREStation/aro-jammer

2017-05-17 20:47:32 -04:00

radio

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-merge-2017-05-26

2017-05-26 15:29:46 -04:00

aicard.dm

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

binoculars.dm

Polaris Sync October 9th (#633)

2016-10-09 18:55:29 -04: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

Defib Fixes

2017-05-09 20:14:04 -04:00

flash_vr.dm

Security non-lethal balance

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

flash.dm

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-sync

2017-04-25 15:04:54 -04:00

flashlight.dm

Nerfs flashlight brightness due to them being different due to soft lighting

2017-05-09 17:00:15 +01:00

floor_painter.dm

…

hacktool.dm

Late September Sync (#579)

2016-09-24 14:12:43 -04:00

lightreplacer.dm

Adds in-hand sprites to several items.

2017-03-23 22:03:17 +00:00

locker_painter.dm

Polaris Sync October 9th (#633)

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

megaphone.dm

Adds in-hand sprites to several items.

2017-03-23 22:03:17 +00:00

modkit.dm

…

multitool.dm

Polaris Sync October 9th (#633)

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

paicard.dm

Polaris Sync October 9th (#633)

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

pipe_painter.dm

…

powersink.dm

Adds in-hand sprites to several items.

2017-03-23 22:03:17 +00:00

scanners.dm

Adds Modifier System, Changes Some Ling Stuff

2017-04-18 21:23:59 -04:00

spy_bug.dm

Polaris Sync October 9th (#633)

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

suit_cooling.dm

Polaris Sync October 9th (#633)

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

t_scanner.dm

Adds hand sprites to many items in the engineering department

2017-03-29 04:09:33 +01:00

taperecorder.dm

Improves QoL for universal recorders

2016-12-30 21:35:44 -06:00

traitordevices.dm

Polaris Sync October 9th (#633)

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

transfer_valve.dm

…

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

…

uplink.dm

Fix for Uplink Runtimes

2017-05-07 16:51:55 -04:00

violin.dm

…

whistle.dm

Polaris Sync October 9th (#633)

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