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

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

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

..

flooring

Adds more decals. Moving turfs now includes under/overlays.

2015-08-19 10:44:42 +02:00

simulated

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

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

space

Semi-fixes turf layering issues with pipes and newflooring.

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

unsimulated

…

simulated.dm

Merge remote-tracking branch 'upstream/dev' into span_class=notice

2015-06-05 00:49:13 +01:00

turf_changing.dm

Minor cleanup of proxmove, changeturf, oldcode floors.

2015-08-18 12:13:52 -07:00

turf_flick_animations.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

turf.dm

Minor cleanup of proxmove, changeturf, oldcode floors.

2015-08-18 12:13:52 -07:00

unsimulated.dm

Removed intact var in favour of is_plating() proc, fixed issues with invisible initialized pipes.

2015-08-16 17:51:19 -07:00