Ccomp5950 0ca4aaa316 Merge branch 'dev-freeze' of github.com:Baystation12/Baystation12 into dev

2014-05-24 19:03:51 -05:00

..

area

Fixes #4816 and nothing else. Cherry picked from #5036.

2014-05-22 23:12:50 +02:00

dna

Initial commit containing all the necessary code files that allow Tajaran, Unathi, and Skrell to change both their hair and body color to match. NO MORE GREEN/GREY!

2014-04-27 01:00:16 -06:00

gamemodes

Fixed doubled construct spells

2014-05-18 19:52:03 +12:00

jobs

Else Ifs

2014-05-09 16:06:44 +03:00

machinery

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

2014-05-24 19:03:51 -05:00

magic

…

mecha

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

2014-04-25 21:14:58 -05:00

objects

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

2014-05-24 19:02:16 -05:00

turfs

Merge remote-tracking branch 'upstream/master' into dev

2014-05-03 16:56:19 +01:00

vehicles

…

verbs

Adds Mentors.

2014-05-04 23:12:06 -05:00

asteroid.dm

…

atoms_movable.dm

…

atoms.dm

Merge remote-tracking branch 'upstream/dev' into bs12-zuhweapons

2014-05-11 13:48:51 +00:00

communications.dm

…

json.dm

…

response_team.dm

…

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

socket_talk.dm

…

sound.dm

…

supplyshuttle.dm

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

2014-05-10 01:56:57 +09:30