Skip to content

Commit

Permalink
Code fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
SuhEugene committed Oct 3, 2023
1 parent 817a53b commit 21a0ac1
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 8 deletions.
2 changes: 1 addition & 1 deletion code/controllers/subsystems/garbage.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
4 changes: 2 additions & 2 deletions code/game/machinery/hologram.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions code/modules/mob/say.dm
Original file line number Diff line number Diff line change
Expand Up @@ -76,15 +76,15 @@
/// 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("(?<!\\\\)[char](.+?)(?<!\\\\)[char]", "g");\
input = varname.Replace_char(input, "<[html]>$1</[html]>")
input = regex_replace_char(varname, input, "<[html]>$1</[html]>")

/// Scans the input sentence for speech emphasis modifiers, notably |italics|, +bold+, and _underline_ -mothblocks
/// Infinity: _italics_ and +bold+
/mob/proc/say_emphasis(input)
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
Expand Down
4 changes: 1 addition & 3 deletions maps/away/verne/verne-2.dmm
Original file line number Diff line number Diff line change
Expand Up @@ -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" = (
Expand Down

0 comments on commit 21a0ac1

Please sign in to comment.