Merge branch 'master' of github.com:Monkestation/Monkestation2.0 into websocket-server

Author: Absolucy

_maps/map_files/BoxStation/BoxStation.dmm

@@ -8,3 +8,4 @@
 #define DOAFTER_SOURCE_PLANTING_DEVICE "doafter_planting_device"
 #define DOAFTER_SOURCE_CHARGE_GUNCRANK "doafter_charge_guncrank"
 #define DOAFTER_SOURCE_SEED_MESH "doafter_seed_mesh"
+#define DOAFTER_SOURCE_ATM "doafter_atm"

code/__DEFINES/do_afters.dm

@@ -179,6 +179,27 @@
 /proc/rustg_git_commit_date_head(format = "%F")
 	return RUSTG_CALL(RUST_G, "rg_git_commit_date_head")(format)
 
+#define rustg_hash_string(algorithm, text) RUSTG_CALL(RUST_G, "hash_string")(algorithm, text)
+#define rustg_hash_file(algorithm, fname) RUSTG_CALL(RUST_G, "hash_file")(algorithm, fname)
+#define rustg_hash_generate_totp(seed) RUSTG_CALL(RUST_G, "generate_totp")(seed)
+#define rustg_hash_generate_totp_tolerance(seed, tolerance) RUSTG_CALL(RUST_G, "generate_totp_tolerance")(seed, tolerance)
+
+#define RUSTG_HASH_MD5 "md5"
+#define RUSTG_HASH_SHA1 "sha1"
+#define RUSTG_HASH_SHA256 "sha256"
+#define RUSTG_HASH_SHA512 "sha512"
+#define RUSTG_HASH_XXH64 "xxh64"
+#define RUSTG_HASH_BASE64 "base64"
+
+/// Encode a given string into base64
+#define rustg_encode_base64(str) rustg_hash_string(RUSTG_HASH_BASE64, str)
+/// Decode a given base64 string
+#define rustg_decode_base64(str) RUSTG_CALL(RUST_G, "decode_base64")(str)
+
+#ifdef RUSTG_OVERRIDE_BUILTINS
+	#define md5(thing) (isfile(thing) ? rustg_hash_file(RUSTG_HASH_MD5, "[thing]") : rustg_hash_string(RUSTG_HASH_MD5, thing))
+#endif
+
 #define RUSTG_HTTP_METHOD_GET "get"
 #define RUSTG_HTTP_METHOD_PUT "put"
 #define RUSTG_HTTP_METHOD_DELETE "delete"
@@ -189,6 +210,80 @@
 #define rustg_http_request_async(method, url, body, headers, options) RUSTG_CALL(RUST_G, "http_request_async")(method, url, body, headers, options)
 #define rustg_http_check_request(req_id) RUSTG_CALL(RUST_G, "http_check_request")(req_id)
 
