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

Conflicts:
	code/game/machinery/computer/computer.dm
	code/game/machinery/computer/telecrystalconsoles.dm

2014-03-27 18:31:11 +04:00

..

PDA

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

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

radio

Merge remote-tracking branch 'upstream/master' into cyborg_module_in_telecomms

2014-03-22 13:54:57 +01:00

aicard.dm

Obsoletes flags = FPRINT | TABLEPASS*

2013-12-30 15:03:17 -06:00

camera_bug.dm

Camera bug sprites from Rob

2013-11-23 17:10:43 +00:00

chameleonproj.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

flash.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

flashlight.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

laserpointer.dm

Initial pass to convert LF to CRLF

2014-03-24 08:53:40 +00:00

lightreplacer.dm

Replaced a few more Del() and del() calls

2014-03-03 04:51:09 -08: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

Arcades, overlays and Git being evil

2014-03-23 12:39:13 +04:00

powersink.dm

First pass at a qdel() garbage collection system for tgstation

2014-02-23 14:55:12 -08:00

scanners.dm

Fixes bullet_act not checking for damagetype on many, many objects.

2014-03-01 16:39:22 -08:00

taperecorder.dm

passed over everything with throwforce

2014-02-13 18:06:50 -08:00

traitordevices.dm

Items with throw_range over 7 reduced to throw_range 7. This does not affect players as there's no way to extend your vision range.

2014-02-17 15:44:07 -08:00

transfer_valve.dm

Accounted for ridiculous edge case

2014-02-12 14:33:27 -08:00

uplinks.dm

Replaced a few more Del() and del() calls

2014-03-03 04:51:09 -08:00

violin.dm

no more headaches

2014-02-21 01:20:46 -08:00