Cael_Aislinn 1bf5b97b2e Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport ...

Conflicts:
	code/modules/customitems/item_spawning.dm
	icons/mob/items_lefthand.dmi
	icons/mob/items_righthand.dmi

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

2012-09-22 18:31:52 +10:00

..

ATMOSPHERICS

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4618)

2012-09-04 22:19:03 +10:00

controllers

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

datums

Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport (r4649)

2012-09-08 14:22:44 +10:00

defines

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-09-22 18:31:52 +10:00

FEA

New lighting, it's essentially just the old DAL system with a queue.

2012-08-25 16:06:57 +00:00

game

added random barsigns. will add them to the map when we get closer to merging

2012-09-09 00:39:43 +10:00

js

…

modules

Merge branch 'master' of https://github.com/Baystation12/Baystation12 into bs12_with_tgport

2012-09-22 18:31:52 +10:00

TriDimension

Revert "Revert pull request #1605 and #1606 due to temperature bugs killing the crew" since that code did not touch any temperature things, or even any ZAS things and I got no answers even after asking for about 18 hours...

2012-08-12 18:41:27 -07:00

unused

Merge remote-tracking branch 'remotes/git-svn' (r4527) into bs12_with_tgport

2012-08-24 21:55:58 +10:00

WorkInProgress

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

ZAS

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

global.dm

Merge tgstation r4633 into bs12_with_tgport

2012-09-06 13:13:57 +10:00

names.dm

…

setup_3d.dm

Revert "Random not much finished bullshit work on mapdata."

2012-09-06 15:51:23 -07:00

setup.dm

merge with tgstation's r4618, removed some broken bs12 merges (organs, pain)

2012-09-06 13:09:20 +10:00

stylesheet.dm

* Merged diagonal reaching.

2012-08-23 22:43:38 +01:00

ZAS_defines.dm

missing files

2012-08-22 20:58:12 +10:00