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

..

closets

Merge remote-tracking branch 'upstream/master' into dev-freeze

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

closets.dm

Fixed It won't budge! from crates, added drag and drop for table climbing, added Adajcent check to table climbing.

2014-06-29 09:40:37 +09:30

crates.dm

Shuffling around table and crate knock/climb procs.

2014-06-24 11:11:02 +09:30

largecrate.dm

Revert "Merge pull request #4607 from Aryn/master"

2014-03-24 13:54:11 +00:00