More compat (#17228)

* some more 516 compat

* .

* also we should keep that equal

* fix

* .

* .

* .

* .

* .

* .

* .

code/game/machinery/records_scanner.dm

@@ -60,7 +60,7 @@
 	qdel(cquery)
 	*/
 	var/text = "\
-	" span_huge("center>Report</center>") + "<br>\
+	" span_huge("<center>Report</center>") + "<br>\
 	" + span_bold(span_underline("Name")) + " : [mname]\
 	" + span_bold(span_underline("Age")) + " : [age]\
 	" + span_bold(span_underline("Sex")) + " : [gender]\

code/game/objects/effects/chem/coating.dm

@@ -7,10 +7,7 @@
 	icon_state = "dirt"
 
 /obj/effect/decal/cleanable/chemcoating/Initialize()
-	. = ..()
 	create_reagents(100)
-
-/obj/effect/decal/cleanable/chemcoating/Initialize()
 	. = ..()
 	var/turf/T = get_turf(src)
 	if(T)

code/game/objects/items/weapons/inducer_vr.dm

@@ -258,6 +258,8 @@
 	var/mob/living/carbon/human/hume
 
 /obj/item/cell/standin/Initialize(mapload, var/mob/living/carbon/human/H)
+	if(!istype(H))
+		return INITIALIZE_HINT_QDEL
 	. = ..()
 	hume = H
 	charge = H.nutrition

code/game/objects/structures/safe.dm

@@ -139,7 +139,7 @@ FLOOR SAFES
 		return
 
 	if(href_list["retrieve"])
-		user << browse("", "window=safe") // Close the menu
+		user << browse(null, "window=safe") // Close the menu
 
 		var/obj/item/P = locate(href_list["retrieve"]) in src
 		if(open)

code/modules/admin/modify_robot.dm

@@ -1,7 +1,7 @@
 /client/proc/modify_robot(var/mob/living/silicon/robot/target in silicon_mob_list)
 	set name = "Modify Robot"
 	set desc = "Allows to add or remove modules to/from robots."
-	set category = "Admin"
+	set category = "Admin.Silicon"
 	if(!check_rights(R_ADMIN|R_FUN|R_VAREDIT|R_EVENT))
 		return
 
@@ -13,7 +13,7 @@
 /datum/eventkit/modify_robot
 	var/mob/living/silicon/robot/target
 	var/mob/living/silicon/robot/source
-	var/mob/living/silicon/ai/selected_ai
+	var/selected_ai
 	var/ion_law	= "IonLaw"
 	var/zeroth_law = "ZerothLaw"
 	var/inherent_law = "InherentLaw"
@@ -144,7 +144,7 @@
 			continue
 		active_ais += list(list("displayText" = "[ai]", "value" = "\ref[ai]"))
 	.["active_ais"] = active_ais
-	.["selected_ai"] = selected_ai ? selected_ai.name : null
+	.["selected_ai"] = selected_ai ? selected_ai : null
 
 	var/list/channels = list()
 	for(var/ch_name in target.law_channels())
@@ -785,4 +785,4 @@
 	return (is_admin(user) && !target.is_slaved()) || is_special_role(user)
 
 /datum/eventkit/modify_robot/proc/is_special_role(var/mob/user)
-	return user.mind.special_role ? TRUE : FALSE
+	return user.mind?.special_role ? TRUE : FALSE

code/modules/asset_cache/iconforge/batched_spritesheet.dm

@@ -3,8 +3,8 @@
 #define CACHE_WAIT "wait"
 #define CACHE_INVALID TRUE
 #define CACHE_VALID FALSE
-
-#define WHATTHEFUCKAMIDOING_FILE "data/WHATTHEFUCKFILE.json"
+/// This is used to invalidate the cache if something changes on the DM side. For example, if the CSS generator was changed.
+#define SPRITESHEET_SYSTEM_VERSION 1
 
 /datum/asset/spritesheet_batched
 	_abstract = /datum/asset/spritesheet_batched
@@ -78,6 +78,14 @@
 		if(cached_rustg_version != rustg_version)
 			log_asset("Invalidated cache for spritesheet_[name] due to rustg updating from [cached_rustg_version] to [rustg_version].")
 			return CACHE_INVALID
+		// Invalidate cache if the DM version changes
+		var/cached_dm_version = cache_json["dm_version"]
+		if(isnull(cached_dm_version))
+			log_asset("Cache for spritesheet_[name] did not contain a dm_version!")
+			return CACHE_INVALID
+		if(cached_dm_version != SPRITESHEET_SYSTEM_VERSION)
+			log_asset("Invalidated cache for spritesheet_[name] due to DM spritesheet system updating from [cached_dm_version] to [SPRITESHEET_SYSTEM_VERSION].")
+			return CACHE_INVALID
 		cache_sizes_data = cache_json["sizes"]
 		cache_sprites_data = cache_json["sprites"]
 		cache_input_hash = cache_json["input_hash"]
@@ -180,10 +188,6 @@
 	// Remove the cache, since it's invalid if we get to this point.
 	fdel("[ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY]/spritesheet_cache.[name].json")
 
-	if(!fexists(ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY))
-		rustg_file_write("stub", "[ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY]/stub.txt")
-		fdel("[ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY]/stub.txt")
-
 	var/do_cache = CONFIG_GET(flag/smart_cache_assets) || force_cache
 	var/data_out
 	if(yield || !isnull(job_id))
@@ -262,7 +266,7 @@
 		var/size_split = splittext(size_id, "x")
 		var/width = text2num(size_split[1])
 		var/height = text2num(size_split[2])
-		out += ".[name][size_id]{display:inline-block;width:[width]px;height:[height]px;background:url('[get_background_url("[name]_[size_id].png")]') no-repeat;}"
+		out += ".[name][size_id]{display:inline-block;width:[width]px;height:[height]px;background-image:url('[get_background_url("[name]_[size_id].png")]');background-repeat: no-repeat;}"
 
 	for (var/sprite_id in sprites)
 		var/sprite = sprites[sprite_id]
@@ -309,7 +313,8 @@
 		"dmi_hashes" = dmi_hashes,
 		"sizes" = sizes,
 		"sprites" = sprites,
-		"rustg_version" = rustg_get_version()
+		"rustg_version" = rustg_get_version(),
+		"dm_version" = SPRITESHEET_SYSTEM_VERSION,
 	)
 	rustg_file_write(json_encode(cache_data), "[ASSET_CROSS_ROUND_SMART_CACHE_DIRECTORY]/spritesheet_cache.[name].json")
 
