Arokha Sieyes c57e6e75b7 Merge branch 'master' of https://github.com/PolarisSS13/Polaris into aro-smallsync ...

# Conflicts:
#	code/modules/mob/living/simple_animal/animals/cat.dm
#	code/modules/mob/living/simple_animal/animals/parrot.dm

Line ending changes?

2017-04-02 23:25:59 -04:00

..

communicator

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

2017-03-21 11:22:29 -04:00

PDA

Polaris Merge Sync

2017-03-26 20:12:34 -04:00

radio

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

2017-04-01 19:19:42 -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

Polaris Sync October 9th (#633)

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

debugger.dm

Polaris Sync October 9th (#633)

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

defib.dm

Adds in Jumper Cables for FBP reviving

2017-03-29 12:43:38 -05:00

flash_vr.dm

Security non-lethal balance

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

flash.dm

Security non-lethal balance

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

flashlight.dm

Fixes a text thing

2017-03-31 19:40:40 -05: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

Removed unnecessary icon_state code. Added basic scanner sprite.

2017-03-26 22:00:09 +01: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

Translators still check against hiveminds

2017-04-01 17:49:34 -07:00

tvcamera.dm

Ports Bay's Journalist TV Drone

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

uplink_random_lists.dm

Improves/fixes surplus crate item selection

2016-07-25 23:13:12 +01:00

uplink.dm

Resolves mercs not spawning with an uplink

2016-11-12 18:13:45 +00:00

violin.dm

…

whistle.dm

Polaris Sync October 9th (#633)

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