+/// Generates a spritesheet at: [file_path][spritesheet_name]_[size_id].png
+/// The resulting spritesheet arranges icons in a random order, with the position being denoted in the "sprites" return value.
+/// All icons have the same y coordinate, and their x coordinate is equal to `icon_width * position`.
+///
+/// hash_icons is a boolean (0 or 1), and determines if the generator will spend time creating hashes for the output field dmi_hashes.
+/// These hashes can be heplful for 'smart' caching (see rustg_iconforge_cache_valid), but require extra computation.
+///
+/// Spritesheet will contain all sprites listed within "sprites".
+/// "sprites" format:
+/// list(
+///     "sprite_name" = list( // <--- this list is a [SPRITE_OBJECT]
+///         icon_file = 'icons/path_to/an_icon.dmi',
+///         icon_state = "some_icon_state",
+///         dir = SOUTH,
+///         frame = 1,
+///         transform = list([TRANSFORM_OBJECT], ...)
+///     ),
+///     ...,
+/// )
+/// TRANSFORM_OBJECT format:
+/// list("type" = RUSTG_ICONFORGE_BLEND_COLOR, "color" = "#ff0000", "blend_mode" = ICON_MULTIPLY)
+/// list("type" = RUSTG_ICONFORGE_BLEND_ICON, "icon" = [SPRITE_OBJECT], "blend_mode" = ICON_OVERLAY)
+/// list("type" = RUSTG_ICONFORGE_SCALE, "width" = 32, "height" = 32)
+/// list("type" = RUSTG_ICONFORGE_CROP, "x1" = 1, "y1" = 1, "x2" = 32, "y2" = 32) // (BYOND icons index from 1,1 to the upper bound, inclusive)
+///
+/// Returns a SpritesheetResult as JSON, containing fields:
+/// list(
+///     "sizes" = list("32x32", "64x64", ...),
+///     "sprites" = list("sprite_name" = list("size_id" = "32x32", "position" = 0), ...),
+///     "dmi_hashes" = list("icons/path_to/an_icon.dmi" = "d6325c5b4304fb03", ...),
+///     "sprites_hash" = "a2015e5ff403fb5c", // This is the xxh64 hash of the INPUT field "sprites".
+///     "error" = "[A string, empty if there were no errors.]"
+/// )
+/// In the case of an unrecoverable panic from within Rust, this function ONLY returns a string containing the error.
+#define rustg_iconforge_generate(file_path, spritesheet_name, sprites, hash_icons) RUSTG_CALL(RUST_G, "iconforge_generate")(file_path, spritesheet_name, sprites, "[hash_icons]")
+/// Returns a job_id for use with rustg_iconforge_check()
+#define rustg_iconforge_generate_async(file_path, spritesheet_name, sprites, hash_icons) RUSTG_CALL(RUST_G, "iconforge_generate_async")(file_path, spritesheet_name, sprites, "[hash_icons]")
+/// Returns the status of an async job_id, or its result if it is completed. See RUSTG_JOB DEFINEs.
+#define rustg_iconforge_check(job_id) RUSTG_CALL(RUST_G, "iconforge_check")("[job_id]")
+/// Clears all cached DMIs and images, freeing up memory.
+/// This should be used after spritesheets are done being generated.
+#define rustg_iconforge_cleanup RUSTG_CALL(RUST_G, "iconforge_cleanup")
+/// Takes in a set of hashes, generate inputs, and DMI filepaths, and compares them to determine cache validity.
+/// input_hash: xxh64 hash of "sprites" from the cache.
+/// dmi_hashes: xxh64 hashes of the DMIs in a spritesheet, given by `rustg_iconforge_generate` with `hash_icons` enabled. From the cache.
+/// sprites: The new input that will be passed to rustg_iconforge_generate().
+/// Returns a CacheResult with the following structure: list(
+///     "result": "1" (if cache is valid) or "0" (if cache is invalid)
+///     "fail_reason": "" (emtpy string if valid, otherwise a string containing the invalidation reason or an error with ERROR: prefixed.)
+/// )
+/// In the case of an unrecoverable panic from within Rust, this function ONLY returns a string containing the error.
+#define rustg_iconforge_cache_valid(input_hash, dmi_hashes, sprites) RUSTG_CALL(RUST_G, "iconforge_cache_valid")(input_hash, dmi_hashes, sprites)
+/// Returns a job_id for use with rustg_iconforge_check()
+#define rustg_iconforge_cache_valid_async(input_hash, dmi_hashes, sprites) RUSTG_CALL(RUST_G, "iconforge_cache_valid_async")(input_hash, dmi_hashes, sprites)
+/// Provided a /datum/greyscale_config typepath, JSON string containing the greyscale config, and path to a DMI file containing the base icons,
+/// Loads that config into memory for later use by rustg_iconforge_gags(). The config_path is the unique identifier used later.
+/// JSON Config schema: https://hackmd.io/@tgstation/GAGS-Layer-Types
+/// Unsupported features: color_matrix layer type, 'or' blend_mode. May not have BYOND parity with animated icons or varying dirs between layers.
+/// Returns "OK" if successful, otherwise, returns a string containing the error.
+#define rustg_iconforge_load_gags_config(config_path, config_json, config_icon_path) RUSTG_CALL(RUST_G, "iconforge_load_gags_config")("[config_path]", config_json, config_icon_path)
+/// Given a config_path (previously loaded by rustg_iconforge_load_gags_config), and a string of hex colors formatted as "#ff00ff#ffaa00"
+/// Outputs a DMI containing all of the states within the config JSON to output_dmi_path, creating any directories leading up to it if necessary.
+/// Returns "OK" if successful, otherwise, returns a string containing the error.
+#define rustg_iconforge_gags(config_path, colors, output_dmi_path) RUSTG_CALL(RUST_G, "iconforge_gags")("[config_path]", colors, output_dmi_path)
+/// Returns a job_id for use with rustg_iconforge_check()
+#define rustg_iconforge_load_gags_config_async(config_path, config_json, config_icon_path) RUSTG_CALL(RUST_G, "iconforge_load_gags_config_async")("[config_path]", config_json, config_icon_path)
+/// Returns a job_id for use with rustg_iconforge_check()
+#define rustg_iconforge_gags_async(config_path, colors, output_dmi_path) RUSTG_CALL(RUST_G, "iconforge_gags_async")("[config_path]", colors, output_dmi_path)
+
+#define RUSTG_ICONFORGE_BLEND_COLOR "BlendColor"
+#define RUSTG_ICONFORGE_BLEND_ICON "BlendIcon"
+#define RUSTG_ICONFORGE_CROP "Crop"
+#define RUSTG_ICONFORGE_SCALE "Scale"
+
 #define RUSTG_JOB_NO_RESULTS_YET "NO RESULTS YET"
 #define RUSTG_JOB_NO_SUCH_JOB "NO SUCH JOB"
 #define RUSTG_JOB_ERROR "JOB PANICKED"

