mwerezak 398459c2e7 Merge remote-tracking branch 'upstream/dev' into inventoryfix ...

Conflicts:
	code/modules/organs/organ_external.dm

2015-03-31 02:13:22 -04:00

..

alien_nests.dm

Collapsed all organs into one object type. Added more interesting amputation. Added dislocation. WIP.

2015-03-11 21:17:51 +10:30

bed.dm

Fixes #8241 rollerbeds not collapsing due to a runtime

2015-02-26 14:41:31 +03:00

chairs.dm

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

2015-03-20 08:26:34 +01:00

stools.dm

Merge remote-tracking branch 'upstream/dev' into inventoryfix

2015-03-31 01:37:55 -04:00

wheelchair.dm

Mob refactoring.

2015-03-29 10:44:31 +02:00