Neerti e52a0ea332 Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015 ...

Conflicts:
	.travis.yml
	code/game/gamemodes/changeling/changeling_powers.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/turfs/simulated.dm
	code/global.dm
	icons/misc/fullscreen.dmi
	polaris.dme

2015-10-10 23:17:26 -04:00

..

floor_acts.dm

Updates blob

2015-10-05 18:10:16 +03:00

floor_attackby.dm

Fixes floorbots, floor attackby flooring setting, and adjusts a few flooring names.

2015-08-16 06:09:09 -07:00

floor_damage.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

floor_icon.dm

Rewrites the floor painter.

2015-08-16 20:58:54 -07:00

floor_static.dm

Removed turf_animation for now, ported vg hasproximity optimisation. Rewrite and refactor of how turfs handle icon updates, edge smoothing and

2015-08-16 06:05:21 -07:00

floor_types.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into randmap

2015-08-22 03:57:12 +09:30

floor.dm

Floor instance cleanup.

2015-08-18 13:58:32 -07:00

wall_attacks.dm

Merge branch 'dev' into ofClicksAndCooldowns

2015-08-21 16:15:07 +03:00

wall_icon.dm

Rewrites the floor painter.

2015-08-16 20:58:54 -07:00

wall_types.dm

Added supply beacon.

2015-08-13 16:59:18 +09:30

walls.dm

Merge branch 'dev' of https://github.com/Baystation12/Baystation12 into sync_to_bay_10/10/2015

2015-10-10 23:17:26 -04:00