@@ -356,5 +361,4 @@
 #undef CACHE_WAIT
 #undef CACHE_INVALID
 #undef CACHE_VALID
-
-#undef WHATTHEFUCKAMIDOING_FILE
+#undef SPRITESHEET_SYSTEM_VERSION

code/modules/integrated_electronics/core/tools.dm

@@ -276,7 +276,6 @@
 		)
 
 /obj/item/storage/bag/circuits/basic/Initialize(mapload)
-	. = ..()
 	new /obj/item/storage/bag/circuits/mini/arithmetic(src)
 	new /obj/item/storage/bag/circuits/mini/trig(src)
 	new /obj/item/storage/bag/circuits/mini/input(src)
@@ -295,9 +294,9 @@
 	new /obj/item/tool/screwdriver(src)
 	new /obj/item/tool/crowbar(src)
 	make_exact_fit()
+	. = ..()
 
 /obj/item/storage/bag/circuits/all/Initialize()
-	. = ..()
 	new /obj/item/storage/bag/circuits/mini/arithmetic/all(src)
 	new /obj/item/storage/bag/circuits/mini/trig/all(src)
 	new /obj/item/storage/bag/circuits/mini/input/all(src)
@@ -320,6 +319,7 @@
 	new /obj/item/integrated_electronics/debugger(src)
 	new /obj/item/tool/crowbar(src)
 	make_exact_fit()
+	. = ..()
 
 /obj/item/storage/bag/circuits/mini
 	name = "circuit box"

code/modules/library/hardcode_library/reference/Schnayy.dm

@@ -26,8 +26,8 @@ CATEGORY: Reference
 					<br><br><br>
 					<center>
 					<h1><br>Thermodynamic Reactions and Research:<br>
-					"} + span_normal("A Guide to Phoron Studies and Safety") + {"<br>
-					by I.R.I.S.</font><br><br></h1>
+					"} + span_normal("A Guide to Phoron Studies and Safety<br>by I.R.I.S.") + {"
+					<br><br></h1>
 					</center>
 					</body>
 					</html>

code/modules/paperwork/paper_bundle.dm

@@ -49,7 +49,7 @@
 		if(istype(W, /obj/item/tape_roll))
 			return 0
 		if(istype(W, /obj/item/pen))
-			user << browse("", "window=[name]") //Closes the dialog
+			user << browse(null, "window=[name]") //Closes the dialog
 		var/obj/P = pages[page]
 		P.attackby(W, user)
 

code/modules/vore/eating/living_vr.dm

@@ -454,7 +454,7 @@
 //
 // Clearly super important. Obviously.
 //
-/mob/living/proc/lick(mob/living/tasted in living_mobs_in_view(1))
+/mob/living/proc/lick(mob/living/tasted in living_mobs_in_view(1, TRUE))
 	set name = "Lick"
 	set category = "IC.Game"
 	set desc = "Lick someone nearby!"

tgui/packages/tgui-panel/styles/tgchat/chat-dark.scss

@@ -21,6 +21,7 @@ img {
 img.icon {
   height: 1em;
   min-height: 16px;
+  min-width: 16px;
   width: auto;
   vertical-align: bottom;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-light.scss

@@ -39,6 +39,7 @@ img {
 img.icon {
   height: 1em;
   min-height: 16px;
+  min-width: 16px;
   width: auto;
   vertical-align: bottom;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-vchatdark.scss

@@ -21,6 +21,7 @@ img {
 img.icon {
   height: 1em;
   min-height: 16px;
+  min-width: 16px;
   width: auto;
   vertical-align: bottom;
 }

tgui/packages/tgui-panel/styles/tgchat/chat-vchatlight.scss

@@ -39,6 +39,7 @@ img {
 img.icon {
   height: 1em;
   min-height: 16px;
+  min-width: 16px;
   width: auto;
   vertical-align: bottom;
 }