diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index 530a8c8f81c..8b6897358a6 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -666,6 +666,10 @@ t = replacetext(t, "\[logo_pvpolice_small\]", "") t = replacetext(t, "\[logo_outereyes\]", "") t = replacetext(t, "\[logo_outereyes_small\]", "") + t = replacetext(t, "\[twinsuns\]", "") + t = replacetext(t, "\[twinsuns_small\]", "") + t = replacetext(t, "\[raskara_sigil\]", "") + t = replacetext(t, "\[raskara_sigil_small\]", "") t = replacetext(t, "\[barcode\]", "") t = replacetext(t, "\[time\]", "[worldtime2text()]") t = replacetext(t, "\[date\]", "[worlddate2text()]") @@ -741,6 +745,10 @@ t = replacetext(t, "", "\[logo_pvpolice_small\]") t = replacetext(t, "", "\[logo_outereyes\]") t = replacetext(t, "", "\[logo_outereyes_small\]") + t = replacetext(t, "", "\[twinsuns\]") + t = replacetext(t, "", "\[twinsuns_small\]") + t = replacetext(t, "", "\[raskara_sigil\]") + t = replacetext(t, "", "\[raskara_sigil_small\]") return t diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm index 49355997d11..e3f5068a34c 100644 --- a/code/modules/asset_cache/asset_cache.dm +++ b/code/modules/asset_cache/asset_cache.dm @@ -536,6 +536,10 @@ GLOBAL_LIST_EMPTY(asset_datums) "pvpolicelogo_small.png" = 'html/images/pvpolicelogo_small.png', "outereyeslogo.png" = 'html/images/outereyeslogo.png', "outereyeslogo_small.png" = 'html/images/outereyeslogo_small.png', + "twinsuns.png" = 'html/images/twinsuns.png', + "twinsuns_small.png" = 'html/images/twinsuns_small.png', + "raskara_sigil.png" = 'html/images/raskara_sigil.png', + "raskara_sigil_small.png" = 'html/images/raskara_sigil_small.png', //scan images that appear on sensors "no_data.png" = 'html/images/scans/no_data.png', "horizon.png" = 'html/images/scans/horizon.png', diff --git a/code/modules/paperwork/paper.dm b/code/modules/paperwork/paper.dm index 444f3075db2..96c8739b7e9 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -381,6 +381,10 @@ t = replacetext(t, "\[logo_pvpolice_small\]", "") t = replacetext(t, "\[logo_outereyes\]", "") t = replacetext(t, "\[logo_outereyes_small\]", "") + t = replacetext(t, "\[twinsuns\]", "") + t = replacetext(t, "\[twinsuns_small\]", "") + t = replacetext(t, "\[raskara_sigil\]", "") + t = replacetext(t, "\[raskara_sigil_small\]", "") t = replacetext(t, "\[barcode\]", "") if(istypewriter) diff --git a/html/changelogs/greenjoe - tajlogo.yml b/html/changelogs/greenjoe - tajlogo.yml new file mode 100644 index 00000000000..d7d4b61cee4 --- /dev/null +++ b/html/changelogs/greenjoe - tajlogo.yml @@ -0,0 +1,58 @@ +################################ +# 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 +# - (fixes bugs) +# wip +# - (work in progress) +# qol +# - (quality of life) +# soundadd +# - (adds a sound) +# sounddel +# - (removes a sound) +# rscadd +# - (adds a feature) +# rscdel +# - (removes a feature) +# imageadd +# - (adds an image or sprite) +# imagedel +# - (removes an image or sprite) +# spellcheck +# - (fixes spelling or grammar) +# experiment +# - (experimental change) +# balance +# - (balance changes) +# code_imp +# - (misc internal code change) +# refactor +# - (refactors code) +# config +# - (makes a change to the config files) +# admin +# - (makes changes to administrator tools) +# server +# - (miscellaneous changes to server) +################################# + +# Your name. +author: Greenjoe + +# 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, this gets changed to [] after reading. Just remove the brackets when you add new shit. +# Please surround your changes in double quotes ("). It works without them, but if you use certain characters it screws up compiling. The quotes will not show up in the changelog. +changes: + - rscadd: "Adds Twin Suns and Raskara symbols to paperwork, use [twinsuns] and [raskara_sigil] to write them. Add _small to make small versions." diff --git a/html/images/raskara_sigil.png b/html/images/raskara_sigil.png new file mode 100644 index 00000000000..1bbd3873293 Binary files /dev/null and b/html/images/raskara_sigil.png differ diff --git a/html/images/raskara_sigil_small.png b/html/images/raskara_sigil_small.png new file mode 100644 index 00000000000..f0c72365437 Binary files /dev/null and b/html/images/raskara_sigil_small.png differ diff --git a/html/images/twinsuns.png b/html/images/twinsuns.png new file mode 100644 index 00000000000..63633bfee48 Binary files /dev/null and b/html/images/twinsuns.png differ diff --git a/html/images/twinsuns_small.png b/html/images/twinsuns_small.png new file mode 100644 index 00000000000..af777011f51 Binary files /dev/null and b/html/images/twinsuns_small.png differ