From 309ee72d86bfe898390671457947db8c73438db2 Mon Sep 17 00:00:00 2001 From: ErhardSteinhauer <65374927+ErhardSteinhauer@users.noreply.github.com> Date: Thu, 31 Oct 2024 07:34:56 +0300 Subject: [PATCH] Goblin Posters (#2345) * Goblin Posters * small fixes * more fixes * meta * meta * grammar pass --------- Co-authored-by: Whatstone --- .../Markers/Spawners/Random/posters.yml | 5 ++ .../Structures/Wallmounts/Signs/posters.yml | 60 ++++++++++++++++-- .../Wallmounts/posters.rsi/meta.json | 17 ++++- .../posters.rsi/nf_poster12_contraband.png | Bin 0 -> 761 bytes .../posters.rsi/nf_poster13_contraband.png | Bin 0 -> 711 bytes .../posters.rsi/nf_poster14_contraband.png | Bin 0 -> 365 bytes .../posters.rsi/nf_poster15_contraband.png | Bin 0 -> 786 bytes .../posters.rsi/nf_poster2_legit.png | Bin 0 -> 617 bytes 8 files changed, 76 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png create mode 100644 Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 7fece809d6d..23ca4aac6f6 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -98,6 +98,10 @@ - NFPosterContrabandFsbLogo # Frontier - NFPosterContrabandFsbStasis # Frontier - NFPosterContrabandFsbApothecary # Frontier + - NFPosterContrabandEatShrooms # Frontier + - NFPosterContrabandKillerFashion # Frontier + - NFPosterContrabandGoblinFront # Frontier + - NFPosterContrabandGoblinate # Frontier chance: 1 - type: entity @@ -157,4 +161,5 @@ - PosterLegitRenault - PosterLegitNTTGC - NFPosterLegitMagnusWatching # Frontier + - NFPosterLegitGoblinTinkerer # Frontier chance: 1 diff --git a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml index 32db6578014..b60a0e9cb2a 100644 --- a/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/_NF/Entities/Structures/Wallmounts/Signs/posters.yml @@ -8,6 +8,16 @@ sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster1_legit +- type: entity + parent: PosterBase + id: NFPosterLegitGoblinTinkerer + name: "Tinkering!" + description: "This poster depicts a cheerful goblin engineer telling you that explosions are the spice of tinkering." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster2_legit + - type: entity parent: PosterBase id: NFPosterContrabandLvhiStation @@ -37,7 +47,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster3_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbLogo @@ -47,7 +57,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster4_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbStasis @@ -57,7 +67,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster5_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbApothecary @@ -67,7 +77,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster6_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandFsbSpirit @@ -77,7 +87,7 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster7_contraband - + - type: entity parent: PosterBase id: NFPosterContrabandEmsCoords @@ -87,3 +97,43 @@ - type: Sprite sprite: _NF/Structures/Wallmounts/posters.rsi state: nf_poster8_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandEatShrooms + name: "Eat Shrooms!" + description: "Eat Shrooms!" + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster12_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandKillerFashion + name: "Da Burkin' Fashion" + description: "A printed copy of what appears to be a hand-drawn poster of a goblin in a tattered tunic with a spear." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster13_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandGoblinFront + name: "Goblinkin, Unite!" + description: "A poster rallying goblins to unite and fight for their rights." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster14_contraband + +- type: entity + parent: PosterBase + id: NFPosterContrabandGoblinate + name: "Da Great Space Goblinate!" + description: "A poster calling to restore The Great Goblinate in all its former glory." + components: + - type: Sprite + sprite: _NF/Structures/Wallmounts/posters.rsi + state: nf_poster15_contraband diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json index 26b175e8ee2..9d26f34d345 100644 --- a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", + "copyright": "nf_poster1_legit by exincore and remixed from gentlebutter's Xeeenoooossss | nf_poster2_legit (Based on poster31 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nf_poster1_contraband, nf_poster2_contraband, nf_poster3_contraband, nt_poster12_contraband (inspired by poster11 from https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi and painting Rainbow Swirl by Saira Scott), nt_poster13_contraband (used poster1 as background from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster14_contraband (Resprited poster19 from cmss13 https://github.com/cmss13-devs/cmss13/blob/master/icons/obj/structures/props/posters.dmi), nt_poster15_contraband by erhardsteinhauer (discord/github), nf_poster4,5,6,7_contraband by dustylens (discord/github) nf_poster8_contraband by incongruenciaastrologica (discord)", "size": { "x": 32, "y": 32 @@ -10,6 +10,9 @@ { "name": "nf_poster1_legit" }, + { + "name": "nf_poster2_legit" + }, { "name": "nf_poster1_contraband" }, @@ -33,6 +36,18 @@ }, { "name": "nf_poster8_contraband" + }, + { + "name": "nf_poster12_contraband" + }, + { + "name": "nf_poster13_contraband" + }, + { + "name": "nf_poster14_contraband" + }, + { + "name": "nf_poster15_contraband" } ] } diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster12_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..250d6dffc238098c3687dd26ab81f8ed2d95a992 GIT binary patch literal 761 zcmVPx%vq?ljR9J=WmP<%fVHC%IGgoKyj;1MzV_4zLm9kV?hy)su*+L;gA&5XqdMpe| zigvn)))CRhaA6|UqFO{RFr?@qq7bDSHO}Dp8l~o%&BM8O=4y-4N!xS{CpYt7opU+g z|NGtV9QZy+D4~QB+F%*<6iGJQ;=h*=_&8QP&9R??c$d zZHx!pgnno=4L*<67uxN*e02c?fIUG^ zfkxCtP49o{YeAmXx>(gL0x&wZgF^!m?5TMeLjwC-!%Sp$vpHOZRQWo#rqFI*-xgRU zaVZ*QyeA8vHjYpE$+wXi9Fl}hDCGk1pt^x%Lz-S&{QxULJSSylmh%4jGz|R~<_~%S zsPFCs;PQITz_JRiCgEz0tT>IRJPtRW-U#kzXL!@=!!_$6Jt7~y~ zHs}V>-2zKyv{ar_aJQvnGbLlJ+{eZ8OdMUkR1JLspr-qY?#*EhC!mHFP(ur3<(b)j z&PU{wOy-xDn1^R5Iy_5JMh*bZirV-9m{N?GQjC}_0#-@HDv8KP0`v^~$T5||@yTeN zB{e<(W{ZH?BCPsml|)|c>ElYv0I8}U^=mQN*K$$2OV%IYPbmQ{2H|h=bN_A$routQ zvRjy{KgJKh;|K!LnOKei0s$FrUI*Y#ab5fXvhvLMykY!u7yzF)j8zgDYn-OJ?I8dK z`L_50tek^)?!7S(0Ab0^^L;vg04pUZ;Z?aoi`oTqQ~nP?dEpRgS;?_n(=;+#I(U5g rtZon8?*YAr7V-B*rRP16(1z<5A7A+lEr9S400000NkvXXu0mjf&S+i2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster13_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..464fa60913d1ceb64ca69b50fe717f90d514bfde GIT binary patch literal 711 zcmV;&0yzDNP)Px%fk{L`R9J=WmfcHJaTv!xJA3hEo}F#JU|ZW#>n6yENa!LY0ug(;DxsUYsl4!_ zHz*9Df=G$*s((NW3cCr)ib{kGD!MVsh*D>pPEDOV&24UTXI)sMAn6=kd9&};IfsYO z^Wk@XzvmptC6`=sS>x!`6m6=iO0NX|d3gA*e1lq8&>z#(-0mt+Ri|3u*BAx+AD<_c zpk|h!wXspKGk0=AI-zP$uU??2Rlw8gCOjkK zX?2ql6s#=+J>-Zj^<++ z>qyZ!py%0uM8}i`gDns7l0r?d4Cw#8Kw@MbUm#66P(BGRrwRXf2$#c3SD}p9R!a2T zjB1{yR}gDfFjSZU0hiMTfbPeT_60(iDkKscw4DUi0!O=>$oGht&l*_ND~ts~n9X|T z7Zwo} z_5~6r$2e%&pPBa$_Ly-ytN`@wwXpkPn4}UUdS;ZoN-6sS^>wz)_2VbA?CXsZ3McRd zLb$v!K5fne;9`FpiBrDp3ye<4zuo)C=dg+<(mL4qA<2Zt1idPom#a;7XvRu|Y-vPcM%1I^#Ci?&Y002ovPDHLkV1gM0OfUcd literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster14_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..1424052c5cc30b24f24e20c3ceb92a74468d436d GIT binary patch literal 365 zcmV-z0h0cSP)Px$CrLy>R9J=WmcI(ZFc8K+|1Ay*qFo$>N};2VCiFRqKAK~pSa9glVnGKNl{iRa zqE+ugwM)L`3OVlkCAlL7tgNi88di&v8q)xRGC*mbg+8*-hqstiMlJ*ypfvXu z6LRrd0p2N13N8K(pfo%kuUh1aJcgy>O^*JcBMqOgBn|-t(eD8IgAS(dNS;8v$>o|! zf3N|j?nsNKcW(@kCWSOtK}=!DO*rcUP7r-;w$t$nCx|d(Y|Cg0s&@L9F;q`MHB6Jj zX!mS@Ux*B#KDBk`vQB_fm}AZc0DzTv7^F#|^@6%aRpY;8R*mZhzvY$l>3+M500000 LNkvXXu0mjf9)g_P literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster15_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..4246162d351a786fc1872bf248d258ad2affdc79 GIT binary patch literal 786 zcmV+t1MU2YP)Px%%t=H+R9J=WmQP5NaTv!xhU?Xr4fk%v``-8k6_H)S zd&f|Zow}Jw7cWtohYca8<;|hSh)P6^7q>9~Fkgq-)DCMeQ_;Pm;AP*-`~H5XTw=>8GETmlTWAcL;1=M08MiOjYWs2NTRR0fEuaRN2NL}uHG%(gQyP;EG8 zp;5=d&?r$g4#4}VCcF-XI*;$a^%bALO%qk)cpVCJsU`+P3U`|tbLKTvfx*zI{+=PJ z^Y{=YD>kPaQL<9!@!@qSy2!(EXA+Q24Cv%VW;-T9q{wX7?|~yi&MY9CJbUm=f~Y@5 z$$B8hs0c$d;B_eUhtvIh^Xw0zWW{24A`3AjtA(}o4X`@_=nS;*@bwh{IvR4fz>t9c za3d8rt^y!RDJ*s;RkFsukYsr|L8V7QTGIGVT13V-Bl;v5YC%WCD04H*%*`xQWVRy< zF_I|_MRrkHrC=%)Nv1SpAx4qeuKS)_1)^%4TjlA+^P%SslGTFj67bzDLAYGT_RcB* zzkh9`CenhVYW)0W;4s$KH?Upb<;l}~`rYFPeXOk~fs#|@GCYKU{za12LaA#F7o5&S0;knj887GrLAOb$lNg8 zg0}ivT7v75y_d?PzCBdK2pVH$U;oNGYKL# zr&}k_EF}P0h> literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png b/Resources/Textures/_NF/Structures/Wallmounts/posters.rsi/nf_poster2_legit.png new file mode 100644 index 0000000000000000000000000000000000000000..747de9bbb5e52f1d7ad09c68b1e7cb913537b197 GIT binary patch literal 617 zcmV-v0+#)WP)Px%BS}O-R9J=Wl`&{jQ51&1s#JKOU`v~XiV_l);-I8B+KxrRxJZ{G7F|>%w2OjJ zv=l6*B6X3V2s*eF92yYo;1KB$kkq6Itv*6^sPCmghYr!$yn7v@&xRNEzW6|d_fPj6 z&i((NdpPHU4<9~!{A0AJ6zz*dWHaP?q3}okZK`CE;Rmk73)4eNb;<^$u()=lm9dv! zNyhgAU>JrS8-_tB6tZ)wP;No^(mep~oY;eDngoMEKFmjddFR}C#M>4~VF7Sqb_IaZ z_9#c=zqv53#_Pg>sE;25E6%zX3(y-=Wo_aGMgzwI$Q=Y3cGl%9jq`tPKvXvX7+akM zAUV`c|G*&6W**T$Fv!}ww|tRX0XRS132b<4z+uP|^qhK+umng6QhpbP@5JggI8$p+D==?P5|^=saA8i!>*ry@`lBSJG`9&Vbz{=$(#hUmh0JnwNCg4 z0$pvWwqT2@0dP)2dEG+KmH1Rzw{x4%o*EF2V=a4NPjsmZ|HXtpB_{dx>?u!GdJb4`wcOjipWp&X4DFjjo zZY-XrHwLkbKZS1IpQ0}giOcH3t_=vQ%Eaq4WQ&mAwCU0*$Ye5gu^YHrMA;&Y9K-Pk z%me~(yLN6_aA!by5tYkjSHzm8dAo=-O>