From 536a8cd5d40b3c7a04225e04a4c06ea218d95d35 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Wed, 13 Apr 2022 15:38:34 +0200 Subject: [PATCH] High effect engineering (#7528) --- .../Markers/Spawners/Random/posters.yml | 3 + .../Structures/Wallmounts/Signs/posters.yml | 29 ++ .../Wallmounts/posters.rsi/meta.json | 329 +----------------- .../posters.rsi/poster52_contraband.png | Bin 0 -> 360 bytes .../posters.rsi/poster53_contraband.png | Bin 0 -> 1073 bytes .../posters.rsi/poster54_contraband.png | Bin 0 -> 1274 bytes 6 files changed, 33 insertions(+), 328 deletions(-) create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster53_contraband.png create mode 100644 Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml index 443b6b68bf..9605ba9a37 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/posters.yml @@ -79,6 +79,9 @@ - PosterContrabandGotWood - PosterContrabandWehWatches - PosterContrabandVoteWeh + - PosterContrabandBeachStarYamamoto + - PosterContrabandHighEffectEngineering + - PosterContrabandNuclearDeviceInformational chance: 1 - type: entity diff --git a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml index 5901af01b4..4ca2f5f4ce 100644 --- a/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml +++ b/Resources/Prototypes/Entities/Structures/Wallmounts/Signs/posters.yml @@ -499,6 +499,35 @@ - type: Sprite state: poster51_contraband +# These 3 originally from VEEGEE +- type: entity + parent: PosterBase + id: PosterContrabandBeachStarYamamoto + name: "Beach Star Yamamoto!" + description: "A wall scroll depicting an old swimming anime with girls in small swim suits. You feel more weebish the longer you look at it." + components: + - type: Sprite + state: poster52_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandHighEffectEngineering + name: "High Effect Engineering" + description: "There are 3 shards and a singularity. The shards are singing. The engineers are crying." + components: + - type: Sprite + state: poster53_contraband + +- type: entity + parent: PosterBase + id: PosterContrabandNuclearDeviceInformational + name: "Nuclear Device Informational" + description: "This poster depicts an image of an old style nuclear explosive device, as well as some helpful information on what to do if one has been set. It suggests lying on the floor and crying." + components: + - type: Sprite + state: poster54_contraband + + # Legit - type: entity parent: PosterBase diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json index ffe4c195b5..72d65083f3 100644 --- a/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json +++ b/Resources/Textures/Structures/Wallmounts/posters.rsi/meta.json @@ -1,328 +1 @@ -{ - "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Taken from at commit https://github.com/tgstation/tgstation/commit/f01de25493e2bd2706ef9b0303cb0d7b5e3e471b", - "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": "poster49_contraband" - }, - { - "name": "poster50_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": "random_legit" - }, - { - "name": "random_contraband" - }, - { - "name": "random_anything" - } - ] -} +{"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", "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": "poster49_contraband"}, {"name": "poster50_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": "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]]}]} diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster52_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..c2dc01e3fde1da6691a4620cc459ef87f7cf717b GIT binary patch literal 360 zcmV-u0hj)XP)A-$sMQBV=ja|Np~?;H7FKBP0L+{|!+EUE2Sb(?Jq~FboAy z6hfjl0il8W-_)ewLPK@M?@TxUP1-KnG$ogi<|DEHFPblK{mO};-4npO=>CDWgWeNB zzooOl58(ACjsYUU4WSCWzvCV2fO>q`0!R_0lxzUmW@8|wBan!QnXIn?CxU=j2T4$b z4#6;%h~;RvBizR|pOZ<&KU_AuOqFe`M#5}VBp4SLY{Jbxf+YmQq!s0Xl00003f{{dLh9DEeU6`U6S3W%FIXPdRU!J3jj0iF133&ia zwHkG_VT(4#m@%mO$BTUckw%8c?&|63admZda&mHZb{31po}QjwUS8hb-U@|6CX>0l zyW88_ySceZBoet?u2QLHXJ^Mp#xoPMd=y^33YiU`&k(|5fki+mC>w+U-)wV8kWYkG z6C4m!Rb2Ia;(6aMeOk4~U*%=W<+2Q?0RsmGtN>ShB4UI*#^|%K;4qEmNL+%0gF|m` zuSm23+~40X5C~RRSJ&3o%+1YRTwJ(ZE~V7b(a{(z0mx1;=Rv;*yB?f3uZBBsTX=)# z37#Ch0PwQGtAmjgGzv@t$W>SqLU5bxG$|oTCUp~w>`bT;rG!v$DMuo*Q>#<~ zDu3NM-Q>iiR4Nq;g;^Ku#tf~nPDe+?AaHv8xWTt+)j_e!`?q4c!+s02?8?yU!){f7 zn-&uq6hyB_F806N@vJE|dhVrIsVjAfIODqF5qYA&&`fM^cSd4-DlBZzxsJ`*u0n+5iFeio zi91-ED|(gNFc3e>Sundd#A#gkNw_VNVWDey=3m)I?nf&gq;Bu?JATKiN_%+a*^u{z z>4_4>g!i$Oi@Ju;hb4#K|8>Xh%JxnAy5dUvtEE*xt8etxK5k)ZmYSZvkSDa&ilcl5 z>0_~#`Q&r?uhX_NXW0q@9e&g+Vb#eSv3iL>#u@yUONVAqq5 zk7McJe*>5Gukz-Cb4zpQg3EdHE2}YeTU_GZ_epC!YT7#E2KTiWWuE+U=FwE%tdV{? V{b);5$FGJaq1_dsZViqv{2zXRXzTz0 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png b/Resources/Textures/Structures/Wallmounts/posters.rsi/poster54_contraband.png new file mode 100644 index 0000000000000000000000000000000000000000..1e9ce74c1f2e577445465cf8d5323ade7ee4cac6 GIT binary patch literal 1274 zcmVg1&fv?+*l1_rS6AIhN!>$3p?A|l5vEwDsH=F!mEPfyf9K+-rk&owpBG&RmLGtMh4&?6bJJ*wYBcEweGaD@wK(%zrWna#@W!(ii(PQ zdV0~((O+L*S65fb$;nJiOvc8>Mn*dLY$#{5pWn^MkR#Hq&NJmIR#m2!!MnT5M z!bnL(Mn^$JML$AAJwii1#l^!6sGgekGoQr!;>uJ^-JgCabPPSYA3)Rzp-+L1AV_VPZozFCU(ghCnkQUQ#M_XCtSXL8O#2b!QJx zLlHnZ9nQ?X($dgVRY*=zKvPUS;>5aaK{{zYH0!*qSt<~OQ!-X1097LZUoRWuzO~ZF z!OzdlhiGGoU0Q=yQ-4oQdPzleLq2msIB`EXaXve2Mn%-d#(8gTqLhd$H#$zfjBrg$;Zffb@;mg0004WQchCjG?kVG4WCc%Ee*gNxwNm>ZFFPYUw~)ZE=YkA(kgah4FDNYW*6H=@-;Ws{FflPR zXiA~Rg~ch)zaIqt!u-a-B=C+;eio7fZ|To`kL5o75WgtFApZZ70ptC@EL;C0xj}$i zgysEn#T(!CzcYXT!GB9mzLLvFeD%p#F?QgU;_J^8!1)7T*rcxQR*1VIv9>HGHr5W*lo>(8k>zE k|NKMESoQyj%6gOo01N?m$-fRVH2?qr07*qoM6N<$f~i_wZ~y=R literal 0 HcmV?d00001