skull132 cdd4772177 Merge branch 'master' into merge/level_dev_master ...

# Conflicts:
#	code/game/machinery/vending.dm
#	maps/exodus-1.dmm
#	maps/exodus-2.dmm

2016-12-19 00:23:19 +02:00

..

item_defines.dm

Merge branch 'master' into merge/level_dev_master

2016-12-19 00:23:19 +02:00

item_spawning.dm

Contained Sprites v2 (#758)

2016-08-25 16:55:42 +02:00