Jordan Brown 641ba9c145 Merge pull request #29940

2017-08-17 10:13:00 -04:00

..

area

Everything from before but less merge conflicty (#29905)

2017-08-16 15:17:10 -04:00

gamemodes

Merge pull request #29940

2017-08-17 10:13:00 -04:00

machinery

Merge pull request #29940

2017-08-17 10:13:00 -04:00

mecha

Replaced flags with flags_1

2017-08-16 13:01:15 -06:00

objects

Merge pull request #29940

2017-08-17 10:13:00 -04:00

turfs

Merge pull request #29940

2017-08-17 10:13:00 -04:00

alternate_appearance.dm

Made some alternate appearances transparent to ghosts

2017-06-28 10:43:32 -06:00

atoms_movable.dm

Replaced flags with flags_1

2017-08-16 13:01:15 -06:00

atoms.dm

Merge pull request #29940

2017-08-17 10:13:00 -04:00

communications.dm

Annihilates the colons! (#29812)

2017-08-15 12:49:35 -03:00

data_huds.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

say.dm

…

shuttle_engines.dm

Repaths /obj/item/weapon to /obj/item (#29929)

2017-08-16 10:38:51 -03:00

skincmd.dm

…

sound.dm

Adds helpers to avoid << use (#29611)

2017-08-09 00:27:54 -03:00

world.dm

Moves most of world.dm

2017-08-09 00:41:05 -04:00