phil235 6eb4ffa825 Merge branch 'master' of https://github.com/tgstation/-tg-station into AttackbyDestruction ...

Conflicts:
	code/game/objects/items/devices/lightreplacer.dm
	code/game/objects/structures/crates_lockers/closets.dm

2016-04-26 21:49:51 +02:00

..

PDA

Removing some comments I had left in.

2016-04-24 21:12:04 +02:00

radio

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

2016-04-26 21:49:51 +02:00

aicard.dm

Rename get_ui_data -> ui_data, remove useless shuffle from wires

2016-02-05 17:09:40 -06:00

camera_bug.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

chameleonproj.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

doorCharge.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

flashlight.dm

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

2016-04-24 21:22:37 +02:00

geiger_counter.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

instruments.dm

…

laserpointer.dm

Same things but with structures now.

2016-04-24 20:38:33 +02:00

lightreplacer.dm

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

2016-04-26 21:49:51 +02:00

megaphone.dm

Adds the clown megaphone. Standardizes megaphone font. Fixes typo. Adds self to admins.txt.

2016-04-04 02:13:33 -04:00

multitool.dm

Fixes detection multitool (#17011)

2016-04-26 19:49:11 +02:00

paicard.dm

Make wires use defines, put a wire var on /atom, fix tgui ui_host runtimes

2016-01-22 19:25:33 -06:00

pipe_painter.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

powersink.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

scanners.dm

First commit of this big PR

2016-04-24 20:26:24 +02:00

sensor_device.dm

…

taperecorder.dm

…

traitordevices.dm

removes simulated turfs; adds space gas mixture for space

2016-03-10 17:27:01 -06:00

transfer_valve.dm

New proximity code

2016-01-26 07:47:33 +03:00