Skip to content

Commit

Permalink
NON MODULAR CRINGE: utf8 (#309)
Browse files Browse the repository at this point in the history 
<!-- Пишите **НИЖЕ** заголовков и **ВЫШЕ** комментариев, иначе что то
может пойти не так. -->
<!-- Вы можете прочитать Contributing.MD, если хотите узнать больше. -->

## Что этот PR делает
Кринж пиздец, ну а че делать
<!-- Вкратце опишите изменения, которые вносите. -->
<!-- Опишите **все** изменения, так как противное может сказаться на
рассмотрении этого PR'а! -->
<!-- Если вы исправляете Issue, добавьте "Fixes #1234" (где 1234 - номер
Issue) где-нибудь в описании PR'а. Это автоматически закроет Issue после
принятия PR'а. -->

## Почему это хорошо для игры

<!-- Опишите, почему, по вашему, следует добавить эти изменения в игру.
-->

## Изображения изменений
<!-- Если вы не меняли карту или спрайты, можете опустить эту секцию.
Если хотите, можете вставить видео. -->

## Тестирование
<!-- Как вы тестировали свой PR, если делали это вовсе? -->

## Changelog

:cl:
fix: Кодировка в некоторых меню
/:cl:

<!-- Оба :cl:'а должны быть на месте, что-бы чейнджлог работал! Вы
можете написать свой ник справа от первого :cl:, если хотите. Иначе
будет использован ваш ник на ГитХабе. -->
<!-- Вы можете использовать несколько записей с одинаковым префиксом
(Они используются только для иконки в игре) и удалить ненужные. Помните,
что чейнджлог должен быть понятен обычным игроком. -->
<!-- Если чейнджлог не влияет на игроков(например, это рефактор), вы
можете исключить всю секцию. -->
  • Loading branch information
@Furrior
Furrior authored Oct 5, 2023
1 parent cc56e0f commit 9c27200
Show file tree
Hide file tree
Showing 23 changed files with 41 additions and 41 deletions.
4 changes: 2 additions & 2 deletions code/game/jobs/job_exp.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list(
set name = "Check Player Playtime"
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))
return
var/msg = "<html><head><title>Playtime Report</title></head><body>"
var/msg = "<html><meta charset='utf-8'><head><title>Playtime Report</title></head><body>"
var/datum/job/theirjob
var/jtext
msg += "<TABLE border ='1'><TR><TH>Player</TH><TH>Job</TH><TH>Crew</TH>"
Expand Down Expand Up @@ -92,7 +92,7 @@ GLOBAL_LIST_INIT(role_playtime_requirements, list(
return
if(!check_rights(R_ADMIN|R_MOD|R_MENTOR))
return
var/body = "<html><head><title>Playtime for [C.key]</title></head><BODY><BR>Playtime:"
var/body = "<html><meta charset='utf-8'><head><title>Playtime for [C.key]</title></head><BODY><BR>Playtime:"
body += C.get_exp_report()
body += "</BODY></HTML>"
usr << browse(body, "window=playerplaytime[C.ckey];size=550x615")
Expand Down
4 changes: 2 additions & 2 deletions code/game/machinery/camera/camera.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -180,10 +180,10 @@
to_chat(AI, "<b>[U]</b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
else
to_chat(AI, "<b><a href='?src=[AI.UID()];track=[html_encode(U.name)]'>[U]</a></b> holds <a href='?_src_=usr;show_paper=1;'>\a [itemname]</a> up to one of your cameras ...")
AI.last_paper_seen = "<HTML><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
AI.last_paper_seen = "<html><meta charset='utf-8'><HEAD><TITLE>[itemname]</TITLE></HEAD><BODY><TT>[info]</TT></BODY></HTML>"
else if(O.client && O.client.eye == src)
to_chat(O, "[U] holds \a [itemname] up to one of the cameras ...")
O << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))
O << browse(text("<html><meta charset='utf-8'><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", itemname, info), text("window=[]", itemname))

else if(istype(I, /obj/item/laser_pointer))
var/obj/item/laser_pointer/L = I
Expand Down
2 changes: 1 addition & 1 deletion code/game/mecha/combat/honker.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
return output

/obj/mecha/combat/honker/get_stats_html()
var/output = {"<html>
var/output = {"<html><meta charset='utf-8'>
<head><title>[name] data</title>
<style>
body {color: #00ff00; background: #32CD32; font-family:"Courier",monospace; font-size: 12px;}
Expand Down
4 changes: 2 additions & 2 deletions code/game/mecha/equipment/tools/medical_tools.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -125,7 +125,7 @@
/obj/item/mecha_parts/mecha_equipment/medical/sleeper/proc/get_patient_stats()
if(!patient)
return
return {"<html>
return {"<html><meta charset='utf-8'>
<head>
<title>[patient] statistics</title>
<script language='javascript' type='text/javascript'>
Expand Down Expand Up @@ -381,7 +381,7 @@
return

/obj/item/mecha_parts/mecha_equipment/medical/syringe_gun/proc/get_reagents_page()
var/output = {"<html>
var/output = {"<html><meta charset='utf-8'>
<head>
<title>Reagent Synthesizer</title>
<script language='javascript' type='text/javascript'>
Expand Down
8 changes: 4 additions & 4 deletions code/game/mecha/mecha_topic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
////////////////////////////////////

/obj/mecha/proc/get_stats_html()
var/output = {"<html>
var/output = {"<html><meta charset='utf-8'>
<head><title>[name] data</title>
<style>
body {color: #00ff00; background: #000000; font-family:"Lucida Console",monospace; font-size: 12px;}
Expand Down Expand Up @@ -150,7 +150,7 @@


/obj/mecha/proc/get_log_html()
var/output = "<html><head><title>[name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
var/output = "<html><meta charset='utf-8'><head><title>[name] Log</title></head><body style='font: 13px 'Courier', monospace;'>"
for(var/list/entry in log)
output += {"<div style='font-weight: bold;'>[time2text(entry["time"],"DDD MMM DD hh:mm:ss")] 2555</div>
<div style='margin-left:15px; margin-bottom:10px;'>[entry["message"]]</div>
Expand All @@ -169,7 +169,7 @@

/obj/mecha/proc/output_access_dialog(obj/item/card/id/id_card, mob/user)
if(!id_card || !user) return
var/output = {"<html>
var/output = {"<html><meta charset='utf-8'>
<head><style>
h1 {font-size:15px;margin-bottom:4px;}
body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
Expand Down Expand Up @@ -199,7 +199,7 @@

/obj/mecha/proc/output_maintenance_dialog(obj/item/card/id/id_card,mob/user)
if(!id_card || !user) return
var/output = {"<html>
var/output = {"<html><meta charset='utf-8'>
<head>
<style>
body {color: #00ff00; background: #000000; font-family:"Courier New", Courier, monospace; font-size: 12px;}
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/blueprints.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@

/obj/item/areaeditor/attack_self(mob/user as mob)
add_fingerprint(user)
var/text = "<BODY><HTML><head><title>[src]</title></head> \
var/text = "<BODY><html><meta charset='utf-8'><head><title>[src]</title></head> \
<h2>[station_name()] [src.name]</h2> \
<small>[fluffnotice]</small><hr>"
switch(get_area_type())
Expand Down
2 changes: 1 addition & 1 deletion code/game/objects/items/devices/paicard.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
user.set_machine(src)
var/dat = {"
<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
<html>
<html><meta charset='utf-8'>
<head>
<style>
body {
Expand Down
24 changes: 12 additions & 12 deletions code/game/objects/items/weapons/manuals.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
icon_state ="bookDetective"
author = "Nanotrasen"
title = "The Film Noir: Proper Procedures for Investigations"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -75,7 +75,7 @@
author = "Engineering Encyclopedia"
title = "Particle Accelerator User's Guide"

pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -158,7 +158,7 @@
icon_state = "pipingbook"
author = "Maria Crash, Senior Atmospherics Technician"
title = "Pipes and You: Getting To Know Your Scary Tools"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -242,7 +242,7 @@
icon_state = "evabook"
author = "Maria Crash, Senior Atmospherics Technician"
title = "EVA Gear and You: Not Spending All Day Inside"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -303,7 +303,7 @@
author = "Engineering Encyclopedia"
title = "Singularity Safety in Special Circumstances"

pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -351,7 +351,7 @@
author = "Medical Journal, volume 3"
title = "Cloning techniques of the 26th century"

pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -428,7 +428,7 @@
author = "Weyland-Yutani Corp"
title = "APLU \"Ripley\" Construction and Operation Manual"

pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -503,7 +503,7 @@
author = "Dr. L. Ight"
title = "Research and Development 101"
pages = list({"
<html>
<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -553,7 +553,7 @@
icon_state = "barbook"
author = "Sir John Rose"
title = "Barman Recipes"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -597,7 +597,7 @@
author = "Syndicate"
protected = TRUE
title = "Fission Mailed: Nuclear Sabotage 101"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
Nuclear Explosives 101:<br>
Hello and thank you for choosing the Syndicate for your nuclear information needs.<br>
Today's crash course will deal with the operation of a Fusion Class Nanotrasen made Nuclear Device.<br>
Expand Down Expand Up @@ -633,7 +633,7 @@
icon_state ="bookHydroponicsPodPeople"
author = "Farmer John"
title = "The Human Harvest - From seed to market"
pages = list({"<html>
pages = list({"<html><meta charset='utf-8'>
<head>
<style>
h1 {font-size: 18px; margin: 15px 0px 5px;}
Expand Down Expand Up @@ -689,7 +689,7 @@
/obj/item/book/manual/wiki/Initialize()
. = ..()
pages = list({"
<html><head></head><body bgcolor='[book_bgcolor]'>
<html><meta charset='utf-8'><head></head><body bgcolor='[book_bgcolor]'>
<iframe width='100%' height='97%' src="[GLOB.configuration.url.wiki_url]/index.php/[wiki_article_title]?action=render" frameborder="0" id="main_frame"></iframe>
</body></html>"})

Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/outfits.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ GLOBAL_LIST_EMPTY(custom_outfits) //Admin created outfits
pda_select += "</select>"

var/dat = {"
<html><head><title>Create Outfit</title></head><body>
<html><meta charset='utf-8'><head><title>Create Outfit</title></head><body>
<form name="outfit" action="byond://?src=[UID()];" method="get">
<input type="hidden" name="src" value="[UID()]">
<input type="hidden" name="create_outfit_finalize" value="1">
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/permissionverbs/permissionedit.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
return

var/output = {"<!DOCTYPE html>
<html>
<html><meta charset='utf-8'>
<head>
<title>Permissions Panel</title>
<script type='text/javascript' src="search.js"></script>
Expand Down
4 changes: 2 additions & 2 deletions code/modules/admin/player_panel.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
if(!check_rights(R_ADMIN))
message_admins("[key_name_admin(usr)] attempted to invoke player panel without admin rights. If this is a mentor, its a chance they accidentally hit F7. If this is NOT a mentor, there is a high chance an exploit is being used")
return
var/dat = "<html><head><title>Admin Player Panel</title></head>"
var/dat = "<html><meta charset='utf-8'><head><title>Admin Player Panel</title></head>"

//javascript, the part that does most of the work~
dat += {"
Expand Down Expand Up @@ -349,7 +349,7 @@
if(!check_rights(R_ADMIN))
return
if(SSticker && SSticker.current_state >= GAME_STATE_PLAYING)
var/dat = "<html><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
var/dat = "<html><meta charset='utf-8'><head><title>Round Status</title></head><body><h1><B>Round Status</B></h1>"
dat += "Current Game Mode: <B>[SSticker.mode.name]</B><BR>"
dat += "Round Duration: <B>[round(ROUND_TIME / 36000)]:[add_zero(num2text(ROUND_TIME / 600 % 60), 2)]:[add_zero(num2text(ROUND_TIME / 10 % 60), 2)]</B><BR>"
dat += "<B>Emergency shuttle</B><BR>"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/secrets.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@


if(!check_rights(0)) return
var/dat = "<html><body><center>"
var/dat = "<html><meta charset='utf-8'><body><center>"

dat += "<a href='?src=[UID()];secretsmenu=tab;tab=0' [current_tab == 0 ? "class='linkOn'" : ""]>Debug</a>"
dat += "<a href='?src=[UID()];secretsmenu=tab;tab=1' [current_tab == 1 ? "class='linkOn'" : ""]>IC Events</a>"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/topic.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3314,7 +3314,7 @@
if(!check_rights(R_ADMIN))
return
var/text = html_decode(href_list["showdetails"])
usr << browse("<HTML><HEAD><TITLE>Details</TITLE></HEAD><BODY><TT>[replacetext(text, "\n", "<BR>")]</TT></BODY></HTML>",
usr << browse("<html><meta charset='utf-8'><HEAD><TITLE>Details</TITLE></HEAD><BODY><TT>[replacetext(text, "\n", "<BR>")]</TT></BODY></HTML>",
"window=show_details;size=500x200")

else if(href_list["create_outfit_finalize"])
Expand Down
2 changes: 1 addition & 1 deletion code/modules/admin/verbs/randomverbs.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1010,7 +1010,7 @@ Traitors and the like can also be revived with the previous role mostly intact.
return

/* ======== SSD Section ========= */
var/msg = "<html><head><title>SSD & AFK Report</title></head><body>"
var/msg = "<html><meta charset='utf-8'><head><title>SSD & AFK Report</title></head><body>"
msg += "SSD Players:<BR><TABLE border='1'>"
msg += "<TR><TD><B>Key</B></TD><TD><B>Real Name</B></TD><TD><B>Job</B></TD><TD><B>Mins SSD</B></TD><TD><B>Special Role</B></TD><TD><B>Area</B></TD><TD><B>PPN</B></TD><TD><B>Cryo</B></TD></TR>"
var/mins_ssd
Expand Down
2 changes: 1 addition & 1 deletion code/modules/arcade/prize_counter.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
return

var/dat = {"
<html>
<html><meta charset='utf-8'>
<head>
<title>Arcade Ticket Exchange</title>
<style type="text/css">
Expand Down
2 changes: 1 addition & 1 deletion code/modules/atmospherics/machinery/other/area_atmos_computer.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
return
src.add_fingerprint(usr)
var/dat = {"
<html>
<html><meta charset='utf-8'>
<head>
<style type="text/css">
a.green:link
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/living/silicon/pai/recruit.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ GLOBAL_DATUM_INIT(paiController, /datum/paiController, new) // Global handler fo

dat += {"
<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">
<html>
<html><meta charset='utf-8'>
<head>
<style>
body {
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/mob.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ GLOBAL_LIST_INIT(slot_equipment_priority, list( \
usr << browse(null,"window=mob\ref[src]")

if(href_list["flavor_more"])
usr << browse(text("<HTML><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
usr << browse(text("<html><meta charset='utf-8'><HEAD><TITLE>[]</TITLE></HEAD><BODY><TT>[]</TT></BODY></HTML>", name, replacetext(flavor_text, "\n", "<BR>")), text("window=[];size=500x200", name))
onclose(usr, "[name]")
if(href_list["flavor_change"])
update_flavor_text()
Expand Down
2 changes: 1 addition & 1 deletion code/modules/mob/new_player/new_player.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -447,7 +447,7 @@
var/mins = (mills % 36000) / 600
var/hours = mills / 36000

var/dat = "<html><body><center>"
var/dat = "<html><meta charset='utf-8'><body><center>"
dat += "Round Duration: [round(hours)]h [round(mins)]m<br>"
dat += "<b>The station alert level is: [get_security_level_colors()]</b><br>"

Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@


/obj/item/paper/proc/openhelp(mob/user as mob)
user << browse({"<HTML><HEAD><TITLE>Pen Help</TITLE></HEAD>
user << browse({"<html><meta charset='utf-8'><HEAD><TITLE>Pen Help</TITLE></HEAD>
<BODY>
<b><center>Crayon&Pen commands</center></b><br>
<br>
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/paper_bundle.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
else if(istype(src[page], /obj/item/photo))
var/obj/item/photo/P = W
usr << browse_rsc(P.img, "tmp_photo.png")
usr << browse(dat + "<html><head><title>[P.name]</title></head>" \
usr << browse(dat + "<html><meta charset='utf-8'><head><title>[P.name]</title></head>" \
+ "<body style='overflow:hidden'>" \
+ "<div> <img src='tmp_photo.png' width = '180'" \
+ "[P.scribble ? "<div><br> Written on the back:<br><i>[P.scribble]</i>" : ""]"\
Expand Down
2 changes: 1 addition & 1 deletion code/modules/paperwork/photography.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
colormatrix[7], colormatrix[8], colormatrix[9],
)
usr << browse_rsc(img_shown, "tmp_photo.png")
usr << browse("<html><head><title>[name]</title></head>" \
usr << browse("<html><meta charset='utf-8'><head><title>[name]</title></head>" \
+ "<body style='overflow:hidden;margin:0;text-align:center'>" \
+ "<img src='tmp_photo.png' width='[64*photo_size]' style='-ms-interpolation-mode:nearest-neighbor' />" \
+ "[scribble ? "<br>Written on the back:<br><i>[scribble]</i>" : ""]"\
Expand Down
2 changes: 1 addition & 1 deletion code/modules/pda/ai_pda.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
var/datum/data/pda/app/messenger/M = find_program(/datum/data/pda/app/messenger)
if(!M)
to_chat(usr, "<span class='warning'>Cannot use messenger!</span>")
var/HTML = "<html><head><title>AI PDA Message Log</title></head><body>"
var/HTML = "<html><meta charset='utf-8'><head><title>AI PDA Message Log</title></head><body>"
for(var/index in M.tnote)
if(index["sent"])
HTML += addtext("<i><b>&rarr; To <a href='byond://?src=[UID()];choice=Message;target=",index["src"],"'>", index["owner"],"</a>:</b></i><br>", index["message"], "<br>")
Expand Down

0 comments on commit 9c27200

Please sign in to comment.