Chinsky 18a5554da5 Merge branch 'secfashion'

2013-01-12 22:50:22 +04:00

..

area

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

events

Fix for issue #2103

2013-01-10 03:10:12 +04:00

gamemodes

Good God, cult code is atrocious....

2013-01-11 02:01:23 +04:00

jobs

Added verb for admins to create additional job slot.

2013-01-11 04:22:05 +04:00

machinery

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

2013-01-09 12:45:04 +04:00

magic

Good God, cult code is atrocious....

2013-01-11 02:01:23 +04:00

mecha

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

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

objects

Merge branch 'secfashion'

2013-01-12 22:50:22 +04:00

structure

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

turfs

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

vehicles

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

verbs

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

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

asteroid.dm

Removed the old style asteroid turfs.

2012-11-18 14:01:01 +00:00

atoms_movable.dm

File restructuring: ohgodihopenothingbroke edition.

2012-09-08 22:11:02 +00:00

atoms.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

communications.dm

TELECOMMUNICATION

2012-11-25 00:08:29 +00:00

dna.dm

Merge branch 'incremental_tg' r4967 (27/10/2012) into bs12_with_tgport

2012-12-28 01:07:36 +10:00

hud.dm

Merge branch 'incremental_tg' r5200 into bs12_with_tgport

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

json.dm

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

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

response_team.dm

Initial merge http://code.google.com/p/tgstation13/source/browse/trunk/ rev 4489 (I think) with BS12

2012-08-22 04:00:11 +10:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

- Fixes issue 985. false walls are now called 'wall' instead of 'falsewall', which made them obvious.

2012-10-02 21:40:36 +00:00

socket_talk.dm

…

sound.dm

compile fixes and cleanup

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

supplyshuttle.dm

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

2012-12-29 13:06:03 +10:00