Mloc-Argent 6630e4838e Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Signed-off-by: Mloc-Argent <colmohici@gmail.com>

Conflicts:
	code/game/machinery/alarm.dm

2014-06-30 23:44:46 +01:00

..

alien_nests.dm

…

bed.dm

Psychiatrists couch

2014-06-27 22:38:57 +03:00

chairs.dm

Makes crashing into things possible with extinguisher or harm intent

2014-06-05 22:49:38 -04:00

stools.dm

Fix for stool picking up.

2013-09-13 00:23:16 +06:00

wheelchair.dm

Makes crashing into things possible with extinguisher or harm intent

2014-06-05 22:49:38 -04:00