diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 126694bd0c5..1f243e4374b 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -537,27 +537,46 @@ t = replacetext(t, "\[row\]", "
")
- t = replacetext(t, "\[logo_nt\]", "
")
- t = replacetext(t, "\[logo_nt_small\]", "
")
+ t = replacetext(t, "\[logo_scc_small\]", "
")
+ t = replacetext(t, "\[logo_nt\]", "
")
+ t = replacetext(t, "\[logo_nt_small\]", "
")
t = replacetext(t, "\[logo_zh\]", "
")
+ t = replacetext(t, "\[logo_zh_small\]", "
")
t = replacetext(t, "\[logo_idris\]", "
")
+ t = replacetext(t, "\[logo_idris_small\]", "
")
t = replacetext(t, "\[logo_eridani\]", "
")
+ t = replacetext(t, "\[logo_eridani_small\]", "
")
t = replacetext(t, "\[logo_zavod\]", "
")
+ t = replacetext(t, "\[logo_zavod_small\]", "
")
t = replacetext(t, "\[logo_hp_large\]", "
")
t = replacetext(t, "\[logo_hp\]", "
")
+ t = replacetext(t, "\[logo_hp_small\]", "
")
t = replacetext(t, "\[logo_orion\]", "
")
+ t = replacetext(t, "\[logo_orion_small\]", "
")
t = replacetext(t, "\[logo_pmcg\]", "
")
+ t = replacetext(t, "\[logo_pmcg_small\]", "
")
t = replacetext(t, "\[flag_be\]", "
")
+ t = replacetext(t, "\[flag_be_small\]", "
")
t = replacetext(t, "\[flag_elyra\]", "
")
+ t = replacetext(t, "\[flag_elyra_small\]", "
")
t = replacetext(t, "\[flag_sol\]", "
")
+ t = replacetext(t, "\[flag_sol_small\]", "
")
t = replacetext(t, "\[flag_coc\]", "
")
+ t = replacetext(t, "\[flag_coc_small\]", "
")
t = replacetext(t, "\[flag_dom\]", "
")
+ t = replacetext(t, "\[flag_dom_small\]", "
")
t = replacetext(t, "\[flag_nralakk\]", "
")
+ t = replacetext(t, "\[flag_nralakk_small\]", "
")
t = replacetext(t, "\[flag_pra\]", "
")
+ t = replacetext(t, "\[flag_pra_small\]", "
")
t = replacetext(t, "\[flag_dpra\]", "
")
+ t = replacetext(t, "\[flag_dpra_small\]", "
")
t = replacetext(t, "\[flag_nka\]", "
")
+ t = replacetext(t, "\[flag_nka_small\]", "
")
t = replacetext(t, "\[flag_izweski\]", "
")
+ t = replacetext(t, "\[flag_izweski_small\]", "
")
t = replacetext(t, "\[logo_golden\]", "
")
+ t = replacetext(t, "\[logo_golden_small\]", "
")
t = replacetext(t, "\[barcode\]", "
", "\[logo_scc\]")
- t = replacetext(t, "
", "\[logo_nt\]")
- t = replacetext(t, "
", "\[logo_nt_small\]")
+ t = replacetext(t, "
", "\[logo_scc_small\]")
+ t = replacetext(t, "
", "\[logo_nt\]")
+ t = replacetext(t, "
", "\[logo_nt_small\]")
t = replacetext(t, "
", "\[logo_zh\]")
+ t = replacetext(t, "
", "\[logo_zh_small\]")
t = replacetext(t, "
", "\[logo_idris\]")
+ t = replacetext(t, "
", "\[logo_idris_small\]")
t = replacetext(t, "
", "\[logo_eridani\]")
+ t = replacetext(t, "
", "\[logo_eridani_small\]")
t = replacetext(t, "
", "\[logo_zavod\]")
+ t = replacetext(t, "
", "\[logo_zavod_small\]")
t = replacetext(t, "
", "\[logo_hp_large\]")
t = replacetext(t, "
", "\[logo_hp\]")
+ t = replacetext(t, "
", "\[logo_hp_small\]")
t = replacetext(t, "
", "\[flag_be\]")
t = replacetext(t, "
", "\[flag_elyra\]")
t = replacetext(t, "
", "\[flag_sol\]")
diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm
index 9e9eedde672..d2d57f82d93 100644
--- a/code/modules/client/asset_cache.dm
+++ b/code/modules/client/asset_cache.dm
@@ -414,27 +414,46 @@ var/list/asset_datums = list()
"barcode2.png" = 'html/images/barcode2.png',
"barcode3.png" = 'html/images/barcode3.png',
"scclogo.png" = 'html/images/factions/scclogo.png',
- "ntlogo.png" = 'html/images/ntlogo.png',
- "ntlogo_small.png" = 'html/images/ntlogo_small.png',
+ "scclogo_small.png" = 'html/images/factions/scclogo_small.png',
+ "nanotrasenlogo.png" = 'html/images/factions/nanotrasenlogo.png',
+ "nanotrasenlogo_small.png" = 'html/images/factions/nanotrasenlogo_small.png',
"zhlogo.png" = 'html/images/factions/zenghulogo.png',
+ "zhlogo_small.png" = 'html/images/factions/zenghulogo_small.png',
"idrislogo.png" = 'html/images/factions/idrislogo.png',
+ "idrislogo_small.png" = 'html/images/factions/idrislogo_small.png',
"eridanilogo.png" = 'html/images/factions/ECFlogo.png',
+ "eridanilogo_small.png" = 'html/images/factions/ECFlogo_small.png',
"pmcglogo.png" = 'html/images/factions/pmcglogo.png',
+ "pmcglogo_small.png" = 'html/images/factions/pmcglogo_small.png',
"zavodlogo.png" = 'html/images/factions/zavodlogo.png',
+ "zavodlogo_small.png" = 'html/images/factions/zavodlogo_small.png',
"orionlogo.png" = 'html/images/factions/orionlogo.png',
+ "orionlogo_small.png" = 'html/images/factions/orionlogo_small.png',
"hplogolarge.png" = 'html/images/hplogolarge.png',
"hplogo.png" = 'html/images/factions/hephlogo.png',
+ "hplogo_small.png" = 'html/images/factions/hephlogo_small.png',
"beflag.png" = 'html/images/beflag.png',
+ "beflag_small.png" = 'html/images/beflag_small.png',
"elyraflag.png" = 'html/images/elyraflag.png',
+ "elyraflag_small.png" = 'html/images/elyraflag_small.png',
"solflag.png" = 'html/images/solflag.png',
+ "solflag_small.png" = 'html/images/solflag_small.png',
"cocflag.png" = 'html/images/cocflag.png',
+ "cocflag_small.png" = 'html/images/cocflag_small.png',
"domflag.png" = 'html/images/domflag.png',
+ "domflag_small.png" = 'html/images/domflag_small.png',
"nralakkflag.png" = 'html/images/nralakkflag.png',
+ "nralakkflag_small.png" = 'html/images/nralakkflag_small.png',
"praflag.png" = 'html/images/praflag.png',
+ "praflag_small.png" = 'html/images/praflag_small.png',
"dpraflag.png" = 'html/images/dpraflag.png',
+ "dpraflag_small.png" = 'html/images/dpraflag_small.png',
"nkaflag.png" = 'html/images/nkaflag.png',
+ "nkaflag_small.png" = 'html/images/nkaflag_small.png',
"izweskiflag.png" = 'html/images/izweskiflag.png',
- "goldenlogo.png" = 'html/images/goldenlogo.png',
+ "izweskiflag_small.png" = 'html/images/izweskiflag_small.png',
+ "goldenlogo.png" = 'html/images/factions/goldenlogo.png',
+ "goldenlogo_small.png" = 'html/images/factions/goldenlogo_small.png',
"bluebird.woff" = 'html/fonts/OFL/Bluebird.woff',
"grandhotel.woff" = 'html/fonts/OFL/GrandHotel.woff',
"lashema.woff" = 'html/fonts/OFL/Lashema.woff',
diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm
index 6fd81cee139..27e2ca960b2 100644
--- a/code/modules/paperwork/paper.dm
+++ b/code/modules/paperwork/paper.dm
@@ -317,15 +317,22 @@
t = replacetext(t, "\[row\]", "")
t = replacetext(t, "\[cell\]", "")
t = replacetext(t, "\[logo_scc\]", "")
+ t = replacetext(t, "\[logo_scc_small\]", "")
t = replacetext(t, "\[logo_nt\]", "")
t = replacetext(t, "\[logo_nt_small\]", "")
t = replacetext(t, "\[logo_zh\]", "")
+ t = replacetext(t, "\[logo_zh_small\]", "")
t = replacetext(t, "\[logo_idris\]", "")
+ t = replacetext(t, "\[logo_idris_small\]", "")
t = replacetext(t, "\[logo_eridani\]", "")
- t = replacetext(t, "\[logo_zavodskoi\]", "")
+ t = replacetext(t, "\[logo_eridani_small\]", "")
+ t = replacetext(t, "\[logo_zavod\]", "")
+ t = replacetext(t, "\[logo_zavod_small\]", "")
t = replacetext(t, "\[logo_hp\]", "")
+ t = replacetext(t, "\[logo_hp_small\]", "")
t = replacetext(t, "\[logo_be\]", "")
t = replacetext(t, "\[logo_golden\]", "")
+ t = replacetext(t, "\[barcode\]", "")
if(iscrayon)
t = "[t]"
diff --git a/html/changelogs/ben10083 - logos.yml b/html/changelogs/ben10083 - logos.yml
new file mode 100644
index 00000000000..edb3752b5b8
--- /dev/null
+++ b/html/changelogs/ben10083 - logos.yml
@@ -0,0 +1,17 @@
+# Your name.
+author: Ben10083
+
+# Optional: Remove this file after generating master changelog. Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made. See valid prefix list above.
+# INDENT WITH TWO SPACES. NOT TABS. SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+ - imageadd: "Added small variants to all flags and logos. It can be done by adding _small to the end of the command"
+ - imageadd: "Golden deep logo replaced with properly sized version."
+ - imageadd: "[barcode] images properly formatted."
+ - bugfix: "Paperwork for Nanotrasen now uses the correct new NT Logo."
+ - bugfix: "SCC logo downsized to scale with other logos."
diff --git a/html/images/barcode0.png b/html/images/barcode0.png
index 6f772471b4d..15273a19078 100644
Binary files a/html/images/barcode0.png and b/html/images/barcode0.png differ
diff --git a/html/images/barcode1.png b/html/images/barcode1.png
index 3e40adb90dc..425539cba26 100644
Binary files a/html/images/barcode1.png and b/html/images/barcode1.png differ
diff --git a/html/images/barcode2.png b/html/images/barcode2.png
index b14aaa1ab15..57c9c2940ca 100644
Binary files a/html/images/barcode2.png and b/html/images/barcode2.png differ
diff --git a/html/images/barcode3.png b/html/images/barcode3.png
index baff438b0ec..553400a27df 100644
Binary files a/html/images/barcode3.png and b/html/images/barcode3.png differ
diff --git a/html/images/beflag_small.png b/html/images/beflag_small.png
new file mode 100644
index 00000000000..55ab251c37c
Binary files /dev/null and b/html/images/beflag_small.png differ
diff --git a/html/images/cocflag_small.png b/html/images/cocflag_small.png
new file mode 100644
index 00000000000..377dbd42efd
Binary files /dev/null and b/html/images/cocflag_small.png differ
diff --git a/html/images/domflag_small.png b/html/images/domflag_small.png
new file mode 100644
index 00000000000..83855bd03e9
Binary files /dev/null and b/html/images/domflag_small.png differ
diff --git a/html/images/dpraflag_small.png b/html/images/dpraflag_small.png
new file mode 100644
index 00000000000..49783a67fa3
Binary files /dev/null and b/html/images/dpraflag_small.png differ
diff --git a/html/images/elyraflag_small.png b/html/images/elyraflag_small.png
new file mode 100644
index 00000000000..f599df68cae
Binary files /dev/null and b/html/images/elyraflag_small.png differ
diff --git a/html/images/factions/ECFlogo_small.png b/html/images/factions/ECFlogo_small.png
new file mode 100644
index 00000000000..8160728d62b
Binary files /dev/null and b/html/images/factions/ECFlogo_small.png differ
diff --git a/html/images/factions/goldenlogo.png b/html/images/factions/goldenlogo.png
new file mode 100644
index 00000000000..f96b2708768
Binary files /dev/null and b/html/images/factions/goldenlogo.png differ
diff --git a/html/images/factions/goldenlogo_small.png b/html/images/factions/goldenlogo_small.png
new file mode 100644
index 00000000000..c403638850e
Binary files /dev/null and b/html/images/factions/goldenlogo_small.png differ
diff --git a/html/images/factions/hephlogo_small.png b/html/images/factions/hephlogo_small.png
new file mode 100644
index 00000000000..623e978dcf7
Binary files /dev/null and b/html/images/factions/hephlogo_small.png differ
diff --git a/html/images/factions/idrislogo_small.png b/html/images/factions/idrislogo_small.png
new file mode 100644
index 00000000000..2763df1faad
Binary files /dev/null and b/html/images/factions/idrislogo_small.png differ
diff --git a/html/images/factions/nanotrasenlogo_small.png b/html/images/factions/nanotrasenlogo_small.png
new file mode 100644
index 00000000000..dda872bff69
Binary files /dev/null and b/html/images/factions/nanotrasenlogo_small.png differ
diff --git a/html/images/factions/orionlogo_small.png b/html/images/factions/orionlogo_small.png
new file mode 100644
index 00000000000..165d413e1cb
Binary files /dev/null and b/html/images/factions/orionlogo_small.png differ
diff --git a/html/images/factions/pmcglogo_small.png b/html/images/factions/pmcglogo_small.png
new file mode 100644
index 00000000000..662ff9146c9
Binary files /dev/null and b/html/images/factions/pmcglogo_small.png differ
diff --git a/html/images/factions/scclogo.png b/html/images/factions/scclogo.png
index 4d6ec5acbac..1465a9d7891 100644
Binary files a/html/images/factions/scclogo.png and b/html/images/factions/scclogo.png differ
diff --git a/html/images/factions/scclogo_small.png b/html/images/factions/scclogo_small.png
new file mode 100644
index 00000000000..4dbe7be5895
Binary files /dev/null and b/html/images/factions/scclogo_small.png differ
diff --git a/html/images/factions/zavodlogo_small.png b/html/images/factions/zavodlogo_small.png
new file mode 100644
index 00000000000..5c053f44f67
Binary files /dev/null and b/html/images/factions/zavodlogo_small.png differ
diff --git a/html/images/factions/zenghulogo_small.png b/html/images/factions/zenghulogo_small.png
new file mode 100644
index 00000000000..cefce17aade
Binary files /dev/null and b/html/images/factions/zenghulogo_small.png differ
diff --git a/html/images/goldenlogo.png b/html/images/goldenlogo.png
deleted file mode 100644
index 19867778975..00000000000
Binary files a/html/images/goldenlogo.png and /dev/null differ
diff --git a/html/images/izweskiflag_small.png b/html/images/izweskiflag_small.png
new file mode 100644
index 00000000000..36ea2438a53
Binary files /dev/null and b/html/images/izweskiflag_small.png differ
diff --git a/html/images/nkaflag_small.png b/html/images/nkaflag_small.png
new file mode 100644
index 00000000000..62c796b23c7
Binary files /dev/null and b/html/images/nkaflag_small.png differ
diff --git a/html/images/nralakkflag_small.png b/html/images/nralakkflag_small.png
new file mode 100644
index 00000000000..79c82e64492
Binary files /dev/null and b/html/images/nralakkflag_small.png differ
diff --git a/html/images/ntlogo_small.png b/html/images/ntlogo_small.png
deleted file mode 100644
index 7d76d9ea45e..00000000000
Binary files a/html/images/ntlogo_small.png and /dev/null differ
diff --git a/html/images/praflag_small.png b/html/images/praflag_small.png
new file mode 100644
index 00000000000..3cd1e0c5744
Binary files /dev/null and b/html/images/praflag_small.png differ
diff --git a/html/images/solflag_small.png b/html/images/solflag_small.png
new file mode 100644
index 00000000000..b5e3dd0e316
Binary files /dev/null and b/html/images/solflag_small.png differ