Jordie0608 f535abcc06 Merge branch 'master' of https://github.com/tgstation/-tg-station into timeforanewnew() ...

Conflicts:
	code/modules/food&drinks/food/snacks_burgers.dm
	code/modules/food&drinks/food/snacks_cake.dm
	code/modules/food&drinks/food/snacks_pastry.dm
	code/modules/reagents/reagent_containers/pill.dm
	code/modules/reagents/reagent_containers/syringes.dm

2015-01-22 15:15:17 +11:00

..

diseases

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06: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 pull request #7049 from RemieRichards/PipesAndBuckles

2015-01-20 20:07:18 -06:00

wires

Makes assembly parts work with wires

2015-01-17 18:08:55 +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

…

datacore.dm

adds supply job list

2015-01-03 19:49:26 -08:00

datumvars.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

gas_mixture.dm

Fixes LINDA not properly activating turfs who are next to unsimulated turfs with differences (space turfs are unsimulated)

2014-11-05 14:54:29 -03:00

goon_mutations_disabilities.dm

Adds 3 new disabilities

2015-01-17 18:55:41 -08:00

goon_mutations_powers.dm

Fixes genetics

2015-01-20 23:01:35 +03:00

hud.dm

Adds an antag hud system for wizards.

2015-01-13 00:14:05 -05:00

mind.dm

Replaces a bunch of input() with stripped_input()

2015-01-11 19:02:53 -03:00

mixed.dm

…

modules.dm

…

mutations.dm

Fixes genetics

2015-01-20 23:01:35 +03:00

recipe.dm

Food and drinks refactor

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

spell.dm

Merge pull request #6990 from Incoming5643/only_you_can_prevent_horrific_floating_brains

2015-01-20 20:20:07 -03:00

supplypacks.dm

Goon Chemistry: Addiction and Overdosing

2015-01-18 21:50:54 -08:00

uplink_item.dm

-capitalizes Ephedrine in sleepers

2015-01-20 23:21:11 -06:00