From 3a25395ff9d12830b4fe55a862b6d0fecb0f81b2 Mon Sep 17 00:00:00 2001 From: Pieter-Jan Briers Date: Mon, 12 Aug 2019 19:16:25 +0200 Subject: [PATCH] Chairs. --- Resources/Maps/stationstation.yml | 57 +++++++++++++++++- .../Entities/buildings/furniture.yml | 53 ++++++++++++++++ .../Buildings/furniture.rsi/chair.png | Bin 0 -> 1331 bytes .../Buildings/furniture.rsi/meta.json | 1 + .../furniture.rsi/officechair_dark.png | Bin 0 -> 1358 bytes .../furniture.rsi/officechair_white.png | Bin 0 -> 1312 bytes .../Buildings/furniture.rsi/stool_base.png | Bin 0 -> 372 bytes 7 files changed, 109 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/Entities/buildings/furniture.yml create mode 100644 Resources/Textures/Buildings/furniture.rsi/chair.png create mode 100644 Resources/Textures/Buildings/furniture.rsi/meta.json create mode 100644 Resources/Textures/Buildings/furniture.rsi/officechair_dark.png create mode 100644 Resources/Textures/Buildings/furniture.rsi/officechair_white.png create mode 100644 Resources/Textures/Buildings/furniture.rsi/stool_base.png diff --git a/Resources/Maps/stationstation.yml b/Resources/Maps/stationstation.yml index 2aa5635c2c..d99b3fa1bb 100644 --- a/Resources/Maps/stationstation.yml +++ b/Resources/Maps/stationstation.yml @@ -641,7 +641,7 @@ entities: pos: 1.5,3.5 rot: -1.5707963267949 rad type: Transform - - load: 120 + - load: 220 type: PowerProvider - type: solid_wall uid: 77 @@ -1799,7 +1799,7 @@ entities: pos: 4.5,-10.5 rot: -1.5707963267949 rad type: Transform - - load: 320 + - load: 460 type: PowerProvider - type: APC uid: 227 @@ -2559,6 +2559,10 @@ entities: pos: 0.5,-5.5 rot: 1.5707963267948966 rad type: Transform + - color: '#FFFFFFFF' + type: PointLight + - load: 40 + type: PowerDevice - containers: light_bulb: entities: @@ -2572,4 +2576,53 @@ entities: grid: 0 pos: -0.5,5.5 type: Transform +- type: chairOfficeDark + uid: 324 + components: + - grid: 0 + pos: 0.5,-6.5 + rot: 1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 325 + components: + - grid: 0 + pos: -3.5,-0.5 + rot: -1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 326 + components: + - grid: 0 + pos: -2.5,-0.5 + rot: -1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 327 + components: + - grid: 0 + pos: -2.5,-2.5 + rot: 1.5707963267948966 rad + type: Transform +- type: chairOfficeLight + uid: 328 + components: + - grid: 0 + pos: -3.5,-2.5 + rot: 1.5707963267948966 rad + type: Transform +- type: stool + uid: 329 + components: + - grid: 0 + pos: -1.5,-9.5 + rot: 1.5707963267948966 rad + type: Transform +- type: stool + uid: 330 + components: + - grid: 0 + pos: -2.5,-6.5 + rot: 1.5707963267948966 rad + type: Transform ... diff --git a/Resources/Prototypes/Entities/buildings/furniture.yml b/Resources/Prototypes/Entities/buildings/furniture.yml new file mode 100644 index 0000000000..a5c08f096c --- /dev/null +++ b/Resources/Prototypes/Entities/buildings/furniture.yml @@ -0,0 +1,53 @@ +- type: entity + name: Stool + id: stool + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: stool_base + color: "#8e9799" + - type: Icon + sprite: Buildings/furniture.rsi + state: stool_base + +- type: entity + name: White Office Chair + id: chairOfficeLight + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: officechair_white + - type: Icon + sprite: Buildings/furniture.rsi + state: officechair_white + +- type: entity + name: Dark Office Chair + id: chairOfficeDark + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: officechair_dark + - type: Icon + sprite: Buildings/furniture.rsi + state: officechair_dark + +- type: entity + name: Chair + id: chair + components: + - type: Clickable + - type: BoundingBox + - type: Sprite + sprite: Buildings/furniture.rsi + state: chair + color: "#8e9799" + - type: Icon + sprite: Buildings/furniture.rsi + state: chair diff --git a/Resources/Textures/Buildings/furniture.rsi/chair.png b/Resources/Textures/Buildings/furniture.rsi/chair.png new file mode 100644 index 0000000000000000000000000000000000000000..e41dd742d9a568936202ad83f02981fea1045043 GIT binary patch literal 1331 zcmV-31_!g|Y?)8P;fNd#$uZENL4yVj8hl!`C?w0W(z1eY zZ*NJme>MJA5iH9}ZQDk-+eN$GRtk*c7|Z1n0Mg&V2ucG0z+f9mAO~YU? zz;rs@Te!tuOnM`OJzdT1K6VU7R zvhV*e_NrWN@a5$tS?*sHQj#RCBuQWx29hKZ_uJP`P5^Wify}1c4t7E7C=jQ+pxF z001x?4iSc-_AEhLQ^k^yBuR@gmdf|r994N9NRgmuoNe3SoI}_3om|_tF`Z6D z`JWRBYMKV%M?|QK132fH*zu7o2kd#gUlIuVXFXx-N#p zAtsZ_D<3o*4&l0PX_+JgwA*cHnugJ6q~vOvMluo=mSv^$`5e7o4?z%Qj&>Vj$Qg!# z`Fx)CdOgy5fMfvQ_tEWkF&GS#+>m`#wc18F3sV2m`GM#?ps}hm2g@EzYab*5|nWAhG#x3NO6GJi~wLNsOA>G5=in?W4cwgev$#oPHR<8gLT(WGC#UzV4Fa@j?X9b_k6M3&1`QfC_|z~>Gc`@Kl7-ECf~q$u5Lzr2_??Vknr6CK zEJ)l!19+a7HTwAYcu%$753;Uu8+PH-Z;BQgU^bh*mmal2)rO`Alp$-H_Te32Sse>^ zg!=tH?(Xig`-6i6K(Q~!Ij?mErfT4ejv4y>KE~s5F2D4anCE!_UT0*8%#HDQoYrLo zP191(^K$D3fa~k)QZfq-Fq_SAczB37juD0-*6Ve4LL@$AIF19)^WeH}TJ>6-F_tyH zC|hm4ULy>{Y*R$#1WWY*&Uq^g!_>Czorff&(Fl&?lo449qVc=3)qLN_bUFp+ymfSR zMD_zp1GHMZU!*uK5)fUo>is|&+udFuZyP*McNv8Scz%Ay{rx>vzYhnB?uFB!7{_O4 zXBDaReh@mVd=V)Q*laeH=Ka-;APBJ8Y)ITvPEe%F0LVQlu6j#6Pqyq2+U+)c-_KHW z%DgO+0n#)@&$2MTy@jsp;GFNw6>uD<@^e8M%jFV|;}qs81VMnFW#QZ7BS|J{u4as- zolXb;e)*E+tL{UUK7a;Y3PN#z?iV#H+ z{!fxZe_$8}R;v|7Y$>c(D;S1RmEI;q+TvA;x^!sv1E@smnS0f_0d?!p^Z+W6I=|N)2mBHp pEX&F=z^dTA1wyXs4^&j1z<1gJ-2wO<&{6;Z002ovPDHLkV1m&GV~qd+ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/furniture.rsi/meta.json b/Resources/Textures/Buildings/furniture.rsi/meta.json new file mode 100644 index 0000000000..514c0729fd --- /dev/null +++ b/Resources/Textures/Buildings/furniture.rsi/meta.json @@ -0,0 +1 @@ +{"version": 1, "size": {"x": 32, "y": 32}, "states": [{"name": "chair", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_dark", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "officechair_white", "directions": 4, "delays": [[1.0], [1.0], [1.0], [1.0]]}, {"name": "stool_base", "directions": 1, "delays": [[1.0]]}]} \ No newline at end of file diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png b/Resources/Textures/Buildings/furniture.rsi/officechair_dark.png new file mode 100644 index 0000000000000000000000000000000000000000..f99f8464cc8b68d9d617f6b49b202927744622a7 GIT binary patch literal 1358 zcmV-U1+n^xP)6qdq zg(eWm5<1lJyu#tJwPk#F zFbSY(8j&PvYw#3`qCk=)XquKgR(uyQbpcgXnQK=RMX0KZ*=+W|h^4`@tXyFqA0N5K zAMP>WSg~q2BDQU#*=(X(t!}lO&*!jhn@a>{0q6*y zH4gZ`zt=B8wOYk|KF@sbc^+4pOahF@}c%DZni9<|< z^ST2om;^|!18TL}%72Pltrib}rfHH>Sr6n2K!eYk22&`C0^j%J-xVQ(X_|z0WashE zycWm{p4W~A$(EP({ZE40Ns`30e9sghS^GQ?MUj~R3wpgCY}?Kip<1oNwr%u!J?65R zS^#gY7TF4b-xDkJu%Ur+6;FFaQ zhG9G&O{Y`b+}vO~odQ^0hw%7kCdsqOv5)C+(!Z*z8&l!rJ&%9p&tMP)==b|D3wdq_y%^cWzvDP7{vF5JuYW-h$Z$9$mSqt^5J>V_^4_wnm1jT2KLkM_^lzQi z`m=SrpWr`MH_us`T~Yp7f=#n41T?7Rres>MX?FYczaH$q{4j5E$S zLtYG91<*8&Bo81@6^3DCiomojeroA&Jc$~aUBI^O_&N+j?(BXUMY5m3VM0wA*bA zheHHGfO5H2==N|!rQ)03BSxs1!pOH?YAt+w!Dk7U_1o&~+WI>mrJxlCJBxzP^U8>xiPLhM zJUuSUE;bfT-W7^jR{BPaP;%}V{`Zp=kwozLoT61qX-WF02nB5Edg<_ Q2><{907*qoM6N<$f)ka7X8-^I literal 0 HcmV?d00001 diff --git a/Resources/Textures/Buildings/furniture.rsi/officechair_white.png b/Resources/Textures/Buildings/furniture.rsi/officechair_white.png new file mode 100644 index 0000000000000000000000000000000000000000..a2bf296f6178e424154b1eff17e2072f8736accb GIT binary patch literal 1312 zcmV+*1>gFKP)9YI6g{lANrPNY;WSj1-C9Z{Bnu%IJV2BOaN#1PrKR8*NE0bk5e3gcfh-}VnAR2* zOn;@H20oIQ6w(;C5a#{fPiV5AcW*T%ZP9>P!gah_(S*49e>Ff8HT|< z&npd*5CYHhU>HW}TyZXt>H)g0=Z^b4n5GF`*Rfiy{ui-4_`Y8%?Ca~R()^=52b>DN z@AKJgR@e&}WAJ^StB7zB0{FhqgCKxy+i0~~2kqADHG&{e5Y#$(SiTi<40Yvac zX|Mnx1dK8K5~~ssT-W8QGrRad8UIqLFd(1nSGgz1_PnC?KMP^!d7jkvy-+Z*?NpKF@Nv-h&U zec#`@_fz~s(=;yrc1i8t+qL@%{!?|!oaNb7mN9ekq@)bw;XxVG$^I$^?D$LU^pB~^@6(224&l3jA1w&f)IjU zuUA?#Sh^Wnuh(!K2cyxba43jF(mJz7;lGH3s7-JjN2-*rbfy+3FU@8Xx3{%M`|YZtQ?ypX6@2n>xkXbH?2%p&Q;kc__04_TzY zm5bM1ud2FAAP@)y0)hX|4J#~)V)41S>pJT0J2tpd3Q|f$QM9R@=NZNr09Y6ky9U<5 zo2Fs>LTe4B6lH>{fD5j*rVRLKDFf@Wzm)eXQpyi!wz#EKzsR2(pjt4`^Xs=OvCo-r z8!*N|Ywa}!dvC?DJEvKeE!JApbxmh)jKS%2LLA2!hG8=XwXK{9ADG|(*#cJqm(~5@ z@TuvAO-EH#u-3w9r)m0`M+iJGmSd9O;e19}mREJhB%zlO@P#ql%gVKg9m6Ly{)%32 Saqjm30000