code/__DEFINES/rust_g.dm

@@ -197,7 +197,10 @@ GLOBAL_PROTECT(href_token)
 	if (!SSdbcore.IsConnected())
 		return null
 
-	var/datum/db_query/feedback_query = SSdbcore.NewQuery("SELECT feedback FROM [format_table_name("admin")] WHERE ckey = '[owner.ckey]'")
+	var/datum/db_query/feedback_query = SSdbcore.NewQuery(
+		"SELECT feedback FROM [format_table_name("admin")] WHERE ckey = :ckey",
+		list("ckey" = owner.ckey)
+	)
 
 	if(!feedback_query.Execute())
 		log_sql("Error retrieving feedback link for [src]")

code/modules/admin/holder2.dm

@@ -71,7 +71,8 @@
 
 /obj/machinery/component_printer/ui_assets(mob/user)
 	return list(
-		get_asset_datum(/datum/asset/spritesheet/sheetmaterials)
+		get_asset_datum(/datum/asset/spritesheet/sheetmaterials),
+		get_asset_datum(/datum/asset/spritesheet/research_designs)
 	)
 
 /obj/machinery/component_printer/proc/calculate_efficiency()

code/modules/wiremod/core/component_printer.dm

@@ -8,7 +8,7 @@ export BYOND_MAJOR=515
 export BYOND_MINOR=1647
 
 #rust_g git tag
-export RUST_G_VERSION=3.5.1
+export RUST_G_VERSION=3.6.0
 
 #node version
 export NODE_VERSION_LTS=22.11.0

dependencies.sh

@@ -0,0 +1,4 @@
+author: "Absolucy"
+delete-after: True
+changes:
+  - bugfix: "Fixed the monkecoin dupe exploit some more."

html/changelogs/AutoChangeLog-pr-5728.yml

@@ -0,0 +1,4 @@
+author: "Absolucy, Aylong"
+delete-after: True
+changes:
+  - bugfix: "Fixed random chat BSOD on Byond 516"

html/changelogs/AutoChangeLog-pr-5742.yml

@@ -78,3 +78,18 @@
   Veth-s:
   - admin: You can now choose unholy as an option in select equipment, spawning you
       from hell instead.
+2025-03-03:
+  Absolucy:
+  - bugfix: Prevent stacking ATM interactions to potentially dupe monkecoins.
+  MichiRecRoom:
+  - bugfix: The component printer now shows icons for the items in its UI.
+  The-Black-Screen:
+  - map: added light switches and wall mounted radios to more areas / fixed a disposal
+      pipe junction in engineering storage / modified the hydroponics, northeast solar
+      array, ranch, ship breaking hut, and western maintenance areas / removed lattices
+      at the arrivals shuttle dock / miscellaneous things.
+  Thedragmeme:
+  - rscadd: Adds a bunch of new items in various categories available to buy via monkey
+      coin in the loadout menu
+  adamsong:
+  - rscdel: Removed doubled text from syndicate listening post job description

html/changelogs/AutoChangeLog-pr-5758.yml

@@ -20,7 +20,10 @@
 	if(!ckey || !SSdbcore.IsConnected())
 		metacoins = 5000
 		return
-	var/datum/db_query/query_get_metacoins = SSdbcore.NewQuery("SELECT metacoins FROM [format_table_name("player")] WHERE ckey = '[ckey]'")
+	var/datum/db_query/query_get_metacoins = SSdbcore.NewQuery(
+		"SELECT metacoins FROM [format_table_name("player")] WHERE ckey = :ckey",
+		list("ckey" = ckey)
+	)
 	var/mc_count = 0
 	if(query_get_metacoins.warn_execute())
 		if(query_get_metacoins.NextRow())
@@ -67,8 +70,13 @@
 	logger.Log(LOG_CATEGORY_META, "[parent]'s monkecoins were changed by [amount] Reason: [reason]", list("currency_left" = metacoins, "reason" = reason))
 
 	//SQL query - updates the metacoins in the database (this is where the storage actually happens)
