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

Conflicts:
	code/modules/reagents/Chemistry-Reagents.dm

conflicts resolution

2014-12-16 02:52:08 +03:00

..

PDA

Added a cancel button to the PDA

2014-11-27 14:27:00 -06:00

radio

Fixed runtime and added syndie headset protection

2014-11-24 21:54:09 -08:00

aicard.dm

Logic fix + Tweaks

2014-10-28 10:23:56 -05:00

camera_bug.dm

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

2014-12-16 02:52:08 +03:00

chameleonproj.dm

Made explosions work in a slightly different way

2014-11-18 16:22:41 +03:00

flash.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

flashlight.dm

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

2014-12-16 02:52:08 +03:00

laserpointer.dm

Tiny clean up, still lots of work to do

2014-12-12 23:57:11 +03:00

lightreplacer.dm

Merge pull request #6323 from AndroidSFV/fix6313

2014-12-12 23:01:43 -06:00

multitool.dm

…

paicard.dm

…

pipe_painter.dm

Delete changelog and remove unused on variable

2014-10-29 09:04:34 +13:00

powersink.dm

…

recaller.dm

- Removes the useless has_been_rev var

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

scanners.dm

Made clumsiness into disability

2014-12-14 08:04:48 +03:00

taperecorder.dm

Conflicts:

2014-11-13 17:33:32 +01:00

traitordevices.dm

Fix the traitor health analyzer (radiation laser) making the attack animation and hitsound when used on target. Changing one span class and removing one text() stuff.

2014-11-22 17:36:02 +01:00

transfer_valve.dm

…

uplinks.dm

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

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

violin.dm

…