MrPerson 1caf7b8421 Merge pull request #3121 from ChuckTheSheep/Bad-Ass-Fix ...

Fix to the glorious Bad Ass Icon display

2014-03-22 19:29:12 -07:00

..

area

Gives a gravity generator to MiniStation.

2014-03-21 21:57:57 +00:00

gamemodes

Merge pull request #3121 from ChuckTheSheep/Bad-Ass-Fix

2014-03-22 19:29:12 -07:00

jobs

-Added Nienhaus's new HoP uniform and cap. Old sprites are renamed to hop_old

2014-03-12 22:32:49 -06:00

machinery

Merge pull request #3030 from Razharas/UnaryMachinery

2014-03-22 20:07:17 -03:00

mecha

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

2014-03-21 03:05:39 -07:00

objects

Merge pull request #3108 from TZK13/Bluebay-2-Electric-Bloogaloo

2014-03-22 20:01:55 -03:00

turfs

GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)

2014-03-21 19:04:51 -07:00

verbs

…

asteroid.dm

Merge conflicts fix

2014-03-03 05:42:31 +04:00

atoms_movable.dm

GEE THANKS GIA FOR MORE CONFLICTS (gravitygen changes to c4 vs qdel)

2014-03-21 19:04:51 -07:00

atoms.dm

Made gibbing not look stupid.

2014-02-26 23:44:19 -08:00

communications.dm

…

dna.dm

Merge branch 'master' of https://github.com/tgstation/-tg-station into qdel_r

2014-03-21 03:05:39 -07:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

…

sound.dm

Adds crlf default to .gitattributes for most text file types we use.

2014-02-04 15:14:39 +00:00