LetterJay 3f85ba3724 Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210 ...

[MIRROR] Fix reagents being lost when vomit piles combine

2018-06-02 07:31:53 -05:00

..

area

Hard upstream sync (#6951)

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

gamemodes

Hard upstream sync (#6951)

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

machinery

Merge pull request #6973 from Citadel-Station-13/upstream-merge-38180

2018-06-02 07:29:17 -05:00

mecha

Hard upstream sync (#6951)

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

objects

Merge pull request #6975 from Citadel-Station-13/upstream-merge-38161

2018-06-02 07:31:01 -05:00

turfs

Merge pull request #6976 from Citadel-Station-13/upstream-merge-38210

2018-06-02 07:31:53 -05:00

alternate_appearance.dm

…

atoms_movable.dm

Merge pull request #38159 from AutomaticFrenzy/patch/diagonalley

2018-05-31 22:40:49 -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