LetterJay 30d4b25aee 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

..

city_of_cogs_rift.dm

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

clock_overlay.dm

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

clock_sigils.dm

Merge pull request #33580 from Xhuis/defenses_balancing

2017-12-30 16:59:07 -06:00

general_markers.dm

Fixes Lord Singuloth hungering for more than he should

2017-11-24 13:00:42 -06:00

servant_blocker.dm

Dead cultists can now cross Reebe's "Servant Blocker" (#33558)

2017-12-29 00:29:19 -06:00

spatial_gateway.dm

Replace explicit z-level checks with defines

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