Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion interface/fonts/grand_9k.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// Base font
/datum/font/grand9k
name = "Grand9K Pixel"
font_family = 'interface/fonts/Grand9K_Pixel.ttf'
// font_family = 'interface/fonts/Grand9K_Pixel.ttf' FLUFFY FRONTIER REMOVAL reffer to tff_upstream_fonts_override.dm for font overrides

/// For icon overlays
/// Grand9K 6pt metrics generated using Lummox's dmifontsplus (https://www.byond.com/developer/LummoxJR/DmiFontsPlus)
Expand Down
2 changes: 1 addition & 1 deletion interface/fonts/pixellari.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// Base font
/datum/font/pixellari
name = "Pixellari"
font_family = 'interface/fonts/Pixellari.ttf'
// font_family = 'interface/fonts/Pixellari.ttf' FLUFFY FRONTIER REMOVAL reffer to tff_upstream_fonts_override.dm for font overrides

/// For icon overlays
/// Pixellari 12pt metrics generated using Lummox's dmifontsplus (https://www.byond.com/developer/LummoxJR/DmiFontsPlus)
Expand Down
2 changes: 1 addition & 1 deletion interface/fonts/spess_font.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// Base font
/datum/font/spessfont
name = "Spess Font"
font_family = 'interface/fonts/SpessFont.ttf'
// font_family = 'interface/fonts/SpessFont.ttf' FLUFFY FRONTIER REMOVAL reffer to tff_upstream_fonts_override.dm for font overrides

/// For icon overlays
/// Spess Font 6pt metrics generated using Lummox's dmifontsplus (https://www.byond.com/developer/LummoxJR/DmiFontsPlus)
Expand Down
2 changes: 1 addition & 1 deletion interface/fonts/tiny_unicode.dm
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/// Base font
/datum/font/tiny_unicode
name = "TinyUnicode"
font_family = 'interface/fonts/TinyUnicode.ttf'
// font_family = 'interface/fonts/TinyUnicode.ttf' FLUFFY FRONTIER REMOVAL reffer to tff_upstream_fonts_override.dm for font overrides

/// For icon overlays
/// TinyUnicode 12pt metrics generated using Lummox's dmifontsplus (https://www.byond.com/developer/LummoxJR/DmiFontsPlus)
Expand Down
8 changes: 4 additions & 4 deletions interface/skin.dmf
Original file line number Diff line number Diff line change
Expand Up @@ -119,13 +119,13 @@ window "mapwindow"
size = 640x480
anchor1 = 0,0
anchor2 = 100,100
font-family = "Arial"
font-size = 7
font-family = "Grand9K Pixel"
font-size = 6pt
is-default = true
right-click = true
saved-params = "zoom;letterbox;zoom-mode"
style = "img.icon { width: auto; height: auto } .center { text-align: center; } .maptext { font-family: 'Small Fonts'; font-size: 7px; -dm-text-outline: 1px black; color: white; line-height: 1.1; } .command_headset { font-weight: bold;\tfont-size: 8px; } .context { font-family: 'Small Fonts'; font-size: 8px; -dm-text-outline: 1px black; } .subcontext { font-family: 'Small Fonts'; font-size: 6px; line-height: 0.75; } .small { font-size: 6px; } .big { font-size: 8px; } .reallybig { font-size: 8px; } .extremelybig { font-size: 8px; } .greentext { color: #00FF00; font-size: 7px; } .redtext { color: #FF0000; font-size: 7px; } .clown { color: #FF69Bf; font-size: 7px; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-size: 6px; }"
elem "status_bar"
style = "img.icon { width: auto; height: auto } .center { text-align: center; } .maptext { font-family: 'Grand9K Pixel'; font-size: 6pt; -dm-text-outline: 1px black; color: white; line-height: 1.0; } .command_headset { font-weight: bold; } .context { font-family: 'Pixellari'; font-size: 12pt; -dm-text-outline: 1px black; } .subcontext { font-family: 'TinyUnicode'; font-size: 12pt; line-height: 0.75; } .small { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; } .big { font-family: 'Pixellari'; font-size: 12pt; } .reallybig { font-size: 12pt; } .extremelybig { font-size: 12pt; } .greentext { color: #00FF00; font-size: 6pt; } .redtext { color: #FF0000; font-size: 6pt; } .clown { color: #FF69BF; font-weight: bold; } .his_grace { color: #15D512; } .hypnophrase { color: #0d0d0d; font-weight: bold; } .yell { font-weight: bold; } .italics { font-family: 'Spess Font'; font-size: 6pt; line-height: 1.4; }"
elem "status_bar"
type = LABEL
pos = 0,470
size = 128x10
Expand Down
3 changes: 3 additions & 0 deletions tff_modular/modules/~fonts_override/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ⚠️ Warning

This module provides fonts used in `skin.dmf` and `status_display`. Disabling this module or changing `skin.dmf` may result in the complete loss of all Cyrillic text rendering in the game.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
/datum/font/grand9k
font_family = 'tff_modular/modules/~fonts_override/fonts/Grand9KPixelRus.ttf'

/datum/font/pixellari
font_family = 'tff_modular/modules/~fonts_override/fonts/PixCyrillic.ttf'

/datum/font/spessfont
font_family = 'tff_modular/modules/~fonts_override/fonts/SpessFontRus.ttf'

/datum/font/tiny_unicode
font_family = 'tff_modular/modules/~fonts_override/fonts/TinyUnicodeRus.ttf'
21 changes: 21 additions & 0 deletions tff_modular/modules/~fonts_override/statusdisplay_overrides.dm
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
// PDA app for changing displays
// Allowing non asii text (yeah we posting it twice, I know)
/datum/computer_file/program/status/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/state)
. = ..()
if(action == "setStatusMessage")
upper_text = reject_bad_text(params["upperText"] || "", MAX_STATUS_LINE_LENGTH, FALSE)
lower_text = reject_bad_text(params["lowerText"] || "", MAX_STATUS_LINE_LENGTH, FALSE)

post_message(upper_text, lower_text)

// Communcations consoles also can change displays
// Allowing non asii text (yeah we posting it twice, I know)
/obj/machinery/computer/communications/ui_act(action, list/params, datum/tgui/ui, datum/ui_state/ui_state)
. = ..()

var/mob/user = ui.user
if(action == "setStatusMessage" && authenticated(user) && has_communication())
var/line_one = reject_bad_text(params["upperText"] || "", MAX_STATUS_LINE_LENGTH, FALSE)
var/line_two = reject_bad_text(params["lowerText"] || "", MAX_STATUS_LINE_LENGTH, FALSE)
post_status("message", line_one, line_two)
last_status_display = list(line_one, line_two)
2 changes: 2 additions & 0 deletions tgstation.dme
Original file line number Diff line number Diff line change
Expand Up @@ -9872,4 +9872,6 @@
#include "tff_modular\modules\~donator\clothes\donator_uniforms.dm"
#include "tff_modular\modules\~donator\items\donator_plushes.dm"
#include "tff_modular\modules\~donator\items\donator_plushies_loadout.dm"
#include "tff_modular\modules\~fonts_override\statusdisplay_overrides.dm"
#include "tff_modular\modules\~fonts_override\fonts\tff_upstream_fonts_override.dm"
// END_INCLUDE
Loading