Ccomp5950 63a0f1185e Merge branch 'master' of github.com:Baystation12/Baystation12 into dev-freeze ...

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/game/dna/genes/powers.dm
	code/game/objects/items/devices/PDA/PDA.dm

2014-02-20 19:16:23 -06:00

..

diseases

DNA2 Bug Fixes - Part 2 (CHERRY PICK)

2014-02-10 22:46:28 -06:00

helper_datums

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

2012-12-28 14:13:11 +10:00

spells

Fixed forcewalls.

2013-05-28 18:32:59 -07:00

ai_laws.dm

More and yet more fixes from the piratepad.

2012-10-12 14:25:54 -07:00

browser.dm

Adds janitorial cart from tg, replacing janicart. Adds in some NanoUI stuff to make it work.

2013-08-31 20:12:19 +01:00

computerfiles.dm

…

datacore.dm

DNA2 fixes cherrypicked from N3X15.

2013-12-23 00:06:56 +10:30

datumvars.dm

Adding Cancel options for Adding Verbs.

2014-01-24 23:56:38 -06:00

disease.dm

Update disease.dm

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

mind.dm

Added the rest of the objectiveless antag types

2014-02-04 23:51:34 -08:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

spell.dm

Cleaned the fuck out of smoke.

2013-11-05 02:57:23 +04:00

sun.dm

Code effeciency project: Sun datum

2014-02-13 05:36:46 -06:00

supplypacks.dm

Reintroducing the dough-based cooking system.

2014-02-01 02:17:38 +01:00