From 1a19de6ca3b8aaef93aca3bf1ec4a7e39917ebb3 Mon Sep 17 00:00:00 2001
From: Kashargul <144968721+Kashargul@users.noreply.github.com>
Date: Sun, 2 Mar 2025 01:52:57 +0100
Subject: [PATCH] More compat (#17228)
* some more 516 compat
* .
* also we should keep that equal
* fix
* .
* .
* .
* .
* .
* .
* .
---
code/game/machinery/records_scanner.dm | 2 +-
code/game/objects/effects/chem/coating.dm | 3 ---
code/game/objects/items/weapons/inducer_vr.dm | 2 ++
code/game/objects/structures/safe.dm | 2 +-
code/modules/admin/modify_robot.dm | 8 +++----
.../iconforge/batched_spritesheet.dm | 24 +++++++++++--------
.../integrated_electronics/core/tools.dm | 4 ++--
.../hardcode_library/reference/Schnayy.dm | 4 ++--
code/modules/paperwork/paper_bundle.dm | 2 +-
code/modules/vore/eating/living_vr.dm | 2 +-
.../tgui-panel/styles/tgchat/chat-dark.scss | 1 +
.../tgui-panel/styles/tgchat/chat-light.scss | 1 +
.../styles/tgchat/chat-vchatdark.scss | 1 +
.../styles/tgchat/chat-vchatlight.scss | 1 +
14 files changed, 32 insertions(+), 25 deletions(-)
diff --git a/code/game/machinery/records_scanner.dm b/code/game/machinery/records_scanner.dm
index 7015b3b97e..e7fa6f487b 100644
--- a/code/game/machinery/records_scanner.dm
+++ b/code/game/machinery/records_scanner.dm
@@ -60,7 +60,7 @@
qdel(cquery)
*/
var/text = "\
- " span_huge("center>Report") + "
\
+ " span_huge("Report") + "
\
" + span_bold(span_underline("Name")) + " : [mname]\
" + span_bold(span_underline("Age")) + " : [age]\
" + span_bold(span_underline("Sex")) + " : [gender]\
diff --git a/code/game/objects/effects/chem/coating.dm b/code/game/objects/effects/chem/coating.dm
index 0b44a3ea8c..3d18231d80 100644
--- a/code/game/objects/effects/chem/coating.dm
+++ b/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)
diff --git a/code/game/objects/items/weapons/inducer_vr.dm b/code/game/objects/items/weapons/inducer_vr.dm
index e583d38c6b..d4f52cd911 100644
--- a/code/game/objects/items/weapons/inducer_vr.dm
+++ b/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
diff --git a/code/game/objects/structures/safe.dm b/code/game/objects/structures/safe.dm
index e22ec7bbfc..553f3cbbd5 100644
--- a/code/game/objects/structures/safe.dm
+++ b/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)
diff --git a/code/modules/admin/modify_robot.dm b/code/modules/admin/modify_robot.dm
index 247fc50bff..6bf1b642c8 100644
--- a/code/modules/admin/modify_robot.dm
+++ b/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
diff --git a/code/modules/asset_cache/iconforge/batched_spritesheet.dm b/code/modules/asset_cache/iconforge/batched_spritesheet.dm
index ead99a2f8a..09a6abd2d5 100644
--- a/code/modules/asset_cache/iconforge/batched_spritesheet.dm
+++ b/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
diff --git a/code/modules/integrated_electronics/core/tools.dm b/code/modules/integrated_electronics/core/tools.dm
index 0ecb86fff8..f581c03c3c 100644
--- a/code/modules/integrated_electronics/core/tools.dm
+++ b/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"
diff --git a/code/modules/library/hardcode_library/reference/Schnayy.dm b/code/modules/library/hardcode_library/reference/Schnayy.dm
index 48c157a1fb..29a8e01e6b 100644
--- a/code/modules/library/hardcode_library/reference/Schnayy.dm
+++ b/code/modules/library/hardcode_library/reference/Schnayy.dm
@@ -26,8 +26,8 @@ CATEGORY: Reference
Thermodynamic Reactions and Research:
- "} + span_normal("A Guide to Phoron Studies and Safety") + {"
- by I.R.I.S.
+ "} + span_normal("A Guide to Phoron Studies and Safety
by I.R.I.S.") + {"
+