From 5c330dd4010c4413a22c74b09b8dc95d3156006f Mon Sep 17 00:00:00 2001 From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com> Date: Sun, 18 Sep 2022 13:47:31 -0400 Subject: [PATCH] Folding Chairs (#11398) * folding chair * rsi moment --- .../Entities/Structures/Furniture/chairs.yml | 27 ++++++++++++++++++ .../Construction/Graphs/furniture/seats.yml | 23 +++++++++++++++ .../Recipes/Construction/furniture.yml | 17 +++++++++++ .../Furniture/folding_chair.rsi/folding.png | Bin 0 -> 1379 bytes .../folding_chair.rsi/folding_folded.png | Bin 0 -> 486 bytes .../folding_chair.rsi/inhand-left.png | Bin 0 -> 475 bytes .../folding_chair.rsi/inhand-right.png | Bin 0 -> 470 bytes .../Furniture/folding_chair.rsi/meta.json | 26 +++++++++++++++++ 8 files changed, 93 insertions(+) create mode 100644 Resources/Textures/Structures/Furniture/folding_chair.rsi/folding.png create mode 100644 Resources/Textures/Structures/Furniture/folding_chair.rsi/folding_folded.png create mode 100644 Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-left.png create mode 100644 Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-right.png create mode 100644 Resources/Textures/Structures/Furniture/folding_chair.rsi/meta.json diff --git a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml index 94c003589c..55f42fd6df 100644 --- a/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml +++ b/Resources/Prototypes/Entities/Structures/Furniture/chairs.yml @@ -215,3 +215,30 @@ path: /Audio/Voice/Human/womanlaugh.ogg graph: RitualSeat node: chairCursed + +- type: entity + parent: SeatBase + id: ChairFolding + name: folding chair + description: If you carry six of these you become the coolest kid at church. + components: + - type: Rotatable + - type: Sprite + sprite: Structures/Furniture/folding_chair.rsi + layers: + - state: folding + map: ["enum.FoldableVisualLayers.Base"] + - type: Item + size: 50 + - type: Foldable + - type: Appearance + visuals: + - type: FoldableVisualizer + key: folding + - type: MeleeWeapon + damage: + types: + Blunt: 15 + - type: Construction + graph: Seat + node: chairFolding diff --git a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml index 9a1fc9c71a..f4042dee08 100644 --- a/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml +++ b/Resources/Prototypes/Recipes/Construction/Graphs/furniture/seats.yml @@ -46,6 +46,13 @@ - material: WoodPlank amount: 3 doAfter: 1 + - to: chairFolding + steps: + - material: Plastic + amount: 1 + doAfter: 1 + - material: MetalRod + amount: 2 - node: chair entity: Chair @@ -139,3 +146,19 @@ steps: - tool: Screwing doAfter: 1 + + - node: chairFolding + entity: ChairFolding + edges: + - to: start + completed: + - !type:SpawnPrototype + prototype: SheetPlastic1 + amount: 1 + - !type:SpawnPrototype + prototype: PartRodMetal1 + amount: 2 + steps: + - tool: Screwing + doAfter: 1 + diff --git a/Resources/Prototypes/Recipes/Construction/furniture.yml b/Resources/Prototypes/Recipes/Construction/furniture.yml index d3427fc18d..ef2df65598 100644 --- a/Resources/Prototypes/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/Recipes/Construction/furniture.yml @@ -152,6 +152,23 @@ conditions: - !type:TileNotBlocked +- type: construction + name: folding chair + id: ChairFolding + graph: Seat + startNode: start + targetNode: chairFolding + category: construction-category-furniture + description: An easy to carry chair. + icon: + sprite: Structures/Furniture/folding_chair.rsi + state: folding + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + #tables - type: construction name: steel table diff --git a/Resources/Textures/Structures/Furniture/folding_chair.rsi/folding.png b/Resources/Textures/Structures/Furniture/folding_chair.rsi/folding.png new file mode 100644 index 0000000000000000000000000000000000000000..c9e1c863ba1af18ad372f2010c1b486898718b00 GIT binary patch literal 1379 zcmV-p1)TbcP)Px)9Z5t%RCt{2o54#XR~*N`Q+f>>0>*$a?gkyAAdw}E38d!IYS4_N&6Ycv|C0M2`w-)uXhzA*qmqj8F< z=~?{v)0W+_Is$0~{PpJ_ts4Yz;j^B-T}(Yq*cn6l5o4986*LYwS(4YBN1xV zlMA+XaCmS&n^;N0?S5vM3UGAz4?Hefu*cc~_V*84eojFdiBw1ao21M)0{^EEJ2|5}?yqN`lMFZ~9i(JC%dT0;p<+yt>P0^Ok}zfOE?F9Zx&p}I zDAOwCu2*#2PYy>-t1%<$wR-DwGP%^1pAnzv{h(FKaCz^N8@vja_ion$%Hb&Eadbm_ z2N>Duj)3Y}Qvi;b7zlP1fEWlutCau0j&*nkH0wtIx~niL9WbzKf%Xp2DrFSkT3cRI zJHT=&?1Vi9D>aDE?IKUvBmrKeUgCA`74@2Uk$Q=4ADv!9egyc71`1Yspx@}u0=I>s z0R0Z2-`siuOzAeE*_8I(Md~O$$BXjWHVWwx4NTo1!Yiy99#!M1GlKfE8%8eKWKDUc0 zX$6wxC)tw(kmVR8$&XMhKF}iYJxNLOLzZJCA4{vj`@wq<1Hpk5!RK}{F%ZQ4;5|!z zrUKZ##nnqFu^S2?hokK2vjrpJ21-$p$_W+WM&++uxLiZaZdVG94oB)7J z7q{~Av>OVA6@wc}Sl%2p4c6y&u_sFkHdgac(hB0AKQOc}zTI-{9D%B47^VGuHV+=N zEgK{4nC%ivk{_y?VRnn4su?Cpe%p7cO_N~ttSM})<`Ig;Z9Vwl6#49Vtd!mdh|^&8 ztSOYXiwMQyn3p5hkJ2IL?JO*9`Drv>p^Nc>Xi^<_A<9{DMddxb1cj7@P)Px$ph-kQR9J=Wls!wsKp4mWCs~8Fpa}%3hz%+foved8Y0L+3Q0QC)!9{RWv2H>a zC+TVt!A?%?+B%4vbdk10TM%l6)Y1=d4&g$RUiwZ!$ZxshxaZ}bd!9ew;o;%o;o;%& z-;jMG-Pqis2mfLKIX( zbjCm3VbCy|Tt}^X835oEFSq;cusBSJtP03JvG1;Dn!yqo1~zq;6c3{9&cK`z?wg@1 cFiJotf6A4i5RM(&Pyhe`07*qoM6N<$f`P}~SpWb4 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-left.png b/Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..2eaefeb2722a40199f3dbe0d5143811c9ce6d87d GIT binary patch literal 475 zcmV<10VMv3P)Px$l}SWFRCt{2+ObLlK@bMuQEV5s-0BWO-XIof)I!825C{pRO_Rz-e2y#A*w|c` zROy11ca4RMC$VrqWWX;a*9{yi-giCg2vRmy>1ONa4006!it=MSAzn??c z_r0Leiuef^)8lu3ht4mWdRcWm!FTf>e>UJ`S$@>*fIf000000001LW|tg*WQM@Y_4ukx zfGw%(bMXPJ$^_Vw%n*p)xovYTzAdTibFl%qY`#*P41rB1z*h7bg1=@0Y`Mx1IL!y_ zk_oUCU53C#Ccsv78G=wn1a01E#Zs97Ti!DSQEfj8R8K6;S7NIN0002u^$F4|`V|A? R|GWSI002ovPDHLkV1jo9(*pni literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-right.png b/Resources/Textures/Structures/Furniture/folding_chair.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..a6eb4d73b2ee499fbcfbb28af863c4eca3596b3e GIT binary patch literal 470 zcmV;{0V)28P)Px$kV!;ARCt{2+ObXoK@m3azBjdDr1m zy5~9o48{{wWe7?NJs3}ZzSn1qIXdlTC5DhR-)T27Tg(9fH2_#GWBu~_g!{*5%x|vo z_Wn`JwbBfvn-3Z-937w6fbRhS_5xF*>Y5wjzudZKSD&0I05fPQnCu~#pJ9#w{H~;_u M07*qoM6N<$g4|KkK>z>% literal 0 HcmV?d00001 diff --git a/Resources/Textures/Structures/Furniture/folding_chair.rsi/meta.json b/Resources/Textures/Structures/Furniture/folding_chair.rsi/meta.json new file mode 100644 index 0000000000..aa1af159cb --- /dev/null +++ b/Resources/Textures/Structures/Furniture/folding_chair.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Taken from Beestation at commit https://github.com/BeeStation/BeeStation-Hornet/commit/9a035f9365bcb74ac40fbe79c74c43c4c80cc1e4", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "folding", + "directions": 4 + }, + { + "name": "folding_folded" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +}