CitadelStationBot 64abde83eb [MIRROR] Cult Fixes and Minor Balance Tweaks (#5913) ...

* Cult Fixes and Minor Balance Tweaks (#36092)

* Fixes and Balance Tweaks

* Faster deconversions

* Shade nerf

* Cult Fixes and Minor Balance Tweaks

2018-03-12 07:01:54 -05:00

..

__DEFINES

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

__HELPERS

Merge remote-tracking branch 'refs/remotes/origin/master' into upstream-merge-35475

2018-03-09 14:18:47 -05:00

_globalvars

Merge pull request #5855 from Citadel-Station-13/upstream-merge-35858

2018-03-09 18:37:29 +00:00

_js

…

_onclick

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

controllers

Fix config loading exploit (#36286)

2018-03-10 14:52:18 -06:00

datums

[READY FOR MERGE] The Giant Combat Reworks - Part 1: Goodbye stuns, hello staminacrit (#5463)

2018-03-11 13:32:44 -07:00

game

[MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)

2018-03-12 07:01:54 -05:00

modules

[MIRROR] Cult Fixes and Minor Balance Tweaks (#5913)

2018-03-12 07:01:54 -05:00

_compile_options.dm

Merge pull request #36190 from MrStonedOne/patch-489

2018-03-07 01:32:41 -06:00

world.dm

…