LetterJay 2fe2912fa3 Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173 ...

[MIRROR] Traitor, a traitor is a traitor.

2017-08-28 08:46:53 -05: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

[MIRROR] Some more tweaks to Geis (#2487)

2017-08-27 01:36:17 -07:00

machinery

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

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

Merge pull request #2496 from Citadel-Station-13/upstream-merge-30173

2017-08-28 08:46:53 -05:00

turfs

Cleaned up environment_smash vars with bitflag defines (#2515)

2017-08-27 05:55:07 -07:00

alternate_appearance.dm

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

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

July 5th TG sync (#1883)

2017-07-05 22:14:19 -05:00

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

Adds helpers to avoid << use

2017-08-08 22:28:16 -05:00

world.dm

Moves most of world.dm

2017-08-16 17:51:33 -05:00