kevinz000 b806ee92f3 Merge branch 'master' into upstream-merge-30862

2018-06-17 20:04:06 -07:00

..

area

Merge pull request #38366 from AutomaticFrenzy/patch/fire-overlay

2018-06-11 22:29:10 -05:00

gamemodes

Merge pull request #38360 from ShizCalev/key-cleanup

2018-06-11 22:29:27 -05:00

machinery

Merge pull request #38493 from ShizCalev/typo-fix

2018-06-16 06:19:20 -05:00

mecha

[MIRROR] Add a missing space in mechacode (#7080)

2018-06-15 02:50:06 -07:00

objects

Merge branch 'master' into upstream-merge-30862

2018-06-17 20:04:06 -07:00

turfs

Merge pull request #7113 from Citadel-Station-13/upstream-merge-38500

2018-06-16 16:17:28 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Merge pull request #38367 from AutomaticFrenzy/patch/pull-diagonally

2018-06-11 22:29:01 -05:00

atoms.dm

[MIRROR] Turf grammar omnibus (#7104)

2018-06-13 19:31:29 -07: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

Standardizes and cleans up some admin messages & logging

2018-05-31 22:41:31 -05:00

sound.dm

…

world.dm

makes small tweaks to the hub entry (#6782)

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