PsiOmegaDelta 12078c48e9 Merge remote-tracking branch 'upstream/dev-freeze' into dev ...

Conflicts:
	code/__defines/mobs.dm
	code/game/asteroid.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/silicon/robot/robot_modules.dm
	code/modules/mob/new_player/preferences_setup.dm
	code/modules/recycling/disposal.dm

2015-12-13 10:47:33 +01:00

..

_compile_options.dm

…

admin.dm

Moves flags values to item_flags var

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

atmos.dm

Merge pull request #11444 from Baystation12/dev-freeze

2015-11-12 17:48:12 +01:00

btime.dm

Scheduler now uses btime.

2015-10-24 12:53:04 +02:00

chemistry.dm

Makes coffee poisonous to tajaran

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

damage_organs.dm

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

2015-12-06 11:48:20 +01:00

dna.dm

Cleans up defines

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

gamemode.dm

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

2015-12-05 12:47:03 -06:00

items_clothing.dm

Updates blob

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

lighting.dm

…

machinery.dm

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

2015-09-11 08:54:03 +02:00

math_physics.dm

Adds thermal radiation into space for human mobs

2015-11-10 23:52:41 -05:00

misc.dm

Relocates color definitions. Lowercases color definitions.

2015-12-09 21:49:58 +01:00

mobs.dm

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

2015-12-13 10:47:33 +01:00

process_scheduler.dm

Scheduler now uses btime.

2015-10-24 12:53:04 +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

…