-	var/datum/db_query/query_inc_metacoins = SSdbcore.NewQuery("UPDATE [format_table_name("player")] SET metacoins = metacoins + '[amount]' WHERE ckey = '[ckey]'")
-	query_inc_metacoins.warn_execute()
+	var/datum/db_query/query_inc_metacoins = SSdbcore.NewQuery(
+		"UPDATE [format_table_name("player")] SET metacoins = metacoins + :amount WHERE ckey = :ckey",
+		list("amount" = amount, "ckey" = ckey)
+	)
+	if(!query_inc_metacoins.warn_execute())
+		qdel(query_inc_metacoins)
+		return FALSE
 	qdel(query_inc_metacoins)
 
 	//Output to chat

html/changelogs/AutoChangeLog-pr-5760.yml

@@ -179,7 +179,10 @@ SUBSYSTEM_DEF(overwatch)
 	if(!CheckDBCon())
 		return
 
-	var/datum/db_query/query = SSdbcore.NewQuery("SELECT ckey FROM overwatch_whitelist WHERE ckey = '[ckey]'")
+	var/datum/db_query/query = SSdbcore.NewQuery(
+		"SELECT ckey FROM overwatch_whitelist WHERE ckey = :ckey",
+		list("ckey" = ckey)
+	)
 	query.Execute()
 
 	if(query.NextRow())

html/changelogs/archive/2025-03.yml

@@ -4,8 +4,6 @@
 	var/vision_range = 9
 	/// Blackboard key for aggro range, uses vision range if not specified
 	var/aggro_range_key = BB_AGGRO_RANGE
-	/// Static typecache list of potentially dangerous objs
-	var/static/list/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/vehicle/sealed/mecha))
 	///our max size
 	var/checks_size = FALSE
 
@@ -27,9 +25,9 @@
 	controller.clear_blackboard_key(target_key)
 	var/list/potential_targets = hearers(aggro_range, controller.pawn) - living_mob //Remove self, so we don't suicide
 
-	for(var/HM in typecache_filter_list(range(aggro_range, living_mob), hostile_machines)) //Can we see any hostile machines?
-		if(can_see(living_mob, HM, aggro_range))
-			potential_targets += HM
+	for(var/atom/hostile_machine as anything in GLOB.hostile_machines) //Can we see any hostile machines?
+		if (can_see(living_mob, hostile_machine, aggro_range))
+			potential_targets += hostile_machine
 
 	if(!potential_targets.len)
 		finish_action(controller, succeeded = FALSE)

monkestation/code/modules/client/preferences/inventory.dm

@@ -4,8 +4,6 @@
 	var/vision_range = 9
 	/// Blackboard key for aggro range, uses vision range if not specified
 	var/aggro_range_key = BB_AGGRO_RANGE
-	/// Static typecache list of potentially dangerous objs
-	var/static/list/hostile_machines = typecacheof(list(/obj/machinery/porta_turret, /obj/vehicle/sealed/mecha))
 
 /datum/ai_behavior/find_potential_targets_with_item/perform(seconds_per_tick, datum/ai_controller/controller, target_key, targeting_strategy_key, hiding_location_key, scared_item_key)
 	. = ..()
@@ -26,9 +24,9 @@
 	controller.clear_blackboard_key(target_key)
 	var/list/potential_targets = hearers(aggro_range, controller.pawn) - living_mob //Remove self, so we don't suicide
 
-	for(var/HM in typecache_filter_list(range(aggro_range, living_mob), hostile_machines)) //Can we see any hostile machines?
-		if(can_see(living_mob, HM, aggro_range))
-			potential_targets += HM
+	for(var/atom/hostile_machine as anything in GLOB.hostile_machines) //Can we see any hostile machines?
+		if (can_see(living_mob, hostile_machine, aggro_range))
+			potential_targets += hostile_machine
 
 	if(!potential_targets.len)
 		finish_action(controller, succeeded = FALSE)

monkestation/code/modules/overwatch/subsystem.dm

@@ -188,40 +188,45 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/machinery/atm, 30)
 
 /obj/machinery/atm/attacked_by(obj/item/attacking_item, mob/living/user)
 	. = ..()
