Commit Graph

3 Commits

Author SHA1 Message Date
GDN
0b8c196f67 tgchat day zero changes (#23872)
* tgchat day zero changes

* Update code/game/verbs/ooc.dm

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>

---------

Co-authored-by: Henri215 <77684085+Henri215@users.noreply.github.com>
2024-01-21 22:07:57 +00:00
warriorstar-orion
349eca230c mapmerge: Separate DMM conflicts for distinct atom root types. (#22609)
* Separate DMM conflicts for distinct atom root types.

* clarify order of operations
2023-11-01 20:37:18 +00:00
warriorstar-orion
274ef027dc Add required configuration for automated map merge script. (#19484)
* Update merge_driver script.

* Actually tick and compile new files.

* Improve marker description.
2022-11-05 15:58:35 +00:00