From 8f1ec1a09efdc885ca4c6d2566c7289723efb2e8 Mon Sep 17 00:00:00 2001 From: T-Stalker <43253663+DogZeroX@users.noreply.github.com> Date: Mon, 28 Mar 2022 23:17:34 -0300 Subject: [PATCH] Adds dresser, television, and a fireplace (#7327) --- .../Structures/Decoration/fireplace.yml | 19 + .../Entities/Structures/Furniture/dresser.yml | 9 + .../Machines/Computers/computers.yml | 28 + .../Decoration/fireplace.rsi/fireplace.png | Bin 0 -> 1688 bytes .../fireplace.rsi/fireplace_fire4.png | Bin 0 -> 1160 bytes .../fireplace.rsi/fireplace_glow.png | Bin 0 -> 1179 bytes .../Decoration/fireplace.rsi/meta.json | 63 ++ .../Furniture/furniture.rsi/dresser.png | Bin 0 -> 812 bytes .../Furniture/furniture.rsi/meta.json | 5 +- .../computers.rsi/detective_television.png | Bin 0 -> 238 bytes .../Machines/computers.rsi/meta.json | 700 ++---------------- .../Machines/computers.rsi/television.png | Bin 0 -> 600 bytes .../computers.rsi/television_broken.png | Bin 0 -> 270 bytes 13 files changed, 177 insertions(+), 647 deletions(-) create mode 100644 Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml create mode 100644 Resources/Prototypes/Entities/Structures/Furniture/dresser.yml create mode 100644 Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png create mode 100644 Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_fire4.png create mode 100644 Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png create mode 100644 Resources/Textures/Structures/Decoration/fireplace.rsi/meta.json create mode 100644 Resources/Textures/Structures/Furniture/furniture.rsi/dresser.png create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/detective_television.png create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/television.png create mode 100644 Resources/Textures/Structures/Machines/computers.rsi/television_broken.png diff --git a/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml new file mode 100644 index 0000000000..6273331230 --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Decoration/fireplace.yml @@ -0,0 +1,19 @@ +- type: entity + id: Fireplace + parent: BaseStructure + name: fireplace + description: A place that has fire. Cozy! + components: + - type: Sprite + netsync: false + sprite: Structures/Decoration/fireplace.rsi + layers: + - state: fireplace + - state: fireplace_fire4 + shader: unshaded + - state: fireplace_glow + shader: unshaded + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#FF6F00" diff --git a/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml new file mode 100644 index 0000000000..0978a79e3d --- /dev/null +++ b/Resources/Prototypes/Entities/Structures/Furniture/dresser.yml @@ -0,0 +1,9 @@ +- type: entity + id: Dresser + parent: BaseStructure + name: dresser + description: It is filled with underwear and shorts, finding an unused one is a gamble. + components: + - type: Sprite + sprite: Structures/Furniture/furniture.rsi + state: dresser diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml index 22c7a91bc7..255e1bfb88 100644 --- a/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml +++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/computers.yml @@ -444,3 +444,31 @@ radius: 1.5 energy: 1.6 color: "#b89f25" + +- type: entity + parent: BaseStructure + id: ComputerTelevision + name: wooden television + description: It is an old television displaying the station's cameras, if they worked. + components: + - type: Sprite + sprite: Structures/Machines/computers.rsi + layers: + - state: television + - state: detective_television + shader: unshaded + visuals: + - type: PointLight + radius: 1.5 + energy: 1.6 + color: "#b89f25" + - type: Fixtures + fixtures: + - shape: + !type:PhysShapeAabb + bounds: "-0.25,-0.25,0.25,0.25" + mass: 50 + layer: + - SmallImpassable + mask: + - Impassable diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace.png new file mode 100644 index 0000000000000000000000000000000000000000..93afdb46e3e7d175fea9b383aa4dc8e88e378cc2 GIT binary patch literal 1688 zcmV;J250$+P)O+Hx57oqv z#zqt4OaBP}3ZEOFO#5m=lSWKzOdA{2ghZPP5-Fru4YC%N!m{iayX=nlcZV}OJ1o?8 zE(2uumrQ2wnRDmf`@83yd+wd}QG=sNfSZjC4i4(ENSV?(uPL*afw{Rk&8&jMK2Ex1BJYilb70)ZM?z39&}=(`112|KWw6sXssR50C zU(hL=&DO}E^ZIaM%Ubn0T|e&izjJz{vT6@0TV@Q^q_NP?4DcQa!x>3G@uW6 z`l&q@C0*C+>J)`(^DHN`&(g-m2DP=d$@_bwahkYWGG)oThUvp?E)I9qf1yBXGfUIS z60Ky4j&cRZ1o*rfwFW)Z78bACtGnw78aR8xEMlNch+PJkfD0^qpCAhRX)lzE9@)0z z{*z0%p9s;A;NaY=JgB0$jNf+I`0WtwJ2Zv)p=$(aGdF0Q&dZs`fX8pIQg?SZB@&4m z8SCx~os_}V-5>@gRzv#sXJZoooiXlK+5dZyx;{B3z^m=_M&YbH7P_r%2XIV)h{E(& zifB2vNp2!vlq-Pa_c$hCYrCS|TPf;B0CN{xm5O5%P!a?3q9gC0KdU3-!&253&WY65 zFVkD=9sud>sxAG+bI4H_zp)`gDvW1F3hl3v0g!)l;}<27Kv@tp(%nIs-g2574u>h9 z&ztFPz4RAgIbctX>!r&o(`2Qq0O#?5k>=t6q&D5Hm;P4ewCkB&A8n|FG6Gy-c3%3SId0Gn?5P7J;;%vP!{N z-atUCC1UOo*isCaF>p*=p#Dzp@|H1B3|!NVi@~yt&^dhqm(@+Gu5;vF06RK+;DYb+ zPR|nxkY;lM$N*RX2^X-h0;qpyK5$%Iz$l~RFl7cvfeWk)7x0J#31-i;ZgmB?0N1y! zB)n~YvAb{_TmXRC*1Ez~Vcyoc!{9x_7%G;JKyZOtvo`=M0IrN3@kEGCoz0$SkOLXa zU8kzqOW97CkTT%{sAoSbw7%m=xxmQCh`zP8Wx7C)sw)6Te>PvZKsukJGI@>J7XvPf z8UNtS3sQe(VTslYftna%Ju3uw6~M<+d_$a?nmW8g(Sd;hy}!SoW@l$**>C~-3Q&#c zaDj7u5qkH{Q?mTy+_Jo{t}N5T&29SgQHlIM-CQ|#pC49N0Zr2gZD%qWePLnYsYy5x z7vMa=n#Z$iOe}3vdh&1T>uRNwLoXYZ#r=z~Z<2S%1vui{>vB*lsIXYXE%hB@w_r{Fu_|H1+iK(9+Tp#bPl@%&#+#WIb33<7zKJix zl}d$jxtu%*ecZpno)mC33>dTS@pxp+QPGAY0(?H7^jCBUgNG}iQ@HpDTNQ9*4ia!7 z5OSO7gA+KaJvKJx+CMrE3eEotQ-h;P05v$81W<#cNdPrCngmdTqe%cYIGO}dgQH0R iH8`3CP=ll43HT4Txi;|oN#v3M0000_CdMz$3Dlfr0M`2s2LA=96Y% zV6pOaaSW-L^Y)f~w`{0P!^6!B4jwzSpHY>AQ%H1*!!8FeM;)D<+^@_xIIlH5a5wPH zI(W!QD<$`^V#*%cU=AVZqD~JBEL^G7%)yy zW4OfPFpI%Mm?4u%!IxnPXM+jRf?KXK?fCR&=H$cH-}%_qWL#Buux!%iYnZ#ii{bOx z`qz(yA9v61WB2_mH{<$N{>ISx48<(TGWmXoE_LpZVK{m-{q!^YztU^IZeJsIV0M1I zRD9jPzt5^}3bdE!^-oG=esjp}#x{22_3{U=G5>h~rTW2_(w8bRd<~WVepco1HUI5T z*!lnTpX~GdUTI%=DW6y=^=9{Fc8AP&?UBY!q0ALuU$vh7b?bM0ep}oXk6pH%0DZMFMs-V z{`pCD}=Ss07`XdIs)( WG2cGFl|I0tg~8L+&t;ucLK6T3gQYkC literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png b/Resources/Textures/Structures/Decoration/fireplace.rsi/fireplace_glow.png new file mode 100644 index 0000000000000000000000000000000000000000..8b4741b7e7b5082f7a9828e653d16aaea6030486 GIT binary patch literal 1179 zcmeAS@N?(olHy`uVBq!ia0vp^2SAvE4M+yv$zcaloCO|{#S9F5M?jcysy3fA0|Se% zr;B4q#hkad?Ym<_Wf~rKcXVz_c(mzmlmu_ngE~RMp!Ow#-Wz>WIbL3hzOAwHa>Nf- zoi~d@Ps~5|*2%>6K!)PH-S3WVogMgY)8y}!3TNIJEdOEneed&kXWy(AZsBY&VVt1G zaEZlX7K4W{Lnf1gFT)Zd1>YWF`tj-R_U-kRPk+9PuAeve*yAnbe5Zm%RCE{rKahtI^W(2WQm3{_t|A;q#wAPfC66PDt!#Gm!uDIr80yGyAR2 zW!+!5>D{xVbNi3|j+cLJZq@Yjf&H9%yU+9GKmXryYM0^v_Q!wM%bwG3Vx431*Ie)0{QUoWg9b>Pp#^V1o>%dOo$cfU?_eeFNr4H*pXbLRi+8UJ4%StRzqe}iR{b+Y;Y z2b24kzx*v97FGQ4*7M8PW~SHQ=e+sByTP)_@c+(Nf0p0vtdaf#jG^-5hwp~ouYY=3 zKkV1J3(F)vpSQkwYWK|<^-JILeEk2jn!I#HdA1q~$y1>z6*2=`R^ z2Fmn&1O-1pk-`N+NC>e)$SgvMm%{QCaWsN8=H8i|$9i|{^#i5hNY;2~X3sq{_snAh zxMKVl;1%$=!)9H!d4QM$^b@{QTYwH6u`NUg;sHRunNLVTfEzpvL)aG7U^s9Vq7YFK zVFc*lohZU5k^i;>8jIph0TL*PFakIi5Srls0>~dSCBlIbz*q=x;}o8DBbm2tBSjAo zKg9uV2WbS5LAsbD>eN969i}|6i5Ln>NHAcMKg=7kyb90=f2ILWn8;sPUw{^Ws})Ei z_G4b^QxHJY6QN_yCz&kCJdv{)Xy)c-(7qemb`5%8V4db;6)$@?q7SL+=%zx8i99P* z*PE%&IcNraD7DDtKT-d2Y38-UkZN2`GdOAoFc@WUy-}ozq-Y__ej+Sy9RV%|qYJpx z4B$m?0d%ooV;qvsb7W)0Yr9zqYq8~j!*Vc$j}5K zjK$29LfE{1|2%}_cl-D+lj8L(tsuaWf?AHkzzER+Z-zVYuzgKFQ%P;Qo{1culxux2`gwO6`gQQXBzsSrd-udX$y8Cge4a6|aCt zk=l?haY+_UxEQVpcN>}ESwVnZx0G91h_}{pOe()P{~`Z4Xg6UcP++=%u-p&C#aMYW zDhYV@;1J%QkL}ed<}=+^MNl;W4SD;;XS#7~-h~1v=s~MFE0GxX^={0>_oMY|`G*PN q&BrtEXVki&LB#y5vhB)0PX7YB;CJ-)H^fQ+0000B52zgo@)&<)tPM9mBC&j-5c`r30!)$FC#%mpo?r@E`r+Zt39op*zMrPj z&026SFmh()zZLQJuPrscsm8Qtif&KcA_3Yp59K{sO9hf%!ET7CK b69qOs-mAb$vi;wjgCL%#tDnm{r-UW|E~!)o literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Machines/computers.rsi/meta.json b/Resources/Textures/Structures/Machines/computers.rsi/meta.json index ab239ee231..f48024b8c1 100644 --- a/Resources/Textures/Structures/Machines/computers.rsi/meta.json +++ b/Resources/Textures/Structures/Machines/computers.rsi/meta.json @@ -9,39 +9,11 @@ "states": [ { "name": "ai-fixer", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-404", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-empty", @@ -67,21 +39,7 @@ }, { "name": "ai-fixer-full", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "ai-fixer-on", @@ -141,57 +99,15 @@ }, { "name": "aiupload_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-0", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-1", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "alert-2", @@ -239,57 +155,15 @@ }, { "name": "atmos_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "atmos_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "broken", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "cameras", @@ -455,39 +329,11 @@ }, { "name": "computer", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "computer_broken", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "crew", @@ -825,7 +671,6 @@ }, { "name": "entertainment", - "directions": 1, "delays": [ [ 0.2, @@ -914,21 +759,7 @@ }, { "name": "error", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "explosive", @@ -1078,39 +909,11 @@ }, { "name": "generic_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "generic_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "holocontrol", @@ -1182,48 +985,14 @@ }, { "name": "id_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "id_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "mass_driver", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "name": "mass_driver" }, { "name": "mecha", @@ -1265,39 +1034,11 @@ }, { "name": "med_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "med_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "medcomp", @@ -1421,75 +1162,19 @@ }, { "name": "mining_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "mining_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "power_monitor", @@ -1545,75 +1230,19 @@ }, { "name": "rd_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rd_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "rdcomp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "recharge_comp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "recharge_comp_on", @@ -1697,21 +1326,7 @@ }, { "name": "robot", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "security", @@ -1737,39 +1352,11 @@ }, { "name": "security_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "security_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "shuttle", @@ -1829,147 +1416,35 @@ }, { "name": "supply", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndie_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndie_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "syndishuttle", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tank", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tcboss", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tech_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "tech_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "teleport", @@ -2003,39 +1478,11 @@ }, { "name": "teleport_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "teleport_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "telesci", @@ -2069,69 +1516,30 @@ }, { "name": "telesci_key", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "telesci_key_off", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { "name": "turbinecomp", - "directions": 4, - "delays": [ - [ - 1 - ], - [ - 1 - ], - [ - 1 - ], - [ - 1 - ] - ] + "directions": 4 }, { - "name": "computer-datatheory", - "directions": 1, - "delays": [ - [ - 1 - ] - ] + "name": "computer-datatheory" }, { "name": "avionics-systems" + }, + { + "name": "television" + }, + { + "name": "television_broken" + }, + { + "name": "detective_television" } ] -} +} \ No newline at end of file diff --git a/Resources/Textures/Structures/Machines/computers.rsi/television.png b/Resources/Textures/Structures/Machines/computers.rsi/television.png new file mode 100644 index 0000000000000000000000000000000000000000..988d1d39ea79c4d9c599e2bb434b33c3a6403323 GIT binary patch literal 600 zcmV-e0;m0nP)X^%Bvx3{Y$OJT-O{$}Exoml@^Ccj&x?u6lE6<+-aKbGBjc=zD z(AE2}o>&^U2=?dH3)spZk`_R>Py|L_sZ>10PzBH;Mdyg|_C*|zTKm}Kv${2Hi%LI6q;KCS=sw`xyN|+?~kAXb!WK0kEb;P&44>oCP{biU8HyC&-Dv|5-#<1qcy7 zj5@!$M%w8>aI3flq*Cc9wLz!zKpl4oFh9OY>bm+hL=D)bC?0rxNOFe@AawElp6H0E+St57I_EXz=<)wsX&?eN%OzJy_6*>Dxm>-ESl3_Lbm m1+?4kKxy}Dhxh(4=U(~ydQJvc=5;LZ7?y3B{BU(cbT=bU0t53r@sQxRy&o>@ Q0Q!Z&)78&qol`;+00@(6T>t<8 literal 0 HcmV?d00001