LetterJay fc07e15f61 Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992 ...

[MIRROR] Fixes being unable to merge full stacks

2017-10-23 14:52:28 -04:00

..

area

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

gamemodes

Merge pull request #3558 from Citadel-Station-13/upstream-merge-31978

2017-10-23 14:50:05 -04:00

machinery

Merge pull request #3553 from Citadel-Station-13/upstream-merge-31969

2017-10-23 04:05:19 -04:00

mecha

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

objects

Merge pull request #3563 from Citadel-Station-13/upstream-merge-31992

2017-10-23 14:52:28 -04:00

turfs

[MIRROR] Grammar fixes to atom descriptions (#3165)

2017-10-21 07:17:03 -05:00

alternate_appearance.dm

…

atoms_movable.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

atoms.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

communications.dm

…

data_huds.dm

[MIRROR] Does some code standardization/consistency. (#3161)

2017-10-21 06:10:22 -05:00

say.dm

…

shuttle_engines.dm

Adds desc to things lacking them.

2017-10-01 15:07:37 -05:00

skincmd.dm

…

sound.dm

Honkbots: The Clown's lil helpers. (#31139)

2017-10-15 16:44:23 -05:00

world.dm

Adds logging crew manifest to seperate file (#31665)

2017-10-15 16:56:48 -05:00