Firecage d2bd6871d5 Merge Conflict Fix

2016-01-20 14:07:14 +02:00

..

PDA

Merge conflict fix

2016-01-19 10:02:50 +02:00

radio

Merge Conflict Fix

2016-01-20 14:07:14 +02:00

aicard.dm

…

camera_bug.dm

…

chameleonproj.dm

Restores default chameleon projector disguise

2016-01-03 19:19:17 +01:00

doorCharge.dm

…

flashlight.dm

Fixes emp flashlight firing when storing it

2015-12-20 21:33:29 +01:00

geiger_counter.dm

…

instruments.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

laserpointer.dm

…

lightreplacer.dm

…

megaphone.dm

Voice changer friendly

2015-12-20 11:51:29 -06:00

multitool.dm

…

paicard.dm

…

pipe_painter.dm

…

pizza_bomb.dm

Makes burn_state use defines

2015-12-13 05:36:55 -06:00

powersink.dm

…

scanners.dm

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

2016-01-13 20:07:21 -06:00

sensor_device.dm

…

taperecorder.dm

…

traitordevices.dm

removes a bunch of unneeded spawns

2016-01-02 18:23:02 -08:00

transfer_valve.dm

Does the rest of the if()'s/ else's

2016-01-17 19:03:12 +02:00