Merge pull request #4868 from myk002/myk_family_affairs

tombstone family affairs and add alias
DFHack · Aug 23, 2024 · 1676762 · 1676762
2 parents 362b45c + d5d261e
commit 1676762
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/data/init/dfhack.tools.init b/data/init/dfhack.tools.init
@@ -16,3 +16,4 @@ alias add autounsuspend suspendmanager
 alias add drain-aquifer aquifer drain --all
 alias add gui/dig gui/design
 alias add version help
+alias add gui/family-affairs gui/pregnancy
diff --git a/docs/about/Removed.rst b/docs/about/Removed.rst
@@ -243,7 +243,13 @@ Replaced by `gui/sandbox`.
 
 gui/dig
 =======
-Renamed to gui/design
+Renamed to `gui/design`.
+
+.. _gui/family-affairs:
+
+gui/family-affairs
+==================
+Merged into `gui/pregnancy`.
 
 .. _gui/hack-wish:
 

diff --git a/docs/changelog.txt b/docs/changelog.txt
@@ -64,6 +64,7 @@ Template for new versions:
 
 ## Misc Improvements
 - `orders`: more space efficient workshop overlay
+- `gui/family-affairs`: is now an alias that points to `gui/pregnancy`
 
 ## Documentation
 - Lua API document ``dfhack.items.findType(string)`` and ``dfhack.items.findSubtype(string)``

diff --git a/scripts b/scripts
+2 −1		changelog.txt
+0 −29		docs/gui/family-affairs.rst
+17 −3		docs/gui/pregnancy.rst
+0 −263		gui/family-affairs.lua
+384 −199		gui/pregnancy.lua