PsiOmega 95b12da391 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/gamemode.dm
	code/game/antagonist/outsider/ert.dm
	code/game/gamemodes/ninja/ninja.dm

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

..

_compile_options.dm

Base Life-addition()

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

_macros.dm

Re-adds the Clamp defines.

2015-07-11 11:23:55 +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

…

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

Accidentally commited before saving the file.

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

lighting.dm

Moves code to relevant define.

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

machinery.dm

Removes duplicate camera network definitions.

2015-08-30 15:51:05 +02:00

math_physics.dm

Actually renames 'going' var.

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

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