Erthilo 8268b3d824 Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates ...

Conflicts:
	code/game/objects/devices/scanners.dm

2012-06-02 22:12:07 +01:00

..

PDA

Some fixes for shit I found when porting stuff to TG.

2012-06-01 13:55:15 -07:00

aicard.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

chameleonproj.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

flash.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

flashlight.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00

infra_sensor.dm

…

multitool.dm

…

paicard.dm

TG: - Removed support for the ONBACK and ONBELT flags.

2012-05-28 22:58:57 +01:00

powersink.dm

…

scanners.dm

Merge branch 'master' of github.com:Baystation12/Baystation12 into TGUpdates

2012-06-02 22:12:07 +01:00

shields.dm

…

taperecorder.dm

TG: Fix for spamming recorder transcripts

2012-04-24 19:58:04 +01:00

traitordevices.dm

TG: There's a metric assload of stuff here, mostly in preparation to my massive

2012-06-02 19:46:18 +01:00