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

..

_compile_options.dm

Base Life-addition()

2015-06-13 13:36:08 +02:00

admin.dm

Moves flags values to item_flags var

2015-08-18 17:18:25 -04:00

atmos.dm

Adds defines for atmospherics tanks values

2015-08-29 15:53:13 +02:00

chemistry.dm

Makes coffee poisonous to tajaran

2015-09-09 23:11:47 -04:00

damage_organs.dm

Cleans up defines

2015-08-18 17:05:26 -04:00

dna.dm

Cleans up defines

2015-08-18 17:05:26 -04:00

gamemode.dm

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

2015-09-05 09:35:02 +02:00

items_clothing.dm

Updates blob

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

lighting.dm

Moves code to relevant define.

2015-07-31 10:00:34 +02:00

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

math_physics.dm

Actually renames 'going' var.

2015-06-05 11:07:24 +03:00

misc.dm

Floor painter, turf, and decal tweaks.

2015-09-21 15:14:13 +02:00

mobs.dm

Mob size tweaks.

2015-09-20 17:12:07 +02:00

research.dm

Merge branch 'dev' into ofMechfabAndPanic

2015-08-21 16:59:57 +03:00

species_languages.dm

Cleans up living/say broadcast and verb logic

2015-09-09 03:04:18 -04:00

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