diff --git a/code/game/objects/items/weapons/storage/business_card.dm b/code/game/objects/items/weapons/storage/business_card.dm index a030d0289fc..8fa37657b44 100644 --- a/code/game/objects/items/weapons/storage/business_card.dm +++ b/code/game/objects/items/weapons/storage/business_card.dm @@ -66,7 +66,7 @@ /obj/item/paper/business_card/show_content(mob/user, forceshow) var/datum/browser/paper_win = new(user, name, null, 525, 300, null, TRUE) - paper_win.set_content(get_content(user, can_read(user, forceshow))) + paper_win.set_content(get_content(user, can_read(user, forceshow), forceshow)) paper_win.add_stylesheet("paper_languages", 'html/browser/paper_languages.css') paper_win.open() diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 6df1ae160c5..184181cbb50 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -143,7 +143,7 @@ /obj/item/paper/proc/show_content(mob/user, forceshow) simple_asset_ensure_is_sent(user, /datum/asset/simple/paper) var/datum/browser/paper_win = new(user, name, null, 450, 500, null, TRUE) - paper_win.set_content(get_content(user, can_read(user, forceshow))) + paper_win.set_content(get_content(user, can_read(user, forceshow), forceshow)) paper_win.add_stylesheet("paper_languages", 'html/browser/paper_languages.css') paper_win.open() @@ -154,8 +154,8 @@ can_read = get_dist(src, AI.camera) < 2 return can_read -/obj/item/paper/proc/get_content(var/mob/user, var/can_read = TRUE) - return "[capitalize_first_letters(name)][can_read ? parse_languages(user, info) : stars(info)][stamps]" +/obj/item/paper/proc/get_content(var/mob/user, var/can_read = TRUE, var/ignore_languages = FALSE) + return "[capitalize_first_letters(name)][can_read ? parse_languages(user, info, FALSE, ignore_languages) : stars(info)][stamps]" /obj/item/paper/verb/rename() set name = "Rename paper" @@ -474,7 +474,7 @@ * @return An HTML string where all of the [lang][/lang] marker contents are replaced * with scrambled and properly fonted content depending on what languages the user knows. */ -/obj/item/paper/proc/parse_languages(mob/user, input, language_check = FALSE) +/obj/item/paper/proc/parse_languages(mob/user, input, language_check = FALSE, ignore_languages = FALSE) // Just a safety fallback. if (!user) return input @@ -492,7 +492,7 @@ continue var/content = written_lang_regex.group[3] - var/reader_understands = user.say_understands(null, L) + var/reader_understands = ignore_languages || user.say_understands(null, L) // Replace the content with

content here

if(!reader_understands) diff --git a/html/changelogs/hellfirejag-ccia-universal-translator.yml b/html/changelogs/hellfirejag-ccia-universal-translator.yml new file mode 100644 index 00000000000..a8a445ac609 --- /dev/null +++ b/html/changelogs/hellfirejag-ccia-universal-translator.yml @@ -0,0 +1,4 @@ +author: Hellfirejag +delete-after: True +changes: + - bugfix: "Admins and CCIAA now have a universal translator for faxes, letting them read any fax via admin command, regardless of language markings used."