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

Conflicts:
	code/controllers/subsystem/air.dm
	code/datums/gas_mixture.dm
	code/game/objects/items/devices/scanners.dm
	code/modules/mob/living/carbon/human/species.dm
	code/modules/mob/living/carbon/life.dm
	tgui/assets/tgui.css
	tgui/assets/tgui.js
	tgui/scripts/interfaces/atmos_filter.ract

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

..

PDA

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

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

radio

- Refactor the visible_message() proc to be much faster.

2016-01-04 22:49:27 +01:00

aicard.dm

…

camera_bug.dm

Fixed bad origin_tech values.

2015-11-05 15:32:25 -05:00

chameleonproj.dm

Restores default chameleon projector disguise

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

doorCharge.dm

Fixed bad origin_tech values.

2015-11-05 15:32:25 -05:00

flashlight.dm

Fixes emp flashlight firing when storing it

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

geiger_counter.dm

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

instruments.dm

Makes burn_state use defines

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

laserpointer.dm

Updating one comment

2015-11-10 22:42:17 +01:00

lightreplacer.dm

Proper formatting of the notifications.

2015-11-18 00:52:16 -08:00

megaphone.dm

Voice changer friendly

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

multitool.dm

Merge pull request #13149 from Firecage/toolspeed

2015-11-29 21:06:15 +11:00

paicard.dm

Whoops I left a debug

2015-12-10 14:42:43 +00:00

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

Adds the toolspeed var and adds it to most usages of tools which has a timer

2015-11-21 19:24:14 +02:00

traitordevices.dm

removes a bunch of unneeded spawns

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

transfer_valve.dm

Adds in-hand sprite to transfer tank valve.

2015-12-02 06:23:55 +02:00

uplinks.dm

Better loop

2016-01-04 16:48:11 -06:00