GunHog 4bc6ded418 Merge remote-tracking branch 'remotes/upstream/master' into Potato_AI_Wants_To_Hear_You_Scream_Too ...

Conflicts:
	code/modules/mob/living/silicon/ai/ai.dm

2014-11-09 12:27:48 -06:00

..

PDA

NTRC (PDA chatrooms) bugfixes

2014-11-04 22:47:48 -03:00

radio

Moved some things around!

2014-11-04 10:46:18 -06:00

aicard.dm

Logic fix + Tweaks

2014-10-28 10:23:56 -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

Merge pull request #5306 from Aranclanos/flashruntime

2014-10-19 18:47:18 -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

…

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

…

paicard.dm

SPANCLASSES!!!!!

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

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

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

2014-11-08 01:07:29 +00:00

taperecorder.dm

Fix the tape recorder.

2014-11-07 10:52:52 +01:00

traitordevices.dm

Fixes #4311

2014-10-25 23:01:27 -03: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

…