From ebca84d28f51e56307ffe4d39e58571dfef09ff8 Mon Sep 17 00:00:00 2001 From: Ed <96445749+TheShuEd@users.noreply.github.com> Date: Wed, 16 Oct 2024 17:32:41 +0300 Subject: [PATCH] Minor fixes (#494) * minor loadout tweaks * wooden counter * fix parry predicting * tables crafting simplify --- .../EntitySystems/CP14MeleeParrySystem.cs | 9 +- .../Entities/Structures/Furniture/tables.yml | 22 +++- .../Structures/Furniture/workbenchs.yml | 8 +- .../_CP14/Loadouts/Jobs/general.yml | 28 +++-- .../Construction/Graphs/Furniture/tables.yml | 106 ++++++++++++------ .../_CP14/Recipes/Construction/furniture.yml | 74 +++++++++++- .../Tables/wood_counter.rsi/full.png | Bin 0 -> 883 bytes .../Tables/wood_counter.rsi/meta.json | 46 ++++++++ .../Tables/wood_counter.rsi/state0.png | Bin 0 -> 1270 bytes .../Tables/wood_counter.rsi/state1.png | Bin 0 -> 1182 bytes .../Tables/wood_counter.rsi/state2.png | Bin 0 -> 1270 bytes .../Tables/wood_counter.rsi/state3.png | Bin 0 -> 1079 bytes .../Tables/wood_counter.rsi/state4.png | Bin 0 -> 1163 bytes .../Tables/wood_counter.rsi/state5.png | Bin 0 -> 1097 bytes .../Tables/wood_counter.rsi/state6.png | Bin 0 -> 1063 bytes .../Tables/wood_counter.rsi/state7.png | Bin 0 -> 1124 bytes 16 files changed, 240 insertions(+), 53 deletions(-) create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state5.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png create mode 100644 Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state7.png diff --git a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs index ad57b04d73..684dad3452 100644 --- a/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs +++ b/Content.Shared/_CP14/MeleeWeapon/EntitySystems/CP14MeleeParrySystem.cs @@ -24,10 +24,10 @@ public sealed class CP14MeleeParrySystem : EntitySystem base.Initialize(); SubscribeLocalEvent(OnMeleeHit); - SubscribeLocalEvent(OnMeleeParriableHitAttmpt); + SubscribeLocalEvent(OnMeleeParriableHitAttempt); } - private void OnMeleeParriableHitAttmpt(Entity ent, ref AttemptMeleeEvent args) + private void OnMeleeParriableHitAttempt(Entity ent, ref AttemptMeleeEvent args) { ent.Comp.LastMeleeHit = _timing.CurTime; } @@ -57,7 +57,8 @@ public sealed class CP14MeleeParrySystem : EntitySystem _hands.TryDrop(target, parriedWeapon); _throwing.TryThrow(parriedWeapon, _random.NextAngle().ToWorldVec(), ent.Comp.ParryPower, target); - _popup.PopupPredicted( Loc.GetString("cp14-successful-parry"), args.User, args.User); - _audio.PlayPredicted(meleeParriable.ParrySound, parriedWeapon, args.User); + _popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.User, args.User); + _popup.PopupEntity( Loc.GetString("cp14-successful-parry"), args.HitEntities[0], args.HitEntities[0]); + _audio.PlayPvs(meleeParriable.ParrySound, parriedWeapon); } } diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml index e6d566ceb6..158b9bd2bb 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/tables.yml @@ -68,9 +68,6 @@ - type: Icon sprite: _CP14/Structures/Furniture/Tables/wood.rsi state: frame - - type: Construction - graph: CP14TableWooden - node: CP14TableWoodenFrame - type: entity parent: CP14WoodenTableBase @@ -102,4 +99,21 @@ state: round - type: Icon sprite: _CP14/Structures/Furniture/Tables/wood.rsi - state: round \ No newline at end of file + state: round + - type: Construction + graph: CP14TableWoodenRound + node: CP14TableWoodenRound + +- type: entity + parent: CP14TableWooden + id: CP14TableWoodenCounter + name: wooden counter + components: + - type: Sprite + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + - type: Icon + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + state: full + - type: Construction + graph: CP14TableWoodenCounter + node: CP14TableWoodenCounter \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml index d297a776b9..19b4e4e0fa 100644 --- a/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml +++ b/Resources/Prototypes/_CP14/Entities/Structures/Furniture/workbenchs.yml @@ -73,7 +73,7 @@ sprite: _CP14/Effects/fire.rsi normalState: full - type: Construction - graph: CP14TableWooden + graph: CP14Workbench node: CP14Workbench - type: CP14Workbench recipeTags: @@ -91,6 +91,9 @@ state: cooking_table - type: Icon state: cooking_table + - type: Construction + graph: CP14WorkbenchCooking + node: CP14WorkbenchCooking - type: CP14Workbench craftSound: collection: CP14Sawing #TODO @@ -109,6 +112,9 @@ state: sewing_table - type: Icon state: sewing_table + - type: Construction + graph: CP14WorkbenchSewing + node: CP14WorkbenchSewing - type: CP14Workbench craftSound: collection: CP14Sawing #TODO diff --git a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml index cfc7419e51..78870edd94 100644 --- a/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml +++ b/Resources/Prototypes/_CP14/Loadouts/Jobs/general.yml @@ -83,13 +83,19 @@ name: cp14-loadout-general-mask minLimit: 0 loadouts: - - CP14Sinner + - CP14ClothingMaskSinner + - CP14ClothingMaskSteelMask - type: loadout - id: CP14Sinner + id: CP14ClothingMaskSinner equipment: mask: CP14ClothingMaskSinner +- type: loadout + id: CP14ClothingMaskSteelMask + equipment: + mask: CP14ClothingMaskSteelMask + # Head - type: loadoutGroup @@ -285,9 +291,9 @@ maxLimit: 2 loadouts: - CP14ClothingRingCureWounds - - CP14ClothingRingFlameCreation - - CP14ClothingRingIceDagger - - CP14FoodCucumber + - CP14PenFeather + - CP14Paper + - CP14CopperCoin10 - type: loadout id: CP14ClothingRingCureWounds @@ -296,19 +302,19 @@ - CP14ClothingRingCureWounds - type: loadout - id: CP14ClothingRingFlameCreation + id: CP14PenFeather storage: back: - - CP14ClothingRingFlameCreation + - CP14PenFeather - type: loadout - id: CP14ClothingRingIceDagger + id: CP14Paper storage: back: - - CP14ClothingRingIceDagger + - CP14Paper - type: loadout - id: CP14FoodCucumber + id: CP14CopperCoin10 storage: back: - - CP14FoodCucumber \ No newline at end of file + - CP14CopperCoin \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml index 5f3e6ee579..1fcc6b8f18 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/Graphs/Furniture/tables.yml @@ -6,48 +6,90 @@ actions: - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14TableWooden steps: - material: CP14WoodenPlanks amount: 2 doAfter: 2 - - - node: CP14TableWoodenFrame - entity: CP14TableWoodenFrame - edges: - - to: start - completed: - - !type:SpawnPrototype - prototype: CP14WoodenPlanks1 - amount: 2 - - !type:DeleteEntity {} - steps: - - tool: Screwing #TODO - new tool - doAfter: 1 - - to: CP14TableWooden - steps: - - tool: CP14Hammering - doAfter: 1 - - to: CP14Workbench - steps: - - material: CP14Nail - amount: 1 - doAfter: 1 - - tool: CP14Hammering - doAfter: 1 - - node: CP14TableWooden entity: CP14TableWooden + +- type: constructionGraph + id: CP14TableWoodenRound + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14TableWoodenRound steps: - - tool: Screwing #TODO - new tool - doAfter: 1 + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14TableWoodenRound + entity: CP14TableWoodenRound + +- type: constructionGraph + id: CP14TableWoodenCounter + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14TableWoodenCounter + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14TableWoodenCounter + entity: CP14TableWoodenCounter +- type: constructionGraph + id: CP14Workbench + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14Workbench + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 - node: CP14Workbench entity: CP14Workbench + +- type: constructionGraph + id: CP14WorkbenchCooking + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} edges: - - to: CP14TableWoodenFrame + - to: CP14WorkbenchCooking steps: - - tool: Screwing #TODO - new tool - doAfter: 1 \ No newline at end of file + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WorkbenchCooking + entity: CP14WorkbenchCooking + +- type: constructionGraph + id: CP14WorkbenchSewing + start: start + graph: + - node: start + actions: + - !type:DestroyEntity {} + edges: + - to: CP14WorkbenchSewing + steps: + - material: CP14WoodenPlanks + amount: 2 + doAfter: 2 + - node: CP14WorkbenchSewing + entity: CP14WorkbenchSewing \ No newline at end of file diff --git a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml index 2a64674984..e56c67a528 100644 --- a/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml +++ b/Resources/Prototypes/_CP14/Recipes/Construction/furniture.yml @@ -34,6 +34,42 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: Wooden table (round) + description: A simple table made of boards. + id: CP14TableWoodenRound + graph: CP14TableWoodenRound + startNode: start + targetNode: CP14TableWoodenRound + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/Tables/wood.rsi + state: round + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Wooden counter + description: A simple table made of boards. + id: CP14TableWoodenCounter + graph: CP14TableWoodenCounter + startNode: start + targetNode: CP14TableWoodenCounter + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/Tables/wood_counter.rsi + state: full + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true name: Bonfire @@ -95,7 +131,7 @@ name: Workbench description: Table for the production of various basic tools. id: CP14Workbench - graph: CP14TableWooden + graph: CP14Workbench startNode: start targetNode: CP14Workbench category: construction-category-furniture @@ -108,6 +144,42 @@ conditions: - !type:TileNotBlocked +- type: construction + crystallPunkAllowed: true + name: Cooking table + description: A table to work with food. Time to cook! + id: CP14WorkbenchCooking + graph: CP14WorkbenchCooking + startNode: start + targetNode: CP14WorkbenchCooking + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: cooking_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + +- type: construction + crystallPunkAllowed: true + name: Sewing table + description: A table with embroidery tools to create different clothing and materials. + id: CP14WorkbenchSewing + graph: CP14WorkbenchSewing + startNode: start + targetNode: CP14WorkbenchSewing + category: construction-category-furniture + icon: + sprite: _CP14/Structures/Furniture/workbench.rsi + state: sewing_table + objectType: Structure + placementMode: SnapgridCenter + canBuildInImpassable: false + conditions: + - !type:TileNotBlocked + - type: construction crystallPunkAllowed: true id: CP14Mannequin diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/full.png new file mode 100644 index 0000000000000000000000000000000000000000..fb62dd79337fdacd3a4a452a386e237065ceaa0c GIT binary patch literal 883 zcmV-(1C0EMP)Px&ElET{R9J<*S3PgrFc5u;Wz)4S!x4;RNYWsPhol{fbZW+q{R92G9Xl39QM5yV zz)h9_f+Co5D_=*Az%Tk1}nYo?SX2fR!j}HvA?ff~xpCYo=|} zPm->y0K#CmVwOtVN6kDGh-u1<-oD8~+N+vH{`BeAW_9W@L zCi4N{>MWFznP@v5mmU@ZjCC~8H1M@FeEz{9-)xRPe0{*H=Wgd!3hV*K3(?B0$)H;W zus^F*a%z$T)CUM^zEqBwe4t}i>)*`( zH1K8bFyRBh>9h}^s#U@%`to@t3Pik+&duDKGRE|hTZsZ!XO(sJ>t!Eks^uZ8h!gPw z;g~u1H9y*0X8DM9fo-V}OzZl^Ar)E?(Gbdot*{8xq|8LN+3^)`55@UJ&L{ zhV!F?T8{wSeWJnxy!UTjl&-u2`ph?Lc^dc-Vx#4j_6xDWU6MBjelqD*ClK^Jd6_V4 z+%-<;QPy}$F;8XL&ZA6nic&jdKH`OV8plr?UA^19NYIzI=?-lH+93tI5CIFW{V) zDi>@qPsE$rfXb*E6%v*&V726utEkDS}|d0uL~ zkpU#j3_LFzov!lwwOZXz>m)PZZ9&NZCZoQb>FZ)U-&NVL*VWck$Fyz>Pz}WVh&@xm z_LbyNU26)2eqDj69FUZ~JU%X6HT|!VEHiw&zpt0!-!!B@#V?NZwG0UvkGcQ=002ov JPDHLkV1m{Mrv3l` literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json new file mode 100644 index 0000000000..9db09ac085 --- /dev/null +++ b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/meta.json @@ -0,0 +1,46 @@ +{ + "version": 1, + "license": "CLA", + "copyright": "Created by TheShuEd (Github) for CrystallPunk14", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "full" + }, + { + "name": "state0", + "directions": 4 + }, + { + "name": "state1", + "directions": 4 + }, + { + "name": "state2", + "directions": 4 + }, + { + "name": "state3", + "directions": 4 + }, + { + "name": "state4", + "directions": 4 + }, + { + "name": "state5", + "directions": 4 + }, + { + "name": "state6", + "directions": 4 + }, + { + "name": "state7", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state0.png new file mode 100644 index 0000000000000000000000000000000000000000..bc8249478ba2777ce04adc148b34e741288dab01 GIT binary patch literal 1270 zcmVPx(ut`KgRCt`-TTO2pHxPZQSG%s{7376r9}K4rtV5a{f&@7v#~k|y`UiW*HS* z0N~mUuxJ6-ZdA5+oGth)0RZ$|3%~#IzPdvVESb)#&~wwD;W+vFwp0A`+Kz>RKQDcM z9T-7C-9)BgvbM2}Ai#55HSe#=0h_^dTku&>+iw+UCty5_@$NLJY$M8rfj~l#Oi!0abdw?O13#7JQb#>o}$DZVDp^IP7(5+YJ1<5}_x;2m)Sx7y`ID z>qYkg*KXkC^C%}LRKN%VonJ-<5*GPyvYV?y@@754zZ5CV83h_-o|Tu?P}f)NCW zx*iBtk_##zZ3q1J^!|cBmvpra!%LixqsqRAU0Yg@%R+hw^bd9m>jO5+)YibCXJ?wW zcH6NKOhVb=r6EngDwi0#y#eaauq>p1O_6RUo1Wm>qqXR86_6(2+@Bx}FEjHr3@?Gt zqkNlj1Yoq(_x-1d?C{c1vLAWdT&10U8;~a8WcanPeta>nd^QDZlStj2?aKGB|2@%u z6$ca$aM-o8a-CnFjz`(9(E(`!cq1rI0EPwP1ZWm~GmFwYy-CO62Nhou3uZe_UaSXF z!s?F4Z9J*#XliMw|d`ySel(PVz)h*%T-tfIvjhCl7w|8zlp1 zQmcNN25Bu|(rVrW(gZv?O0UCo9|*(C!giuB@8`WVFW}|dkKeaHfUdXVrw9*uHy6eD zbwiqfy4XEWh)50}{m}(^Q}~*`J940;{sAUCyfmZ<;A8asJ)p>cpI>qPlLr(KAo}k! zOu{AKK+m;u$Kd!(KM8Abi2*<`32Xg-eAHJLqzMrHe*|_KpkGE#i6d19qzU-@|1SWL z)Bkk-Nj~&kE6eRO4az)1dB0#@xd0mo--DaJ1%V6$8f5U?Rf07zH8O0{`z ztMI67j3G4e=QujpE6m|5vlCJbWrvrB_TYq=Um$|=4FD|J5*zdX0<0lGm;V3D55J zZ)7LS<{22V0|@>7AG2~%oS`WH;I-tKMiBs{6DPxnMR~)A@()zPC?UvC9=M%Qx-kTd zFXmv;qH@yf2(TJMKzC<5Q*Ci_rRMm$w%yFVQvqWLAQY`KO_+bDiU?x};KS@iIR)#= gH!w;I=*Ttr2BbF=Jts1L1^@s607*qoM6N<$f|`s=ivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state1.png new file mode 100644 index 0000000000000000000000000000000000000000..92bd4994d1660fd4944c45ad38f5c1bec30c75a9 GIT binary patch literal 1182 zcmV;P1Y!G$P)Px(SV=@dRCt`-TT5@#KoFjiwu{o(O01{{s_@JK4uIgsi8DWfU&oC@?GL*$NP0>c3!&!mht-K<7w4>&L@@czy0`q zha!KM^0EnZ+Wy?ND9wuF16KaTz^g-V5JTWIBl4{ifCnoOc=c=F8}i(UeCq@}I67SZ zr9rHmIjg`r0iRC#%Il2PD&Ol3Vk7dc6M%I&@aoVH6X>-4In}^wp;DVwVV?knzDH?R zX$Kau5sSh)0WH5#I`0i)cyj;N#^hTkKxG5I{QM07Gao?Mf-t?Z`fbnLXIm$rd(;8| zwO(T%09*Zjm>839odAIjbp?2EZUL z>2u(1PChA?2AIY3c#RgoYqc(>XRHQq-hU;30|n$6&}sY7Y3uJtX;w_%DB;GIFH;~B zfE^gsvQ!FU5)M(qfw5Z2%d-hG0jhXDPA-aLyv}#2!qxyX0rEO7|5t_E%J~G+(GBvkP%OuDIeEzXqW~SM=Nfl`nWCC0p(6XQ}gUx-?`yZ$u zKm?h9s^Fyx;~Zemx*rN~!{i?u=lXN`o(qEqFhD@npfThD>z>;*jLm>?4lo>zi-C%B zd>{Y10wV;RXXSzF&hd5CxebstQT&&e`W;cFngf}D^9y=f$|lGJ+&!FSFGT!bRnHf( zKsuVjc{YY-eGg84QNMr&G68qmWlvC-x*GDl$mKCMBTSV@*)-_+fP@#vI53ilP!Y2g z1c=JcB9M!oCeqqekO}CANs-;rWqGh&5Hm*D0oyQ=6O<9984P(|N@>e2EsSl6AE4{; z8S-R~1Q)TEoFD+e@o5Cl?&<10Gc@a4U;{)>kg*zsX5IXIvE|9gf2uJVcjK+!^@!Xj?>vT%X` z8Jo-MU%&|hbYU^h7^!q#x94yfI6=U5zWzE_1*1Je wCU6#BDpdmS8!`zeW&qY@u`On$J;f{FFB8M#jJ!J8!vFvP07*qoM6N<$g8eoaR{#J2 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state2.png new file mode 100644 index 0000000000000000000000000000000000000000..bc8249478ba2777ce04adc148b34e741288dab01 GIT binary patch literal 1270 zcmVPx(ut`KgRCt`-TTO2pHxPZQSG%s{7376r9}K4rtV5a{f&@7v#~k|y`UiW*HS* z0N~mUuxJ6-ZdA5+oGth)0RZ$|3%~#IzPdvVESb)#&~wwD;W+vFwp0A`+Kz>RKQDcM z9T-7C-9)BgvbM2}Ai#55HSe#=0h_^dTku&>+iw+UCty5_@$NLJY$M8rfj~l#Oi!0abdw?O13#7JQb#>o}$DZVDp^IP7(5+YJ1<5}_x;2m)Sx7y`ID z>qYkg*KXkC^C%}LRKN%VonJ-<5*GPyvYV?y@@754zZ5CV83h_-o|Tu?P}f)NCW zx*iBtk_##zZ3q1J^!|cBmvpra!%LixqsqRAU0Yg@%R+hw^bd9m>jO5+)YibCXJ?wW zcH6NKOhVb=r6EngDwi0#y#eaauq>p1O_6RUo1Wm>qqXR86_6(2+@Bx}FEjHr3@?Gt zqkNlj1Yoq(_x-1d?C{c1vLAWdT&10U8;~a8WcanPeta>nd^QDZlStj2?aKGB|2@%u z6$ca$aM-o8a-CnFjz`(9(E(`!cq1rI0EPwP1ZWm~GmFwYy-CO62Nhou3uZe_UaSXF z!s?F4Z9J*#XliMw|d`ySel(PVz)h*%T-tfIvjhCl7w|8zlp1 zQmcNN25Bu|(rVrW(gZv?O0UCo9|*(C!giuB@8`WVFW}|dkKeaHfUdXVrw9*uHy6eD zbwiqfy4XEWh)50}{m}(^Q}~*`J940;{sAUCyfmZ<;A8asJ)p>cpI>qPlLr(KAo}k! zOu{AKK+m;u$Kd!(KM8Abi2*<`32Xg-eAHJLqzMrHe*|_KpkGE#i6d19qzU-@|1SWL z)Bkk-Nj~&kE6eRO4az)1dB0#@xd0mo--DaJ1%V6$8f5U?Rf07zH8O0{`z ztMI67j3G4e=QujpE6m|5vlCJbWrvrB_TYq=Um$|=4FD|J5*zdX0<0lGm;V3D55J zZ)7LS<{22V0|@>7AG2~%oS`WH;I-tKMiBs{6DPxnMR~)A@()zPC?UvC9=M%Qx-kTd zFXmv;qH@yf2(TJMKzC<5Q*Ci_rRMm$w%yFVQvqWLAQY`KO_+bDiU?x};KS@iIR)#= gH!w;I=*Ttr2BbF=Jts1L1^@s607*qoM6N<$f|`s=ivR!s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state3.png new file mode 100644 index 0000000000000000000000000000000000000000..8eb118bb5c2be3b56a5e5adba03e4bbe6bd4467a GIT binary patch literal 1079 zcmV-71jze|P)Px&@kvBMRCt`-ThDJ2K@|Qfw9`N#Ku9mxG^Rc1p$EP7&Mzs{Tggz=<_hbA@Z zg|w*+O-#r_meRNdgNJpNx5Livz&x0d@525XhWGJ)&3m&uaEv#vUd#ZXwzsp=`1hZ` zuQu=>$~J>J@bXzJISxh-+UHueO7e_6?)C=O^E)R%6k=WA7@gl(1y&DcH6a>=d5^cyPmg&wFVru>pAz*Dz2*VrqbO!SQAhbyL}Kc57q>nbPhAG=jH3m ztohdsYXVlu**QvCT(BlU=KxKf_W{-f+zuZXt_|;h7mjNj?AuPwg0dMqvt^waZJksdkr8357V07y!W>S z8gOx)uG7={pAaRjKlt+F)^=(ZSQBvEj#qwa>Fc&1qAJR$iZW|2j~i?mIjs$v_VOB) zU9Ra@#@cFv-QFO#VhjK`efK#8TTPJm?||4BbbEs&Kk%&-CSgqgjs2>v)8t4x#M4eQ zxu!Z$7qDLo5TT2DcRp&tT027&(n+R!0$ZQ~REPsGysfi~53F5eB7@ru%%-aPI@0_T~ZL{Q2oDDe@bw$HI1_zO@jnj2t2Z9V`1002ovPDHLkV1m2V0$l(A literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state4.png new file mode 100644 index 0000000000000000000000000000000000000000..a365cbdc75439c7ea3e9544802c357a7ccaa8036 GIT binary patch literal 1163 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 P00000NkvXXu0mjflvfq| literal 0 HcmV?d00001 diff --git a/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png b/Resources/Textures/_CP14/Structures/Furniture/Tables/wood_counter.rsi/state6.png new file mode 100644 index 0000000000000000000000000000000000000000..5ccb16b4ae7cba8d7f8bc9086f604645f72091c3 GIT binary patch literal 1063 zcmV+?1laqDP)Px&;Ymb6RCt{2Tgz_KKomWtPF*E+ltdPrs;UrKz=8$rSar=u@OA9?f$or4fz+yq zBGFALf+&@cq9lr&sJ2s?MK#XY89(ZKlbIII#?Q(19M63_8_~oUW2o>0RXV= z&G_2Dn*#t`#{vNO{>{?(_n*ISP~=;b!CZLxq!aHCy;;29u#=Cs=Qb0^=lu~`wh;sX z$%zYeochY;8bg4XY`eKrdW=1okmVXdz?Yvx>1eSp>_Qr{ouI-90`}eQ#PM+Aqr2Ny zs)YcTdKf`K7XBF3g(g5)G;6)_+>AU3fUJ&8%6F=UUt-3Ow zXDDNHgG@kow_W<)bUxo32UPK7{LclbKTyWsiyEF6MCc}rp+^-@21^{Ef)_-}^Q!uv zPO#X3-e9tnv)leWW5fdESx6O628$c?{TnoF3sY&*t1M!0g2x8*N9Z_pbey}6en2*$ zCp9Yb@&I6AA9PoQ0p?tw3>vlt+n>k1{=*aM6VR{{MJ>|*q7|}EtgIlChoau!Izc8N z?bqe{pKWhuzU{2|Vcj4Tkk!`{v4QFCke&?|)c#BdnSiIekCo?-&U#BpVOw#n&?K-lMg*og36OlBNp^!Z4#>*|#H8EJ z9b;kufH@Ax`mRsL>BXf{_JB;lzPnwh+vz25Qf$EbBw4y`YEJ-Qv;n5+c3Eic%>%%j zSI?EjL)HHWM1CRnAm4rbcEA5GAmWFzPx(9!W$&RCt`-Tfu7EKoEVYO}E66z{2zrOexK!haTD==(!)!uj{RU(OV&hLJG~r zBm|?JgalF?qTt{j(uEpv24Gbud?8Li z6e>i^<5^jWURgdN3YB~PhAFct#0j9F0brn>)t)=hCWsR-9);GqG%uZ6K*;htw(E-% zU~52yi>urE*j4`l9xV_jK-U24Gb(q>5;%#oMs0X0(DZ_&}V1Nt~g$PVJhH=NzY*pgK;ibv_U$APN0mT zeP^IR6|5`ZruExEdb0Kxx|i3a2~uFG0)!|yMif-){^9g(eV#PI z^z^y_Zvu2@_9l6#kDc?pQTDo^1*{sN&-Jcc-^D!di=FoYCb;K$U+kn0FhLqnJT7o{ z$~({df~5~|!R7M-z@O_izP|uiG{7u{04$$R_xzRWv5c}DV9|gycMmmskaXOYzzIAW z5NGUO-M+x40aI`jw=tzXy`u>5r|6|*kP1uT7lE1%CV zr>(sKm$&Z&ZvtrU*YDo}l@?6mte*MXdIKr2IYLdjZU(MkM?XJE8O_X@iJ);@sd`*lxnUR>RFN)NmVpvGsN;+whNrQU!=1nEEC z_4|M>u+0Kp^!zu0xG6{P3z%@dKS1+^eh>1;ufK=)zCaUP7Mm}`2{0>$>u!-5Y*{|B zS#aV6M4{SRB-@@P-Ui|X+$0Yx_Z0W-Cx{c!7q zFT@GhrlFaY^OgF~@$Qf~0n;R}^IOk%*D=8FCx{aORDrkc1lQB!91tg9p!%4V^Hwim qSDu160rY^ycoc5j-|NpE`r<#sF1xO7;?{Zq0000