phil235 ffd711c26f Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal ...

Conflicts:
	code/modules/mob/living/carbon/life.dm
	code/modules/mob/living/carbon/slime/slime.dm
	code/modules/mob/living/simple_animal/friendly/corgi.dm
	code/modules/mob/living/simple_animal/slime/say.dm
	code/modules/reagents/Chemistry-Reagents/Consumable-Reagents/Food-Reagents.dm

2015-03-23 16:51:03 +01:00

..

diseases

Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

2015-03-23 16:51:03 +01:00

helper_datums

Ports Mloc's Refactor of buckling, All /obj can now buckle things. HE Pipes now change colour based on heat.

2015-01-14 19:07:18 +00:00

spells

Merge branch 'TheAnimalsTheyAttack!' of git://github.com/Sometinyprick/-tg-station into Sometinyprick-TheAnimalsTheyAttack!

2015-03-09 01:47:40 -05:00

wires

Air Alarm Deconstruction fix: you no longer need to cut the syphon wire to deconstruct the air alarm.

2015-02-14 17:53:22 +01:00

ai_laws.dm

SPANCLASSES!!!!!

2014-08-26 09:52:13 +02:00

browser.dm

Fixes grinders opening their menus on range. Fixed #4088

2014-11-08 15:28:32 +01:00

computerfiles.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

datacore.dm

Lots of fixes and improvements

2015-02-04 17:35:42 +04:00

datumvars.dm

Stamina on adminmoreinfo and vv; ahelp and pray CA replaced by TP

2015-02-24 20:02:43 +11:00

gas_mixture.dm

Fix nuke-op shuttle gets infinitely hot issue

2015-03-17 14:53:12 -07:00

goon_mutations_disabilities.dm

Adds the comic sans span to the new system.

2015-03-18 21:09:36 +01:00

goon_mutations_powers.dm

Code cleanup

2015-03-13 10:41:00 -07:00

hud.dm

Reworked suggested code, added brain implants, misc additions.

2015-03-09 20:39:09 +00:00

mind.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into SlimeAnimal

2015-03-23 16:51:03 +01:00

mixed.dm

Tweaked the power distribution handling :

2014-05-25 00:54:41 +02:00

modules.dm

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2 316c924e-a436-60f5-8080-3fe189b3f50e

2010-08-23 14:29:20 +00:00

mutations.dm

Merge pull request #8462 from xxalpha/cyberimplants

2015-03-21 13:38:27 +01:00

recipe.dm

Food and drinks refactor

2015-01-19 18:06:15 +11:00

spell.dm

Fixes #6991

2015-02-03 20:26:58 -08:00

supplypacks.dm

Adds renaming, Adds collars to pet crates

2015-03-22 13:16:30 -05:00

uplink_item.dm

changelog compiled

2015-03-17 20:03:31 +11:00