kevinz000 3c87a1f971 Merge branch 'master' into upstream-merge-29718

2017-08-29 09:34:07 -07:00

..

area

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

gamemodes

Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214

2017-08-28 09:01:47 -05:00

machinery

sync

2017-08-29 09:29:45 -07:00

mecha

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

objects

Update boxes.dm

2017-08-29 01:46:21 -05:00

turfs

Merge pull request #2529 from Citadel-Station-13/upstream-merge-30214

2017-08-28 09:01:47 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

atoms.dm

Syncs maps, and a bunch of other things that no one will care about/notice/give fucks about until they break. Welcome to conflict hell. (#2460)

2017-08-24 21:07:58 -07:00

communications.dm

Annihilates the colons!

2017-08-15 10:49:55 -05:00

data_huds.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

say.dm

…

shuttle_engines.dm

here we go again (#2456)

2017-08-24 19:24:25 -07:00

skincmd.dm

…

sound.dm

Makes the Ark of the Clockwork Justicar much more fancy

2017-08-20 19:55:15 -05:00

sound.dm.rej

…

world.dm

Adds separate log for sql errors with no config check

2017-08-28 02:20:16 -05:00