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

Conflicts:
	code/modules/mob/new_player/new_player.dm
	code/modules/mob/new_player/sprite_accessories.dm
	code/modules/reagents/Chemistry-Reagents.dm
	code/modules/reagents/Chemistry-Recipes.dm
	code/setup.dm
	html/changelog.html
	icons/mob/human_face.dmi

also a sneaky issue resolution caused in spiky taj hair

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

2013-02-01 23:25:45 +10:00

..

__HELPERS

copmile fixes, rework a few things to better fit tg code structure, replace tgstation.2.0.9.1.dmm with tgstation.2.1.0.dmm (kept old map file), tgstation.2.0.9.1.dmm has 1233 errors

2013-01-14 21:07:16 +10:00

ATMOSPHERICS

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

controllers

re-enabled air profiling, some tweaks to turf changes to resolve outstanding issues (will be overwritten by master)

2013-02-01 23:07:28 +10:00

datums

Merge pull request #2194 from comma/master

2013-01-16 17:57:05 -08:00

defines

money! re-added atms, created account system / accounts database, whole bunch of options for moving money around, some tweaks to spacecash and icons

2013-01-22 17:56:34 +10:00

FEA

Too remove potential excessive garbage collection per tick. We will be reusing lists for overlays instead of deleting and creating them.

2013-01-04 15:11:06 +00:00

game

re-enabled air profiling, some tweaks to turf changes to resolve outstanding issues (will be overwritten by master)

2013-02-01 23:07:28 +10:00

js

…

modules

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

2013-02-01 23:25:45 +10:00

TriDimension

…

unused

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00

WorkInProgress

money tweaks

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

ZAS

tweaked fire to lower fuel/oxy requirements, increase temperature rise, made it a bit easier to get fires working

2013-02-01 23:06:40 +10:00

global.dm

removed some duplicate events code brought in by mistake during tg port, fixed space ninja spam, renamed 'NSV Exodus' to 'NSS Exodus'

2013-01-21 04:56:20 +10:00

hub.dm

…

names.dm

…

setup.dm

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

2013-02-01 23:25:45 +10:00

stylesheet.dm

Merge branch 'incremental_tg' r5067 into bs12_with_tgport

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

world.dm

Merge branch 'incremental_tg' r5514 (11/1/2013) into bs12_with_tgport

2013-01-11 22:12:31 +10:00