Kelenius dd11a301e4 Merge branch 'dev' into ofMechfabAndPanic ...

Conflicts:
	code/game/mecha/mech_fabricator.dm
	maps/exodus-1.dmm

2015-08-24 18:16:36 +03:00

..

_compile_options.dm

…

_macros.dm

…

admin.dm

Moves flags values to item_flags var

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

atmos.dm

Cleans up defines

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

chemistry.dm

…

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

Cleans up defines

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

items_clothing.dm

Accidentally commited before saving the file.

2015-08-21 16:19:09 +03:00

lighting.dm

…

machinery.dm

Removes CHARGELEVEL_DEFAULT

2015-08-18 17:20:38 -04:00

math_physics.dm

…

misc.dm

Cleans up defines

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

mobs.dm

Merge branch 'dev' into ofClicksAndCooldowns

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

research.dm

Merge branch 'dev' into ofMechfabAndPanic

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

species_languages.dm

Cleans up defines

2015-08-18 17:05:26 -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