deathride58 3a8e2870ca Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059 ...

[MIRROR] You now have to stand next to the decoy nuke disk and examine it to know it's fake

2018-01-05 02:44:21 +00:00

..

area

Replace explicit z-level checks with defines

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

gamemodes

Merge pull request #4662 from Citadel-Station-13/upstream-merge-34059

2018-01-05 02:44:21 +00:00

machinery

Adds more observation messages in deadchat (#34075)

2018-01-04 15:16:58 -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 #34025 from DaxDupont/PDAColor

2018-01-03 21:12:09 -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

…

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

…

data_huds.dm

…

say.dm

…

shuttle_engines.dm

…

skincmd.dm

…

sound.dm

…

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