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

Conflicts:
	code/modules/reagents/reagent_containers/bottle.dm
	code/modules/reagents/reagent_containers/hypospray.dm
	code/modules/reagents/reagent_containers/patch.dm
	code/modules/reagents/reagent_containers/pill.dm

2015-01-19 18:28:38 +11:00

..

diseases

Merge pull request #7131 from Iamgoofball/goonchem_shoehorn_backup

2015-01-19 03:32:57 -03:00

helper_datums

Reserve PascalCase inits

2014-12-16 12:29:04 +02:00

spells

Adds span classes to repulse spell.

2015-01-14 02:02:17 -07:00

wires

* Updated the autolathe to use the datum/designs system (new file

2014-12-13 22:56:43 +01:00

ai_laws.dm

…

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

hud.dm

/datum/atom_hud (Passive HUDs) bugfixes

2014-12-06 15:05:23 -03: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

Last pack of fixes for now

2015-01-11 08:23:50 +03:00

recipe.dm

Food and drinks refactor

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

spell.dm

Fixes malf AI lockdown affecting doors on z levels other than station and mining.

2015-01-11 15:39:32 +01:00

supplypacks.dm

Goon Chemistry: Addiction and Overdosing

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

uplink_item.dm

Goon Chemistry: Addiction and Overdosing

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