Cael_Aislinn 7efc1aafef Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	icons/turf/areas.dmi
	maps/RandomZLevels/stationCollision.dmm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

2013-01-07 22:26:24 +10:00

..

diseases

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

helper_datums

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

organs

Merge branch 'bleeding-edge-freeze' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2013-01-07 22:26:24 +10:00

spells

Some small changes and fixes on my last commits.

2012-11-14 14:07:34 +00:00

ai_laws.dm

More and yet more fixes from the piratepad.

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

computerfiles.dm

…

datacore.dm

Fixed the lack of job alt-titles in Crew Manifest

2012-11-21 22:02:18 -08:00

datumvars.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

disease.dm

compile fixes and cleanup

2013-01-07 02:36:52 +10:00

mind.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

2013-01-07 00:23:22 +10:00

mixed.dm

…

modules.dm

…

organs.dm

…

recipe.dm

-You can now store donuts in the donut box. The next donut you pull out will be the last one you put in.

2012-07-20 00:12:50 +00:00

spell.dm

Couple of bugfixes:

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

sun.dm

-Added advance diseases! Virology can create and mutate advance with different symptoms and effects. Read my comments if you're interested in each symptom.

2012-10-31 18:04:04 +00:00

supplypacks.dm

cleanup and re-integration of character creation options and client preferences, tiny bit of WIP work on skin_styles, gave soghun access to a couple of new hairstyles, fixed a longstanding bug with supply_packs, update some map paths, some work to integrating mod rank with new tg permissions system (not finished)

2013-01-07 21:39:34 +10:00

vote.dm

Replaces the voting system. It should fix a pretty serious server-crashing exploit and simplify the code a fair bit.

2012-09-12 00:44:13 +00:00