PsiOmega 173f0527eb Merge remote-tracking branch 'upstream/master' into dev-freeze ...

Conflicts:
	code/modules/mob/living/carbon/human/life.dm
	code/modules/nano/nanomanager.dm
	code/modules/surgery/surgery.dm

2015-03-05 08:05:44 +01:00

..

diseases

Fixes #6613 and #6492

2014-10-08 23:10:12 +10:30

helper_datums

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

spells

Replaces stool structures with stool items

2015-02-18 01:06:00 -05:00

wires

Alarm centralization completion

2015-02-23 15:11:13 +01:00

ai_laws.dm

Removes references to the Syndicate and renames nuclear emergency mode.

2014-10-19 16:05:40 +10:30

browser.dm

Fixed up security, medical, card, and crew. Made Computer 3 actually do what it's supposed to do.

2014-06-22 03:31:06 -07: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

Collapsed space vines, glowshrooms and biomass into one spreading-plant system.

2015-02-04 10:49:41 +10:30

datumvars.dm

correction of all copytext(sanitize(..)) to sanitize(copytext(..))

2015-02-01 22:54:56 +03:00

disease.dm

Update disease.dm

2013-09-01 23:42:35 -07:00

mind.dm

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

2015-03-05 08:05:44 +01:00

mixed.dm

Powernets

2014-09-07 01:10:22 -04: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

organs.dm

Organs:

2011-10-08 10:38:01 +00:00

recipe.dm

KITCHEN CODE IS WORKING. YES. I CAN DIE NOW.

2015-02-16 22:11:59 +10:30

spell.dm

Moved everything to a module-based hardsuit system.

2014-11-14 22:57:26 +10:30

sun.dm

Automatic solar tracking again functional.

2014-11-14 08:12:39 +01:00

supplypacks.dm

Assorted Fixes

2015-02-24 14:40:02 -05:00