From 0fcbbb50e4d414c19e9b73f4b168afc99dc9c261 Mon Sep 17 00:00:00 2001 From: "Tad \"Taddy\" Johnson" <120885811+TadJohnson00@users.noreply.github.com> Date: Thu, 12 Oct 2023 07:09:41 +1000 Subject: [PATCH] protection of ass division (#161) Deathsquad? Don't you mean "deaf gods?" --- .../Structures/Wallmounts/Signs/posters.yml | 2 +- .../Wallmounts/posters.rsi/meta.json | 2 +- .../Wallmounts/posters.rsi/poster29_legit.png | Bin 1201 -> 1673 bytes 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 40d643f912..65eb84a5f4 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -848,7 +848,7 @@ parent: PosterBase id: PosterLegitEnlist name: "Enlist" - description: "Enlist in the Nanotrasen Deathsquadron reserves today!" + description: "Enlist in the NanoTrasen ERT reserves today!" # DeltaV - expunged blatant reference to Division of Asset Protection death squads components: - type: Sprite state: poster29_legit diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index b0d8f4e681..94c1af9c77 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1 +1 @@ -{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} +{"version": 1, "license": "CC-BY-SA-3.0", "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b. poster52_contraband, poster53_contraband and poster54_contraband taken from https://github.com/vgstation-coders/vgstation13/blob/435ed5f2a7926e91cc31abac3a0d47d7e9ad7ed4/icons/obj/posters.dmi. originmap, poster55_contraband, poster56_contraband, poster57_contraband and poster39_legit by discord brainfood#7460. poster29_legit modified by TJohnson.", "size": {"x": 32, "y": 32}, "states": [{"name": "rolled_contraband"}, {"name": "rolled_legit"}, {"name": "poster_being_set", "delays": [[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]]}, {"name": "pinningposter"}, {"name": "poster_broken"}, {"name": "poster1_contraband"}, {"name": "poster2_contraband"}, {"name": "poster3_contraband"}, {"name": "poster4_contraband"}, {"name": "poster5_contraband"}, {"name": "poster6_contraband"}, {"name": "poster7_contraband"}, {"name": "poster8_contraband"}, {"name": "poster9_contraband"}, {"name": "poster10_contraband"}, {"name": "poster11_contraband"}, {"name": "poster12_contraband"}, {"name": "poster13_contraband"}, {"name": "poster14_contraband"}, {"name": "poster15_contraband"}, {"name": "poster16_contraband"}, {"name": "poster17_contraband"}, {"name": "poster18_contraband"}, {"name": "poster19_contraband"}, {"name": "poster20_contraband"}, {"name": "poster21_contraband"}, {"name": "poster22_contraband"}, {"name": "poster23_contraband"}, {"name": "poster24_contraband"}, {"name": "poster25_contraband"}, {"name": "poster26_contraband"}, {"name": "poster27_contraband"}, {"name": "poster28_contraband"}, {"name": "poster29_contraband"}, {"name": "poster30_contraband"}, {"name": "poster31_contraband"}, {"name": "poster32_contraband"}, {"name": "poster33_contraband"}, {"name": "poster35_contraband"}, {"name": "poster36_contraband"}, {"name": "poster37_contraband"}, {"name": "poster38_contraband"}, {"name": "poster39_contraband"}, {"name": "poster40_contraband"}, {"name": "poster41_contraband"}, {"name": "poster42_contraband"}, {"name": "poster43_contraband"}, {"name": "poster44_contraband"}, {"name": "poster45_contraband"}, {"name": "poster46_contraband"}, {"name": "poster47_contraband"}, {"name": "poster48_contraband"}, {"name": "poster50_contraband"}, {"name": "poster55_contraband"}, {"name": "poster56_contraband"}, {"name": "poster57_contraband"}, {"name": "poster58_contraband"}, {"name": "poster59_contraband"}, {"name": "poster60_contraband"}, {"name": "poster61_contraband"}, {"name": "poster62_contraband"}, {"name": "poster51_contraband"}, {"name": "poster1_legit"}, {"name": "poster2_legit"}, {"name": "poster3_legit"}, {"name": "poster4_legit"}, {"name": "poster5_legit"}, {"name": "poster6_legit"}, {"name": "poster7_legit"}, {"name": "poster8_legit"}, {"name": "poster9_legit"}, {"name": "poster10_legit"}, {"name": "poster11_legit"}, {"name": "poster12_legit"}, {"name": "poster13_legit"}, {"name": "poster14_legit"}, {"name": "poster15_legit"}, {"name": "poster16_legit"}, {"name": "poster17_legit"}, {"name": "poster18_legit"}, {"name": "poster19_legit"}, {"name": "poster20_legit"}, {"name": "poster21_legit"}, {"name": "poster22_legit"}, {"name": "poster23_legit"}, {"name": "poster24_legit"}, {"name": "poster25_legit"}, {"name": "poster26_legit"}, {"name": "poster27_legit"}, {"name": "poster28_legit"}, {"name": "poster29_legit"}, {"name": "poster30_legit"}, {"name": "poster31_legit"}, {"name": "poster32_legit"}, {"name": "poster33_legit"}, {"name": "poster34_legit"}, {"name": "poster35_legit"}, {"name": "poster36_legit"}, {"name": "poster37_legit"}, {"name": "poster38_legit"}, {"name": "poster39_legit"}, {"name": "poster40_legit"}, {"name": "poster41_legit"}, {"name": "poster42_legit"}, {"name": "poster43_legit"}, {"name": "poster44_legit"}, {"name": "poster45_legit"}, {"name": "poster46_legit"}, {"name": "poster47_legit"}, {"name": "poster48_legit"}, {"name": "poster49_legit"}, {"name": "poster50_legit"}, {"name": "poster51_legit"}, {"name": "random_legit"}, {"name": "random_contraband"}, {"name": "random_anything"}, {"name": "poster52_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster53_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "poster54_contraband", "directions": 1, "delays": [[1.0]]}, {"name": "bagelmap", "directions": 1, "delays": [[1.0]]}, {"name": "deltamap", "directions": 1, "delays": [[1.0]]}, {"name": "marathonmap", "directions": 1, "delays": [[1.0]]}, {"name": "originmap", "delays": [[1.0]]}, {"name": "moosemap", "directions": 1, "delays": [[1.0]]}, {"name": "packedmap", "directions": 1, "delays": [[1.0]]}, {"name": "pillarmap", "directions": 1, "delays": [[1.0]]}, {"name": "salternmap", "directions": 1, "delays": [[1.0]]}, {"name": "splitmap", "directions": 1, "delays": [[1.0]]}, {"name": "lighthousemap", "directions": 1, "delays": [[1.0]]}, {"name": "waystationmap", "directions": 1, "delays": [[1.0]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster29_legit.png index e57d2b74fb3d90480ac26adebbfa883e35af9840..62a6496e596dc199ed43e43d097e2a8ce85a65c5 100644 GIT binary patch delta 1638 zcmV-s2ATP>35gAmBYy#LX+uL$X=7sm04R}lk-tmBKorNnZPga76x2b)Aww017D@$i zlnQpK4s8XiF3B}%g(QYciWFDD#i8IJy7+7GKhRZhRS*P45OH(&*CHjpYYHvWzHoUT zzW2V5yLW&;qcg+qNdSiF@N7CItrS+J;5+)@!w^D9%FMPFbAJnYbd8@!s-<{{i(cL9 zI>tazwHe?G5zjD-JH&IunJvc>yhl93%5stTggD0OfW)^#S3G_bT=Mu!FwbY_0l(-e zmD*ToV^-z{@f2~?&?~HY9&wYfYA)v}kI@>3jV#hgL4tw`HlV{noU%zX>+DN3d`s9Q z52L?@DmXbxD1VbTMrwt+s+2X-Rr+*P#oYhT)7GYwUiWYc=zVqF&j}#757cX}`+MrT z^)n#w0$iId|0d08_M7xtON$-@ksaXjrllzdz|}4=`fSNuZb$)IeoX^DE`Y%TFnka6 zuX(d-?&JIk$ZyjV-2sP3z$Dd2*8c$BsAu~bjDf!Z0FfgWf4)gXK~z`?NCg`LVAZGUr%7=fB@Qum7BL&;J9w?_@J2V03h}kjv#@ zv)SNqIN)-*e_*%U)tcDp=_!tnkJTRcN!e^xaqcxXHY)i-p`dgd8XAzvWU#ijR^iX7 zw95X_$>QQ-847qjo(jwaBoc`Vcy4a40wZ8Iq6X0F{Li*FOifL}$_EApN?KM~4Kjl! zGNMeQl{_A|q(3VuKf#R~pCDN0#O&-Wf+D22tcQmKe_#-l0}2({%IEV|lcjrO30Qwk zbnbAl-f291_!H*mZzAHzA{L7vBtqno=}F9gaTBj!AK~%ipK<&4XUOGTDhOSU@`uv) zjTvCmkeEuFEvKA6d-fY!{4Kjp`z z_?SvF<=Ai3vl8ckiOx%%N$3o)f!Kt(Ts^K|fB#f9VKjPxe||hhcwr4$`8nkmf8fQz zl@)Y%cgf)Koi$-`KaJC{DH z!;>d}NR|$;v$G`u)45G_-wdQ`0T`RmDqI{YHYtM>Yt246Y8gC#{ug|{?$X6I@n2&x ze>n{!$~mJm4J6`LG6qmrSEppG1~~PCf^zVXVzFrH;#vfG<|@5__>l>YemxZ+$B56Oyh?d|Os4#F6Kbq>%u9jvdf<7+W)rQY6N>r(Ag zj`HO}oD;Mxj7@lQa#9juKd=;$NJKqle>`41j$>nE2#3RvS2s2`Hq^e?>y_j8MqZz$ zk}<X7RC(+f_rQY>49F0b0+|DR7%gf6pbLAMn4cu;hvtJ!s_a3ExmW%3k1~YuJC8f0OvrcsDP=X zqvE%paFY5Ctbyssv>w+%4H|gO9_W)3pgWk3FG6(8i==r->{KIT0Qy^BXCZiI>}^3% zjxts`VztOv0;jVGGXt8K39kF3G_N!$oOn=pNO*$#a!(nqNv-N{^*zK#R3084F7O*p4R2O-)VeUo*}VzE?OC k4i69cE;0Jk_TEqaKmAKO(yuqQy8r+H07*qoM6N<$f>4ec0{{R3 delta 1164 zcmV;71atd|4Y3K3Ba@&37Jp+&L_t(|oXuBTOH@%5UNhbumGXXX)VzV{gX9ouqJa-e z5kZi?`4Bw`5xqtKph5@=3K61w4g^8yMWJK{M5G5t2Xh#&gO@-?bVkQ%eY@GG8WV3mY$w2%*9Z*MPoJRU(r%I@v$Df=OBngHCWRVT3E=#-$^j^c)llZ& z-K8 z#S0P$TGIq#ofqI`WkAZ^F=ein9}mylqonkZ5CNnQ0Qaen0e=CP_xSduE z?ru6fJQVdIGc%Kh*qz_m8((>?3t7QuKg#n!Lqmg*pPQRIM& z*xufzQIKK+KY!le6LX_1Z?oB`xVTu1ktIk+bucDGKr8%+i_2`tNB+7Sl%1U|VqvDR zkg|DghQ|>u!w zsffprmv@7@8k#1Mnwl!wrlux}us2YczF139^r@tzM1PS(KqBz)03ZQ53(I34jscI+ zJrTDK)YjFJXL*^@_=dxILJ3IV%+W`S07W03z_|yx#XiJBJm?a@i@LhHl)g23<>KX` zP)H~Pp74F}T(uAD!T^@XKA^I)Qg|U@0>DF`kG_RBXr0} zr(dN{bv$4~2@{Z2Yjbl`nZuFH&(DiOBb6aNqcu?kqTB5jaz6H)S;X|f^z=0K^z;Y| zaU>ON6$l{c@PLHOb?F5Fa)=XrmO%z&kOi^gK!2Bj`sTt*8aSfY*4LG>v>q{V9YsgA z7jl<4CfuAkf9(MT7O=3eV7Pfm)5d~PF^X9S#-lD9=Aav6i-w{#UG`(mDdbe+fB`wf zEEr@rOZIAoMo`O05_r$kL}EaG>%$A!3=4)e7V04oC8{Q3WPMBmG6n`!H5{I}&Es*6 zC4ZO?L|Z8jnRu6wApxxiw2(?)McpegZt@C_O8_2t$GMGy^tz*isH}`e+S)|PP33R@ z5BSUB7GF+pIy))MmlIlBeZ9EK@zpdjFd$;-xVf1=_V-h1Y3aGbW=LRZY008DulL>m euek8P