Merge branch 'master' of https://github.com/Citadel-Station-13/Citadel-Station-13 into update-to-action-buttons

2024-01-07 02:09:58 -03:00
parent 6d7321b0c4 ae557a1df5
commit 003eec1850
45 changed files with 291 additions and 124 deletions
@@ -123,6 +123,8 @@
 #define COLOR_THEME_OPERATIVE "#B8221F"
 #define COLOR_THEME_GLASS "#75A4C4"
 #define COLOR_THEME_CLOCKWORK "#CFBA47"
+#define COLOR_THEME_TRASENKNOX "#3ce375"
+#define COLOR_THEME_DETECTIVE "#c7b08b"

 ///Colors for eigenstates
 #define COLOR_PERIWINKLEE "#9999FF"
@@ -230,3 +230,6 @@
 #define SCRN_OBJ_IN_LIST "list"
 /// In the collapseable palette
 #define SCRN_OBJ_IN_PALETTE "palette"
+
+/// The filter name for the hover outline
+#define HOVER_OUTLINE_FILTER "hover_outline"