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

Conflicts:
	icons/mob/back.dmi
	icons/mob/mask.dmi

2014-01-30 12:14:44 -06:00

..

diseases

Optimized and refactored list2text, text2list, and replacetext.

2014-01-08 11:41:51 +00: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

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

2014-01-30 12:14:44 -06: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

Implements hooks, an easier way to write code to be called at startup/roundstart/roundend.

2013-11-25 21:16:09 +00:00

supplypacks.dm

Fixes~

2014-01-06 00:23:02 -06:00