Merge branch 'cmss13-devs:master' into clvendor5

code/modules/asset_cache/asset_list.dm

@@ -353,7 +353,6 @@ GLOBAL_LIST_EMPTY(asset_datums)
 	SHOULD_CALL_PARENT(FALSE)
 	CRASH("generate() not implemented for [type]!")
 
-
 /datum/asset/changelog_item
 	_abstract = /datum/asset/changelog_item
 	var/item_filename

code/modules/asset_cache/assets/sevastopol.dm

@@ -0,0 +1,19 @@
+/datum/asset/simple/namespaced/sevastopol
+	assets = list(
+		"sevastopol_interface.woff2" = file("tgui/packages/sevastopol/sevastopol_interface.woff2"),
+		"sevastopol_interface.ttf" = file("tgui/packages/sevastopol/sevastopol_interface.ttf")
+	)
+	parents = list(
+		"sevastopol.css" = file("tgui/packages/sevastopol/sevastopol.css")
+	)
+
+/datum/asset/simple/namespaced/chakrapetch
+	assets = list(
+		"chakrapetch-bold.woff2" = file("tgui/packages/chakrapetch/chakrapetch-bold.woff2"),
+		"chakrapetch-bold.ttf" = file("tgui/packages/chakrapetch/chakrapetch-bold.ttf"),
+		"chakrapetch-regular.woff2" = file("tgui/packages/chakrapetch/chakrapetch-regular.woff2"),
+		"chakrapetch-regular.ttf" = file("tgui/packages/chakrapetch/chakrapetch-regular.ttf"),
+	)
+	parents = list(
+		"chakrapetch.css" = file("tgui/packages/chakrapetch/chakrapetch.css")
+	)

code/modules/client/client_procs.dm

@@ -388,6 +388,11 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 
 	// Initialize tgui panel
 	stat_panel.initialize(
+		assets = list(
+			get_asset_datum(/datum/asset/simple/namespaced/fontawesome),
+			get_asset_datum(/datum/asset/simple/namespaced/sevastopol),
+			get_asset_datum(/datum/asset/simple/namespaced/chakrapetch),
+		),
 		inline_html = file("html/statbrowser.html"),
 		inline_js = file("html/statbrowser.js"),
 		inline_css = file("html/statbrowser.css"),
@@ -421,7 +426,7 @@ GLOBAL_LIST_INIT(whitelisted_client_procs, list(
 	apply_clickcatcher()
 
 	if(prefs.lastchangelog != GLOB.changelog_hash) //bolds the changelog button on the interface so we know there are updates.
-		winset(src, "infowindow.changelog", "background-color=#ED9F9B;font-style=bold")
+		stat_panel.send_message("changelog_read", FALSE)
 
 	update_fullscreen()
 

code/modules/client/preferences_savefile.dm

@@ -336,6 +336,8 @@
 	var/list/remembered_key_bindings
 	S["remembered_key_bindings"] >> remembered_key_bindings
 
+	S["lastchangelog"] >> lastchangelog
+
 	//Sanitize
 	ooccolor = sanitize_hexcolor(ooccolor, CONFIG_GET(string/ooc_color_default))
 	lastchangelog = sanitize_text(lastchangelog, initial(lastchangelog))
@@ -556,6 +558,8 @@
 
 	S["completed_tutorials"] << tutorial_list_to_savestring()
 
+	S["lastchangelog"] << lastchangelog
+
 	return TRUE
 
 /datum/preferences/proc/load_character(slot)

code/modules/cm_marines/specialist.dm

@@ -13,7 +13,6 @@
 
 // Spec verb macros
 /mob/living/carbon/human/verb/spec_activation_one()
-	set category = "Specialist"
 	set name = "Specialist Activation One"
 	set hidden = TRUE
 
@@ -25,7 +24,6 @@
 			SA.handle_spec_macro()
 
 /mob/living/carbon/human/verb/spec_activation_two()
-	set category = "Specialist"
 	set name = "Specialist Activation Two"
 	set hidden = TRUE
 

code/modules/mob/new_player/login.dm

@@ -35,6 +35,7 @@
 	lobby_window.initialize(
 		assets = list(
 				get_asset_datum(/datum/asset/simple/tgui),
+				get_asset_datum(/datum/asset/simple/namespaced/chakrapetch)
 			)
 	)
 

colonialmarines.dme

@@ -1568,6 +1568,7 @@
 #include "code\modules\asset_cache\assets\icon_ref_map.dm"
 #include "code\modules\asset_cache\assets\lobby.dm"
 #include "code\modules\asset_cache\assets\medals.dm"
+#include "code\modules\asset_cache\assets\sevastopol.dm"
 #include "code\modules\asset_cache\assets\tgfont.dm"
 #include "code\modules\asset_cache\assets\tgui.dm"
 #include "code\modules\asset_cache\assets\vending.dm"

html/changelogs/archive/2025-01.yml

@@ -145,3 +145,13 @@
 2025-01-09:
   AndroBetel:
   - spellcheck: Formatting of M10 auto pistol.
+2025-01-10:
+  FebrezeNinja:
+  - bugfix: Added a missing reference check to flight/ui_act
+  harryob:
+  - rscadd: added client settings to the statbrowser - under the "Options" buttn
+  - ui: added a search bar to the portable crew monitor
+  private-tristan:
+  - bugfix: Neuraline no longer generates in recipes, and is unobtainable from botany.
+  zzzmike:
+  - qol: Adds messaging when larva and host both survive surgery