From 454714d99d15a1c39ffc8983fcd67d7f07946d3e Mon Sep 17 00:00:00 2001 From: feartheblackout <59633984+feartheblackout@users.noreply.github.com> Date: Sun, 6 Nov 2022 05:17:20 -0600 Subject: [PATCH] Adds a Venusian flagpatch to the loadout (#15015) --- .../loadout/loadout_accessories.dm | 1 + code/modules/clothing/suits/modular_armor.dm | 7 +++ .../feartheblackout-theloraxflag.yml | 42 ++++++++++++++++++ .../kit/modular_armor_accessories.dmi | Bin 5673 -> 5906 bytes 4 files changed, 50 insertions(+) create mode 100644 html/changelogs/feartheblackout-theloraxflag.yml diff --git a/code/modules/client/preference_setup/loadout/loadout_accessories.dm b/code/modules/client/preference_setup/loadout/loadout_accessories.dm index 65fad6be15b..0a5dd2d4114 100644 --- a/code/modules/client/preference_setup/loadout/loadout_accessories.dm +++ b/code/modules/client/preference_setup/loadout/loadout_accessories.dm @@ -534,6 +534,7 @@ flagpatch_national["flagpatch, visegrad"] = /obj/item/clothing/accessory/flagpatch/visegrad flagpatch_national["flagpatch, silversun"] = /obj/item/clothing/accessory/flagpatch/silversun flagpatch_national["flagpatch, callisto"] = /obj/item/clothing/accessory/flagpatch/callisto + flagpatch_national["flagpatch, venus"] = /obj/item/clothing/accessory/flagpatch/venus flagpatch_national["flagpatch, konyang"] = /obj/item/clothing/accessory/flagpatch/konyang flagpatch_national["flagpatch, elyra"] = /obj/item/clothing/accessory/flagpatch/elyra flagpatch_national["flagpatch, coalition"] = /obj/item/clothing/accessory/flagpatch/coalition diff --git a/code/modules/clothing/suits/modular_armor.dm b/code/modules/clothing/suits/modular_armor.dm index b3b22f0236a..019877a730a 100644 --- a/code/modules/clothing/suits/modular_armor.dm +++ b/code/modules/clothing/suits/modular_armor.dm @@ -402,6 +402,13 @@ icon_state = "flagpatch_callisto" item_state = "flagpatch_callisto" +/obj/item/clothing/accessory/flagpatch/venus + name = "venus flagpatch" + desc = "A flagpatch representing Venus. While not trendy among people who have use for wearing patches to begin with, the \ + Venusian flag retains solidarity among Cythereans and Jintarians both." + icon_state = "flagpatch_venus" + item_state = "flagpatch_venus" + /obj/item/clothing/accessory/flagpatch/coalition name = "coalition flagpatch" desc = "A flagpatch representing the Coalition of Colonies. Although used on many Coalition worlds, this flag has also come \ diff --git a/html/changelogs/feartheblackout-theloraxflag.yml b/html/changelogs/feartheblackout-theloraxflag.yml new file mode 100644 index 00000000000..299f2414406 --- /dev/null +++ b/html/changelogs/feartheblackout-theloraxflag.yml @@ -0,0 +1,42 @@ +################################ +# 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: FearTheBlackout + +# 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 a Venusian flagpatch to the accessory loadout." + - imageadd: "Added the sprites for the Venusian flagpatch." diff --git a/icons/clothing/kit/modular_armor_accessories.dmi b/icons/clothing/kit/modular_armor_accessories.dmi index d17001b1544726c2a95e2f741886ee803cf51147..9aa5ba76c098b6c43ac4b2f6d668f04b82699935 100644 GIT binary patch delta 5400 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 delta 5164 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

GCh(8;mzLJvm~8{L_tPIYiAl|b8f6G-C$eA zvC4f|EXn)h{|Fyq_8g7xlDWEqx0H@dz-uJ`G9$8m`;>4xdTGrC`k{8Mm68cov+suY zhQ+SpYOZp2>{~Y35hJfG;#dKahJ)MZUkL00Eg)E?>YojU2S1EI_`5;35618GvFiS) zm{PR>1``jnUz4qO>bn9r>qodjS5ffg{q=ZOblyuY4^iK<8(+&+ib~)+>$)Q?%Ojs(V+s9%hT7gA)lhN!!nErMu81_ zei)PAIh28zceXA9?&ZdX-M0goi!(@>#)V~eE&}6u4c94=ZmX(J%&T2t`Hfs28qnz4 z!qBtdoX*Eg;~e1hHKf~$>I_bjvO6D%@i#Q`he{_2U(obV&V?}pJnXy)FP!&#&j_*= z)RLAT*#Q%WM^UgGvsEG8Qv>ewXFKtR9No)E%8- z+|3dhbQ9B6d3qn1)A64^D6@Q&8i%#cX7T8|^eO|-36)%0cj<$PNTwXVmecl4wc8(U zn{UNSeK~PV`55>at9jsuYGw_=z1vYjcfY^4e~!Wrsj?W92c_! zHxAdPN)Jy^0p|^4`Rvzdr*U z4AnJJ7aAX_ps+osY_hzG+psL6!xC1Ku_r<6nr6C8-Jsq{k<51B?gC z$^Qm`z>#cas>r5XUw`kz#DM7@>&AJC9|K9lpM-s)4&`9u-}bAS#_^i+;$@%b6vKaT z4p%;1%~t;uiX!}k-4ix|4_DU1kc+s9dCoMGx4b>*OEG@%vYwRpqk4K*> zw0!l)L{2}5U7Y?m5;+!U|MU$g?2ptA*Zr=;7HIySm@}hfA)F1cdaTFrJ>s9r)7OE8 zj+`tQoXy2R&YQ>*Nx|{k%-i4&d4&V>QVK`4CcY5)N%0j>clK^PMA^pQYeYz@&|&CX1?VmU`!TT-R{EpiiG$*f%&OVs#Bn3ovd*r)ayg6$}{8O=%XD`){c7_%EM%d9FUB?TO$&|HgDqPE`k;XO3kJHL1(*)D2Rv@78@txxpnig!_v>bvk}jEz8}}z+^!nI$7OynXYM#h;!}~9S1q1v$fcy32fmL7Q{hYKy zkWMKO^Qv{FVq;R2&^BqpWEh5wuRW%{NwpyP{&%4X@p^kB42j2tDCj#oxfOwD`M{TH z!Np^hH}eCz2G18yaV!B2K(-LSN=Z~-mqW!22xtG5=3hH(9ZjSs5kZ1lAiRf*WB=Cw zOsA@z%-R`qVTI-mw?J zGp6pa-0hYPiP0{CDE4G;B*u9J@B>pXb>r1o35tD{eB9!1#Vbugxa=Weci~{Y*OA zVqY?=kWXZPUnymOJGmQOx26OQaKX~NmaDY;KC;FV2&*xb3XvC|1=U#(V=B?d!V6Ds z)Ufy-G_+yQ=SCGOY2+&)KG$!1dH-Lk#a%AQ?BGv*XZZTxw4R*$6PI5$ zQ(Iz1Izx_$WYEC{Te)=5ECsN zZCH$=ka!M}{^rM%L!4H-w8JU*D;y%-iY2AX`?t^zDwF@ezc@AfGkT{`p0}m(ztQKz Ny4nx4$~A1m{sXNV^>hFL