Artur
b615be1248
Should hopefully work..
2020-02-07 18:20:09 +01:00
Jordan Brown
e37a9a36ed
Merge pull request #37976 from AutomaticFrenzy/patch/dmi-merger
...
Add a Python script to fix DMI conflicts
2018-05-25 10:55:33 -05:00
CitadelStationBot
afb0b08837
[MIRROR] Fixes servant cyborgs with the Standard module not having Abscond ( #5266 )
...
* Fixes servant cyborgs with the Standard module not having Abscond
* Update clockwork_slab.dm
* Update clockwork_slab.dm
2018-02-05 01:39:36 -06:00
CitadelStationBot
59fc595ba3
[MIRROR] Fix hook installation on Linux ( #5244 )
...
* Merge pull request #35161 from AutomaticFrenzy/patch/hook-install
Fix hook installation on Linux
* Fix hook installation on Linux
2018-02-04 22:21:05 -06:00
Tad Hardesty
f62aa9e21f
Add READMEs to hooks and mapmerge2 directories ( #34511 )
2018-01-18 21:27:04 -06:00
Tad Hardesty
61f00cbfb0
Add a new and improved mapmerge ( #33869 )
...
Key benefits of the new mapmerge include: multi-Z support, effective
reuse of deleted keys, automatic handling of key overflow, and utilizing
a git pre-commit hook to eliminate the need to run batch files manually.
2017-12-29 00:28:25 -06:00
