mwerezak 6eceb15fe6 Merge remote-tracking branch 'upstream/dev-freeze' into poster ...

Conflicts:
	code/game/turfs/simulated/walls.dm

2015-01-01 15:46:23 -05:00

..

floor_types.dm

fix up airless turfs to be actually airless

2014-12-21 20:36:11 +00:00

floor.dm

All turfs except /turf/simulated/wall can now be clicked to push pulled objects towards them

2014-12-10 22:08:44 +00:00

walls_mineral.dm

integrate XGM into the code

2014-07-22 19:52:12 +01:00

walls_misc.dm

…

walls_reinforced.dm

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

2015-01-01 15:46:23 -05:00

walls.dm

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

2015-01-01 15:46:23 -05:00