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

Conflicts:
	_maps/map_files/tgstation.2.1.3.dmm

2014-09-15 13:36:07 +10:00

..

area

The rest of the junk

2014-09-05 18:14:02 +04:00

gamemodes

Merge pull request #4747 from Incoming5643/wandfireball

2014-09-14 11:21:20 -05:00

jobs

ENFORCE_HUMAN_AUTHORITY now only applies to Command positions

2014-09-07 22:33:56 -06:00

machinery

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

2014-09-15 13:36:07 +10:00

mecha

Merge pull request #4736 from phil235/DrillMsgFix

2014-09-07 22:42:29 -05:00

objects

Merge pull request #4770 from Donkie/glassfix

2014-09-14 13:20:24 +01:00

turfs

Merge fix (hopefully)

2014-09-15 12:56:56 +10:00

verbs

The rest of the junk

2014-09-05 18:14:02 +04:00

asteroid.dm

…

atoms_movable.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

atoms.dm

…

communications.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

data_huds.dm

Giacom's suggestions + Borg HUD tweak

2014-09-02 18:32:06 -05:00

dna.dm

…

say.dm

The rest of the junk

2014-09-05 18:14:02 +04:00

shuttle_engines.dm

…

skincmd.dm

…

smoothwall.dm

alien nightvision moved to carbon/alien

2014-09-07 21:16:32 -07:00

sound.dm

…