phil235 5fadf38aa6 Merge branch 'master' of https://github.com/tgstation/-tg-station into ed209fix ...

Conflicts:
	code/game/machinery/bots/ed209bot.dm
	code/game/machinery/bots/secbot.dm

2014-10-10 17:12:05 +02:00

..

PDA

Merge branch 'master' of https://github.com/tgstation/-tg-station into ed209fix

2014-10-10 17:12:05 +02:00

radio

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

aicard.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

camera_bug.dm

TimSort for byond:

2014-09-01 11:29:49 +01:00

chameleonproj.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

flash.dm

Final tweaks, map update. replaces cyborg's flash with their own subtype with the special effect.

2014-10-04 22:01:51 -05:00

flashlight.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

laserpointer.dm

Finalizes Mutantrace Datum Update

2014-06-19 17:42:14 -04:00

lightreplacer.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into examinate_the_doctor

2014-08-20 05:54:20 -07:00

multitool.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

2014-03-21 03:05:39 -07:00

paicard.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

powersink.dm

Tweaked the power distribution handling :

2014-05-25 00:54:41 +02:00

recaller.dm

- Removes the useless has_been_rev var

2014-09-26 21:37:07 -06:00

scanners.dm

Revert "Changes a few green crosses to blue on sprites that I missed last time"

2014-10-04 19:22:10 -05:00

taperecorder.dm

Merge to master - sole conflicting file was ninja.dm FUCK NINJAS

2014-10-04 01:45:39 -07:00

traitordevices.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

transfer_valve.dm

does more shit

2014-08-05 19:17:21 +02:00

uplinks.dm

Doubles the amount of TC and the prices of uplink items.

2014-09-21 15:56:24 +02:00

violin.dm

Make violin stop cutting off other sounds

2014-04-02 05:23:00 -07:00