diff --git a/code/_helpers/text.dm b/code/_helpers/text.dm index 21b03bce195..03587f59735 100644 --- a/code/_helpers/text.dm +++ b/code/_helpers/text.dm @@ -444,7 +444,14 @@ proc/TextPreview(var/string,var/len=40) t = replacetext(t, "\[/grid\]", "") t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") - t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[logo_nt\]", "") + t = replacetext(t, "\[logo_nt_small\]", "") + t = replacetext(t, "\[logo_zh\]", "") + t = replacetext(t, "\[logo_idris\]", "") + t = replacetext(t, "\[logo_eridani\]", "") + t = replacetext(t, "\[logo_necro\]", "") + t = replacetext(t, "\[logo_hp\]", "") + t = replacetext(t, "\[logo_be\]", "") t = replacetext(t, "\[barcode\]", "") t = replacetext(t, "\[time\]", "[worldtime2text()]") t = replacetext(t, "\[date\]", "[worlddate2text()]") diff --git a/code/modules/client/asset_cache.dm b/code/modules/client/asset_cache.dm index 0635a73663e..f1ac5226fc3 100644 --- a/code/modules/client/asset_cache.dm +++ b/code/modules/client/asset_cache.dm @@ -184,7 +184,14 @@ var/list/asset_datums = list() "barcode1.png" = 'html/images/barcode1.png', "barcode2.png" = 'html/images/barcode2.png', "barcode3.png" = 'html/images/barcode3.png', - "ntlogo.png" = 'html/images/ntlogo.png' + "ntlogo.png" = 'html/images/ntlogo.png', + "ntlogo_small.png" = 'html/images/ntlogo_small.png', + "zhlogo.png" = 'html/images/zhlogo.png', + "idrislogo.png" = 'html/images/idrislogo.png', + "eridanilogo.png" = 'html/images/eridanilogo.png', + "necrologo.png" = 'html/images/necrologo.png', + "hplogo.png" = 'html/images/hplogo.png', + "belogo.png" = 'html/images/belogo.png' ) /datum/asset/simple/changelog diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 44ff1c46462..cd181ecfc2f 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -278,7 +278,14 @@ t = replacetext(t, "\[/table\]", "") t = replacetext(t, "\[row\]", "") t = replacetext(t, "\[cell\]", "") - t = replacetext(t, "\[logo\]", "") + t = replacetext(t, "\[logo_nt\]", "") + t = replacetext(t, "\[logo_nt_small\]", "") + t = replacetext(t, "\[logo_zh\]", "") + t = replacetext(t, "\[logo_idris\]", "") + t = replacetext(t, "\[logo_eridani\]", "") + t = replacetext(t, "\[logo_necro\]", "") + t = replacetext(t, "\[logo_hp\]", "") + t = replacetext(t, "\[logo_be\]", "") if(iscrayon) t = "[t]" @@ -540,7 +547,7 @@ var/sentence = 1 // Is this form contain a sentence of guilty? /obj/item/weapon/paper/incident/New() - info = {"\[center\]\[logo\]\[/center\] + info = {"\[center\]\[logo_nt\]\[/center\] \[center\]\[b\]\[i\]Encoded NanoTrasen Security Incident Report\[/b\]\[/i\]\[hr\] \[small\]FOR USE BY SECURITY ONLY\[/small\]\[br\] \[barcode\]\[/center\]"} @@ -552,7 +559,7 @@ icon_state = "pamphlet" /obj/item/weapon/paper/sentencing/New() - info = {"\[center\]\[logo\]\[/center\] + info = {"\[center\]\[logo_nt\]\[/center\] \[center\]\[b\]\[i\]Operation of Criminal Sentencing Computers\[/b\]\[/i\]\[hr\] \[small\]In compliance with new NanoTrasen criminal regulations, the \[b\][station_name()]\[/b\] has been equipped with state of the art sentencing computers. The operation of these terminals is quite simple:\[br\] \[br\] diff --git a/html/changelogs/sindorman-logo.yml b/html/changelogs/sindorman-logo.yml new file mode 100644 index 00000000000..643ab67d703 --- /dev/null +++ b/html/changelogs/sindorman-logo.yml @@ -0,0 +1,41 @@ +################################ +# Example Changelog File +# +# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb. +# +# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.) +# When it is, any changes listed below will disappear. +# +# Valid Prefixes: +# bugfix +# wip (For works in progress) +# tweak +# soundadd +# sounddel +# rscadd (general adding of nice things) +# rscdel (general deleting of nice things) +# imageadd +# imagedel +# maptweak +# spellcheck (typo fixes) +# experiment +# balance +# admin +# backend +# security +# refactor +################################# + +# Your name. +author: PoZe + +# 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: + - rscadd: "Added new paper logos for: [logo_nt] - Regular NT logo, [logo_nt_small] - Small size NT logo, [log_zh] - Zeng-Hu, [logo_idris] - Idris, [logo_eridani] - Eridani, [logo_necro] - Necropolis, [logo_hp] - Hephaestus Industries, [logo_be] - Beisel." diff --git a/html/images/belogo.png b/html/images/belogo.png new file mode 100644 index 00000000000..bec0e234c64 Binary files /dev/null and b/html/images/belogo.png differ diff --git a/html/images/eridanilogo.png b/html/images/eridanilogo.png new file mode 100644 index 00000000000..670229eb900 Binary files /dev/null and b/html/images/eridanilogo.png differ diff --git a/html/images/hplogo.png b/html/images/hplogo.png new file mode 100644 index 00000000000..2771b7b917d Binary files /dev/null and b/html/images/hplogo.png differ diff --git a/html/images/idrislogo.png b/html/images/idrislogo.png new file mode 100644 index 00000000000..6b6953e6124 Binary files /dev/null and b/html/images/idrislogo.png differ diff --git a/html/images/necrologo.png b/html/images/necrologo.png new file mode 100644 index 00000000000..375f0d62ee3 Binary files /dev/null and b/html/images/necrologo.png differ diff --git a/html/images/ntlogo_small.png b/html/images/ntlogo_small.png new file mode 100644 index 00000000000..fb42ca7557d Binary files /dev/null and b/html/images/ntlogo_small.png differ diff --git a/html/images/zhlogo.png b/html/images/zhlogo.png new file mode 100644 index 00000000000..fe7bc208b27 Binary files /dev/null and b/html/images/zhlogo.png differ