LetterJayandGitHub f7be23e78a Merge branch 'master' into upstream-merge-36442

2018-04-01 19:50:37 -05:00

..

area

[MIRROR] [READY] Several fixes/changes to mood, longterm mood effects, beauty component (#5992)

2018-03-19 21:33:18 -05:00

gamemodes

Merge pull request #6193 from Citadel-Station-13/upstream-merge-36800

2018-03-31 18:43:34 -05:00

machinery

Walls made entirely of wood! (#36524)

2018-04-01 12:24:33 -05:00

mecha

[MIRROR] Replaced body zone magic strings with defines (#6004)

2018-03-19 21:18:57 -05:00

objects

Merge branch 'master' into upstream-merge-36442

2018-04-01 19:50:37 -05:00

turfs

Walls made entirely of wood! (#36524)

2018-04-01 12:24:33 -05:00

alternate_appearance.dm

cult lol xd

2018-01-31 08:07:22 -06:00

atoms_movable.dm

Reee mirror bot. Hard syncs some missed PR stuff + maps (#5951)

2018-03-14 16:49:40 -05:00

atoms.dm

[READY] Refactors wet floors to a component (#36130)

2018-03-17 07:53:11 -05:00

communications.dm

…

data_huds.dm

[MIRROR] circuit diagnostic status icon changes (#6019)

2018-03-19 21:16:26 -05:00

say.dm

…

shuttle_engines.dm

[MIRROR] Ports more operations to "tool_act" (#5718)

2018-02-27 05:04:27 -06:00

sound.dm

…

world.dm

Tg 1 28 sync testing/confirmation (#5178)

2018-01-29 04:42:29 -06:00