PsiOmegaDelta c63f4c62b5 Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney ...

Conflicts:
	code/__defines/mobs.dm
	code/game/jobs/job/civilian.dm
	code/game/jobs/job_controller.dm

2015-08-13 08:06:11 +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

…

atmos.dm

Actually renames 'going' var.

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

chemistry.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00

damage_organs.dm

Axed couple unused organ flags, made them look a bit nicer with bitmove

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

dna.dm

Moved some stuff from global.dm into defines files that fit the theme, some into files where they are used (and only there, much global). Axed some obsolete stuff (rip Debug var).

2015-06-04 22:51:15 +03:00

gamemode.dm

It is no longer possible to define the amount of telecrystals per game mode.

2015-06-18 10:59:45 +02:00

items_clothing.dm

Makes suits usable with the icon state system.

2015-06-30 12:15:06 +09:30

lighting.dm

Moves code to relevant define.

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

machinery.dm

Compilation fixes.

2015-06-30 09:01:51 +02:00

math_physics.dm

Actually renames 'going' var.

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

misc.dm

Compilation/definition fixes.

2015-07-31 10:05:42 +02:00

mobs.dm

Merge remote-tracking branch 'upstream/dev' into 150702-MoneyMoneyMoney

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

research.dm

…

species_languages.dm

Code relocation.

2015-08-01 19:46:35 +02:00