-	if(do_after(user, 1 SECONDS, src))
-		if(istype(attacking_item, /obj/item/stack/monkecoin))
-			var/obj/item/stack/monkecoin/attacked_coins = attacking_item
-			if(!user.client.prefs.adjust_metacoins(user.client.ckey, attacked_coins.amount, donator_multipler = FALSE))
-				say("Error acceptings coins, please try again later.")
-				return
-			qdel(attacked_coins)
-			say("Coins deposited to your account, have a nice day.")
-
-		if(attacking_item in subtypesof(/obj/item/stack/spacecash))
-			var/obj/item/stack/spacecash/attacked_cash = attacking_item
-			var/obj/item/user_id = user.get_item_by_slot(ITEM_SLOT_ID)
-			if(user_id && istype(user_id, /obj/item/card/id))
-				var/obj/item/card/id/id_card = user_id.GetID()
-				id_card.registered_account.account_balance += attacked_cash.get_item_credit_value()
-			else
-				if(ishuman(user))
-					var/mob/living/carbon/human/human_user = user
-					var/datum/bank_account/user_account = SSeconomy.bank_accounts_by_id["[human_user.account_id]"]
-					user_account.account_balance += attacked_cash.get_item_credit_value()
-			qdel(attacked_cash)
-
-		else if(istype(attacking_item, /obj/item/holochip))
-			var/obj/item/holochip/attacked_chip = attacking_item
-			var/obj/item/user_id = user.get_item_by_slot(ITEM_SLOT_ID)
-			if(user_id && istype(user_id, /obj/item/card/id))
-				var/obj/item/card/id/id_card = user_id.GetID()
-				id_card.registered_account.account_balance += attacked_chip.credits
-			else
-				if(ishuman(user))
-					var/mob/living/carbon/human/human_user = user
-					var/datum/bank_account/user_account = SSeconomy.bank_accounts_by_id["[human_user.account_id]"]
-					user_account.account_balance += attacked_chip.credits
-			qdel(attacked_chip)
+	if(QDELETED(user) || QDELETED(attacking_item) || DOING_INTERACTION(user, DOAFTER_SOURCE_ATM))
+		return
+	if(!do_after(user, 1 SECONDS, src, interaction_key = DOAFTER_SOURCE_ATM))
+		return
+	if(QDELETED(user) || QDELETED(attacking_item) || DOING_INTERACTION(user, DOAFTER_SOURCE_ATM))
+		return
+	if(istype(attacking_item, /obj/item/stack/monkecoin))
+		var/obj/item/stack/monkecoin/attacked_coins = attacking_item
+		if(!user.client.prefs.adjust_metacoins(user.client.ckey, attacked_coins.amount, donator_multipler = FALSE))
+			say("Error accepting coins, please try again later.")
+			return
+		qdel(attacked_coins)
+		say("Coins deposited to your account, have a nice day.")
+
+	else if(istype(attacking_item, /obj/item/stack/spacecash))
+		var/obj/item/stack/spacecash/attacked_cash = attacking_item
+		var/obj/item/user_id = user.get_item_by_slot(ITEM_SLOT_ID)
+		if(user_id && istype(user_id, /obj/item/card/id))
+			var/obj/item/card/id/id_card = user_id.GetID()
+			id_card.registered_account.account_balance += attacked_cash.get_item_credit_value()
+		else
+			if(ishuman(user))
+				var/mob/living/carbon/human/human_user = user
+				var/datum/bank_account/user_account = SSeconomy.bank_accounts_by_id["[human_user.account_id]"]
+				user_account.account_balance += attacked_cash.get_item_credit_value()
+		qdel(attacked_cash)
+
+	else if(istype(attacking_item, /obj/item/holochip))
+		var/obj/item/holochip/attacked_chip = attacking_item
+		var/obj/item/user_id = user.get_item_by_slot(ITEM_SLOT_ID)
+		if(user_id && istype(user_id, /obj/item/card/id))
+			var/obj/item/card/id/id_card = user_id.GetID()
+			id_card.registered_account.account_balance += attacked_chip.credits
+		else
+			if(ishuman(user))
+				var/mob/living/carbon/human/human_user = user
+				var/datum/bank_account/user_account = SSeconomy.bank_accounts_by_id["[human_user.account_id]"]
+				user_account.account_balance += attacked_chip.credits
+		qdel(attacked_chip)
 
 /obj/machinery/atm/proc/withdraw_cash()
 	var/mob/living/living_mob = usr

monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/find_target_without_trait.dm

@@ -81,7 +81,9 @@ const handleImageError = (e) => {
   setTimeout(() => {
     /** @type {HTMLImageElement} */
     const node = e.target;
-    if (!node) return;
+    if (!node) {
+      return;
+    }
     const attempts = parseInt(node.getAttribute('data-reload-n'), 10) || 0;
     if (attempts >= IMAGE_RETRY_LIMIT) {
       logger.error(`failed to load an image after ${attempts} attempts`);

monkestation/code/modules/slimecore/mobs/ai_controller/behaviours/flee_from_item.dm

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