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

..

assembly.dm

Merge remote-tracking branch 'tgstation/master' into point-zero

2015-09-12 21:07:40 +09:00

bomb.dm

associative list

2015-12-29 13:33:12 -06:00

doorcontrol.dm

removes a bunch of unneeded spawns

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

flash.dm

fixes flashes being stupid on emp.

2015-12-24 06:25:36 -08:00

health.dm

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

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

helpers.dm

Makes is_type helpers inline

2015-10-21 22:22:58 +02:00

holder.dm

removes a bunch of .0

2015-09-10 20:57:30 +09:00

igniter.dm

Makes effect system code more OOP.

2015-10-21 23:28:29 +02:00

infrared.dm

Changes checks in altclicks from canusetopic to incapacitated.

2015-11-01 11:24:17 +02:00

mousetrap.dm

Assemblies update

2015-09-04 11:22:37 +03:00

proximity.dm

removes a bunch of unneeded spawns

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

shock_kit.dm

Changes the paths of stools, beds and chairs. It is now obj/structure/bed/chair and obj/structure/bed/stool. It makes much more sense since stools barely have any code of their own.

2015-10-10 13:35:00 +02:00

signaler.dm

removes a bunch of unneeded spawns

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

timer.dm

Fixes not being able to use timer while buckled.

2015-08-23 17:38:10 +02:00

voice.dm

Removes tape recorder wires to fix a server-crashing bug.

2015-08-10 14:00:05 +02:00