LetterJay d8806cacc7 Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967 ...

[MIRROR] Makes the decal component handle updating inventory icons

2018-01-02 19:15:46 -06:00

..

area

Replace explicit z-level checks with defines

2017-12-29 13:41:10 -06:00

gamemodes

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-02 14:58:09 -06:00

machinery

Merge pull request #4636 from Citadel-Station-13/upstream-merge-34021

2018-01-02 15:47:01 -06:00

mecha

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

objects

Merge pull request #4638 from Citadel-Station-13/upstream-merge-33967

2018-01-02 19:15:46 -06:00

turfs

Merge pull request #4601 from Citadel-Station-13/upstream-merge-33919

2018-01-02 18:13:42 -06:00

alternate_appearance.dm

Fixed empty HUD_List breaking alternate_appearances (#33742)

2017-12-23 01:46:50 -06:00

atoms_movable.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

atoms.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33829

2018-01-01 14:09:07 -06:00

communications.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

data_huds.dm

[Ready] Adds abductor Mind Interface Devices, and a gland HUD (#33209)

2017-12-18 20:29:37 -06:00

say.dm

Revert "[SHOULD BE DONE BUT LETS TESTMERGE FIRST] TG SYNC"

2017-12-16 13:08:50 -06:00

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

Gun sounds (#33615)

2017-12-18 15:15:25 -06:00

world.dm

Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into upstream-merge-33783

2017-12-29 01:34:17 -06:00