Erthilo 3b61ba850f Merge branch 'master' of git://github.com/Baystation12/Baystation12 into dev ...

Conflicts:
	baystation12.dme
	code/modules/projectiles/ammunition/bullets.dm

2013-09-02 23:32:33 +01:00

..

diseases

Showed that huge proc in /atom what polymorphism' is.

2013-06-01 12:24:43 +04: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

Generalizes whitelist/species lists for datacore/preferences/new player code. Removes vox whitelist check from raid spawn.

2013-08-07 01:16:38 -07:00

datumvars.dm

Added abilities for nymphs/evolution to a final form.

2013-08-19 17:22:23 -07:00

disease.dm

Update disease.dm

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

mind.dm

Officers can be set as rev.

2013-08-31 22:13:59 +01:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

…

spell.dm

Couple of bugfixes:

2012-11-14 01:17:40 +00:00

sun.dm

Updates to sun.dm and solar.dm

2013-04-07 10:17:41 -04:00

supplypacks.dm

Fixes for monkeycubes.

2013-09-02 17:44:47 +01:00