deathride58 b49458e0ba Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

..

area

Hard upstream sync (#6951)

2018-05-31 16:03:18 -07:00

gamemodes

Only load Reebe during clock cult (#38156)

2018-06-03 09:02:55 -05:00

machinery

Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

mecha

Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

objects

Merge branch 'master' into upstream-merge-38116

2018-06-05 21:30:21 +00:00

turfs

New directional beach sprites and corners for the 2018 Summer Ball (#38262)

2018-06-04 00:47:45 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Include item overlays in attack animations (shows the proper color of screwdrivers etc) (#38225)

2018-06-03 13:25:19 -05:00

atoms.dm

Merge pull request #38210 from AutomaticFrenzy/patch/by-vomit-combined

2018-06-01 09:58:50 -05:00

communications.dm

…

data_huds.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

say.dm

Kills off /obj/item/device (#6561)

2018-04-30 00:06:58 -05:00

shuttle_engines.dm

…

sound.dm

…

world.dm

makes small tweaks to the hub entry (#6782)

2018-05-23 12:12:57 -07:00