HarpyEagle 7f066065d3 Merge remote-tracking branch 'upstream/dev' into attack-cleanup2 ...

Conflicts:
	code/modules/mob/living/simple_animal/friendly/spiderbot.dm
	code/modules/mob/living/simple_animal/simple_animal.dm

2015-10-05 19:20:33 -04:00

..

_compile_options.dm

…

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

Accidentally commited before saving the file.

2015-08-21 16:19:09 +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

…

misc.dm

Floor painter, turf, and decal tweaks.

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

mobs.dm

Merge remote-tracking branch 'upstream/dev' into attack-cleanup2

2015-10-05 19:20:33 -04: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

…