From d09b964546bff7934075e0dda865100433ee6ab0 Mon Sep 17 00:00:00 2001 From: Greenjoe12345 <33647525+Greenjoe12345@users.noreply.github.com> Date: Thu, 29 Feb 2024 17:39:27 +0000 Subject: [PATCH] cops (#18518) --- code/__HELPERS/text.dm | 4 ++ code/modules/asset_cache/asset_cache.dm | 2 + code/modules/paperwork/paper.dm | 2 + html/changelogs/greenjoe12345 - coplogo.yml | 41 ++++++++++++++++++++ html/images/pvpolicelogo.png | Bin 0 -> 6857 bytes html/images/pvpolicelogo_small.png | Bin 0 -> 930 bytes 6 files changed, 49 insertions(+) create mode 100644 html/changelogs/greenjoe12345 - coplogo.yml create mode 100644 html/images/pvpolicelogo.png create mode 100644 html/images/pvpolicelogo_small.png diff --git a/code/__HELPERS/text.dm b/code/__HELPERS/text.dm index a583982b96f..88af9bd5bb4 100644 --- a/code/__HELPERS/text.dm +++ b/code/__HELPERS/text.dm @@ -652,6 +652,8 @@ t = replacetext(t, "\[flag_izweski_small\]", "") t = replacetext(t, "\[logo_golden\]", "") t = replacetext(t, "\[logo_golden_small\]", "") + t = replacetext(t, "\[logo_pvpolice\]", "") + t = replacetext(t, "\[logo_pvpolice_small\]", "") t = replacetext(t, "\[barcode\]", "") t = replacetext(t, "\[time\]", "[worldtime2text()]") t = replacetext(t, "\[date\]", "[worlddate2text()]") @@ -720,6 +722,8 @@ t = replacetext(t, "", "\[flag_nka\]") t = replacetext(t, "", "\[flag_izweski\]") t = replacetext(t, "", "\[logo_golden\]") + t = replacetext(t, "", "\[logo_pvpolice\]") + t = replacetext(t, "", "\[logo_pvpolice_small\]") return t diff --git a/code/modules/asset_cache/asset_cache.dm b/code/modules/asset_cache/asset_cache.dm index 818d8646dd0..4bcb28080f4 100644 --- a/code/modules/asset_cache/asset_cache.dm +++ b/code/modules/asset_cache/asset_cache.dm @@ -532,6 +532,8 @@ var/list/asset_datums = list() "izweskiflag_small.png" = 'html/images/izweskiflag_small.png', "goldenlogo.png" = 'html/images/factions/goldenlogo.png', "goldenlogo_small.png" = 'html/images/factions/goldenlogo_small.png', + "pvpolicelogo.png" = 'html/images/pvpolicelogo.png', + "pvpolicelogo_small.png" = 'html/images/pvpolicelogo_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 331faace0de..ef1c50b0150 100644 --- a/code/modules/paperwork/paper.dm +++ b/code/modules/paperwork/paper.dm @@ -341,6 +341,8 @@ t = replacetext(t, "\[logo_hp_small\]", "") t = replacetext(t, "\[logo_be\]", "") t = replacetext(t, "\[logo_golden\]", "") + t = replacetext(t, "\[logo_pvpolice\]", "") + t = replacetext(t, "\[logo_pvpolice_small\]", "") t = replacetext(t, "\[barcode\]", "") if(istypewriter) diff --git a/html/changelogs/greenjoe12345 - coplogo.yml b/html/changelogs/greenjoe12345 - coplogo.yml new file mode 100644 index 00000000000..3c16a53759e --- /dev/null +++ b/html/changelogs/greenjoe12345 - coplogo.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: greenjoe12345 + +# 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: "Adds a Point Verdant Police logo for use in paperwork. Make it with [logo_pvpolice] and the small one with [logo_pvpolice_small]." diff --git a/html/images/pvpolicelogo.png b/html/images/pvpolicelogo.png new file mode 100644 index 0000000000000000000000000000000000000000..a14c7934c009c534b0e35a02fd4299138096ced1 GIT binary patch literal 6857 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 PZ-JGitwog?E%E;WX{0S; literal 0 HcmV?d00001 diff --git a/html/images/pvpolicelogo_small.png b/html/images/pvpolicelogo_small.png new file mode 100644 index 0000000000000000000000000000000000000000..e719f84acbaec3787c8f249e8c9b2ebecce61742 GIT binary patch literal 930 zcmV;T16}-yP)Px#1ZP1_K>z@;j|==^1poj532;bRa{vGi!vFvd!vV){sAK>D02y>eSaefwW^{L9 za%BK;VQFr3E^cLXAT%y8E;2FkAZe8V00R<9L_t(&L+zHmZqz^&gL+jY1S*SiO$v*|3Nw1(Y3*)7gpD?yPWW8~iwp)`@<9|H~^3gqj) zeLirGtr|{S5nh~l_UgyVoVKqD*l(+b(?kT|K~!GDe7o(|X#3ZJy|(K5gk)wXTMj-? z>q8PilUdktvb3BVzq=sE?)1e^R(VqT#i>{;)!{DoJ%C#jfwzXyzbuKB#^p= zn$WuhCG_s{d2P*`2kABacH(QEir+U#^e#ftN)njYUL#24@~r%~hrdn?CV^;$-8g;M z>H1c@o{Q*`#NZMXh=hvO0TP3YQ2G$DM-QJaWNusnX(I!PQHj)*8I=T5S7wwFNL86p zOCXvIA8&*NB4zj$*rnqSFTJr62rs{}63Aa6F>Ipf5B0<;iou