From 21a0ac16c6a59d2e97a86f150e31f7e64a12ad19 Mon Sep 17 00:00:00 2001 From: SuhEugene <32931701+SuhEugene@users.noreply.github.com> Date: Tue, 3 Oct 2023 21:44:45 +0300 Subject: [PATCH] Code fixes --- code/controllers/subsystems/garbage.dm | 2 +- code/game/machinery/hologram.dm | 4 ++-- code/modules/mob/say.dm | 4 ++-- maps/away/verne/verne-2.dmm | 4 +--- 4 files changed, 6 insertions(+), 8 deletions(-) diff --git a/code/controllers/subsystems/garbage.dm b/code/controllers/subsystems/garbage.dm index 1b2c6ecafa..4e4b3202fa 100644 --- a/code/controllers/subsystems/garbage.dm +++ b/code/controllers/subsystems/garbage.dm @@ -503,6 +503,6 @@ SUBSYSTEM_DEF(garbage) else if (islist(I)) var/list/Xlist = X - DoSearchVar(I, "[Xname]\[[Xlist.Find(I)]\] -> list", recursive_limit-1) + DoSearchVar(I, "[Xname]\[[list_find(Xlist, I)]\] -> list", recursive_limit-1) #endif diff --git a/code/game/machinery/hologram.dm b/code/game/machinery/hologram.dm index 599595595a..2b6719adfe 100644 --- a/code/game/machinery/hologram.dm +++ b/code/game/machinery/hologram.dm @@ -255,7 +255,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED hologram.mouse_opacity = 0//So you can't click on it. // hologram.plane = ABOVE_HUMAN_PLANE hologram.layer = ABOVE_HUMAN_LAYER //Above all the other objects/mobs. Or the vast majority of them. - hologram.anchored = 1//So space wind cannot drag it. + hologram.anchored = TRUE//So space wind cannot drag it. hologram.SetName("[user.name] (Hologram)") masters[user] = hologram hologram.set_light(1, 0.1, 2) //hologram lighting @@ -463,7 +463,7 @@ var/const/HOLOPAD_MODE = RANGE_BASED */ /obj/machinery/hologram - anchored = 1 + anchored = TRUE idle_power_usage = 5 active_power_usage = 100 diff --git a/code/modules/mob/say.dm b/code/modules/mob/say.dm index 1fb5f8ef14..9471a94483 100644 --- a/code/modules/mob/say.dm +++ b/code/modules/mob/say.dm @@ -76,7 +76,7 @@ /// Transforms the speech emphasis mods from [/atom/movable/proc/say_emphasis] into the appropriate HTML tags. Includes escaping. #define ENCODE_HTML_EMPHASIS(input, char, html, varname) \ var/static/regex/##varname = regex("(?$1") + input = regex_replace_char(varname, input, "<[html]>$1") /// Scans the input sentence for speech emphasis modifiers, notably |italics|, +bold+, and _underline_ -mothblocks /// Infinity: _italics_ and +bold+ @@ -84,7 +84,7 @@ ENCODE_HTML_EMPHASIS(input, "_", "i", italics) ENCODE_HTML_EMPHASIS(input, "\\+", "b", bold) var/static/regex/remove_escape_backlashes = regex("\\\\(_|\\+)", "g") // Removes backslashes used to escape text modification. - input = remove_escape_backlashes.Replace_char(input, "$1") + input = regex_replace_char(remove_escape_backlashes, input, "$1") return input #undef ENCODE_HTML_EMPHASIS diff --git a/maps/away/verne/verne-2.dmm b/maps/away/verne/verne-2.dmm index b1145583d4..1dfa14231b 100644 --- a/maps/away/verne/verne-2.dmm +++ b/maps/away/verne/verne-2.dmm @@ -1195,9 +1195,7 @@ dir = 4; icon_state = "handrail" }, -/obj/machinery/shipsensors{ - tag = "catfish_shuttle_sensor_external" - }, +/obj/machinery/shipsensors, /turf/simulated/floor/tiled/techfloor/grid, /area/verne/catfish/engineering) "ev" = (