From 3faaaa77c8e452b25a523dedfce6e2a6c7165dbc Mon Sep 17 00:00:00 2001
From: rosieposie <52761126+rosieposieeee@users.noreply.github.com>
Date: Tue, 17 Dec 2024 07:49:39 -0500
Subject: [PATCH 1/7] Barrels & Kegs (#2378)

* initial commit

* fixes
---
 .../Structures/Storage/Crates/barrel.yml      | 154 ++++++++++++++++++
 .../DeltaV/Recipes/Crafting/Graphs/barrel.yml |  54 ++++++
 .../DeltaV/Recipes/Crafting/barrel.yml        |  25 +++
 .../Objects/Storage/barrel.rsi/base.png       | Bin 0 -> 1138 bytes
 .../Objects/Storage/barrel.rsi/closed.png     | Bin 0 -> 339 bytes
 .../Objects/Storage/barrel.rsi/meta.json      |  20 +++
 .../Objects/Storage/barrel.rsi/open.png       | Bin 0 -> 1138 bytes
 .../DeltaV/Objects/Storage/keg.rsi/base.png   | Bin 0 -> 4087 bytes
 .../DeltaV/Objects/Storage/keg.rsi/meta.json  |  15 ++
 9 files changed, 268 insertions(+)
 create mode 100644 Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
 create mode 100644 Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/barrel.yml
 create mode 100644 Resources/Prototypes/DeltaV/Recipes/Crafting/barrel.yml
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/base.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/closed.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/meta.json
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/open.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/keg.rsi/base.png
 create mode 100644 Resources/Textures/DeltaV/Objects/Storage/keg.rsi/meta.json

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
new file mode 100644
index 00000000000..aa64c070024
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
@@ -0,0 +1,154 @@
+- type: entity
+  parent: CrateGeneric
+  id: WoodenBarrel
+  name: wooden barrel
+  description: A musty old wooden barrel.
+  components:
+  - type: Sprite
+    sprite: DeltaV/Objects/Storage/barrel.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+    - state: closed
+      map: ["enum.StorageVisualLayers.Door"]
+  - type: Icon
+    sprite: DeltaV/Objects/Storage/barrel.rsi
+    state: base
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
+  - type: Destructible
+    thresholds:
+    - trigger:
+        !type:DamageTrigger
+        damage: 30
+      behaviors:
+      - !type:PlaySoundBehavior
+        sound:
+          collection: WoodDestroy
+      - !type:SpawnEntitiesBehavior
+        spawn:
+          MaterialWoodPlank1:
+            min: 1
+            max: 4
+      - !type:DoActsBehavior
+        acts: [ "Destruction" ]
+  - type: Construction
+    graph: WoodenBarrel
+    node: woodenbarrel
+    containers:
+    - entity_storage
+  - type: StaticPrice
+    price: 50
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.4"
+        density: 150
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+  - type: Climbable
+
+- type: entity
+  parent: StorageTank
+  id: WoodenKeg
+  name: wooden keg
+  description: A musty old wooden keg, with a tap attached to the front.
+  components:
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        maxVol: 500
+  - type: ExaminableSolution
+    solution: tank
+  - type: UserInterface
+    interfaces:
+      enum.TransferAmountUiKey.Key:
+        type: TransferAmountBoundUserInterface
+  - type: DrawableSolution
+    solution: tank
+  - type: InjectableSolution
+    solution: tank
+  - type: Drink
+    solution: tank
+  - type: Spillable
+    solution: tank
+  - type: DumpableSolution
+    solution: tank
+  - type: Sprite
+    sprite: DeltaV/Objects/Storage/keg.rsi
+    layers:
+    - state: base
+      map: ["enum.StorageVisualLayers.Base"]
+  - type: Damageable
+    damageContainer: StructuralInorganic
+    damageModifierSet: Wood
+  - type: StaticPrice
+    price: 50
+  - type: Construction
+    graph: WoodenKeg
+    node: woodenkeg
+    containers:
+    - entity_storage
+  - type: Fixtures
+    fixtures:
+      fix1:
+        shape:
+          !type:PhysShapeAabb
+          bounds: "-0.2,-0.3,0.2,0.4"
+        density: 200
+        mask:
+        - SmallMobMask #this is so they can go under plastic flaps
+        layer:
+        - MachineLayer
+  - type: Transform
+    noRot: false
+
+- type: entity
+  parent: WoodenKeg
+  name: root beer keg
+  description: A musty old wooden keg, with a tap attached to the front. Smells like root beer.
+  id: WoodenKegRootBeer
+  components:
+  - type: Label
+    currentLabel: reagent-name-root-beer
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: RootBeer
+          Quantity: 500
+
+- type: entity
+  parent: WoodenKeg
+  name: beer keg
+  description: A musty old wooden keg, with a tap attached to the front. Smells like beer.
+  id: WoodenKegBeer
+  components:
+  - type: Label
+    currentLabel: reagent-name-beer
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Beer
+          Quantity: 500
+
+- type: entity
+  parent: WoodenKeg
+  name: wine keg
+  description: A musty old wooden keg, with a tap attached to the front. Smells like wine.
+  id: WoodenKegWine
+  components:
+  - type: Label
+    currentLabel: reagent-name-wine
+  - type: SolutionContainerManager
+    solutions:
+      tank:
+        reagents:
+        - ReagentId: Wine
+          Quantity: 500
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/barrel.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/barrel.yml
new file mode 100644
index 00000000000..70476578317
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/Graphs/barrel.yml
@@ -0,0 +1,54 @@
+- type: constructionGraph
+  id: WoodenBarrel
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: woodenbarrel
+          steps:
+            - material: WoodPlank
+              amount: 5
+              doAfter: 5
+
+    - node: woodenbarrel
+      entity: WoodenBarrel
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:EmptyAllContainers
+            - !type:DeleteEntity
+
+- type: constructionGraph
+  id: WoodenKeg
+  start: start
+  graph:
+    - node: start
+      edges:
+        - to: woodenkeg
+          steps:
+            - material: WoodPlank
+              amount: 5
+              doAfter: 5
+
+    - node: woodenkeg
+      entity: WoodenKeg
+      edges:
+        - to: start
+          steps:
+            - tool: Prying
+              doAfter: 2
+          conditions:
+            - !type:SolutionEmpty
+              solution: tank
+          completed:
+            - !type:SpawnPrototype
+              prototype: MaterialWoodPlank1
+              amount: 5
+            - !type:EmptyAllContainers
+            - !type:DeleteEntity
diff --git a/Resources/Prototypes/DeltaV/Recipes/Crafting/barrel.yml b/Resources/Prototypes/DeltaV/Recipes/Crafting/barrel.yml
new file mode 100644
index 00000000000..a673b1215bb
--- /dev/null
+++ b/Resources/Prototypes/DeltaV/Recipes/Crafting/barrel.yml
@@ -0,0 +1,25 @@
+- type: construction
+  name: wooden barrel
+  id: WoodenBarrel
+  graph: WoodenBarrel
+  startNode: start
+  targetNode: woodenbarrel
+  category: construction-category-storage
+  description: A musty old wooden barrel.
+  icon:
+    sprite: DeltaV/Objects/Storage/barrel.rsi
+    state: base
+  objectType: Structure
+
+- type: construction
+  name: wooden keg
+  id: WoodenKeg
+  graph: WoodenKeg
+  startNode: start
+  targetNode: woodenkeg
+  category: construction-category-storage
+  description: A musty old wooden keg, with a tap attached to the front.
+  icon:
+    sprite: DeltaV/Objects/Storage/keg.rsi
+    state: base
+  objectType: Structure
diff --git a/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/base.png b/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc92c166d4378a6145536c6386dd95e55c9ea7f
GIT binary patch
literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhX8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT000C1
zNkl<ZScTQrU1(cn7{Kv=x-Mzfq-m2TJt;kD4sDjK>*{Q&wL`~LRvcaw=0y=i5FNt2
z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH
z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{<Chi9e*$>xtV0GE81UeBHvnMk77#jZ
zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTC<UKz&k-(hBUk*SCAvWT*P
zeDRst#j?=C$j>Q<s0oltWuKaBFld$W$k|S&@2nmTaLHwruU;8e+Fq(~DM%#<Re;CR
zB!Btw1+HE9R$ROg@%}44eDd8Q_c#8m9^kPw$@O-T&)@0di?41e_v2ahC9`V(sdf1!
z7dMvE>_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu?
zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(}
z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml`
zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k
zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz
z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{
z1Nx<AX43+%n+^C)RvZq;6YbyF*Z{y{u@H$w2!%of0s(q;YwSPXJsLo4)hX>Y+IunY
zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)5<erdlO5(
zIAW`g@Op-yW7*mPJ-tR;4igVU39LrFvIp{jcruOEs8;~aP6Ot;dL?h^w<P!KsQoK2
zL~|#ce9^;z<`ym6TUiCrFEs<X4GEAEJotRR+5n>1ftZPrN@Y3aG;*x*IKkDF>Js!z
z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE
zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U
z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY|
zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$
Ef&g0-IRF3v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/closed.png b/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/closed.png
new file mode 100644
index 0000000000000000000000000000000000000000..b111827b8e5ded4cdf0b14e4ed96426d126971bd
GIT binary patch
literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6qGJ;
zjVKAuPb(=;EJ|f?PR%K<ELI3EDNV`DR|v_^&pEjKVGU5(Jx>?Mkcif|m#w)DIS4d7
zv~P915aGeH+SO4yy80snWBzkbn}#y8uxVV4Ax-|1+_pq;dm1b<Jk`ZveDxgP=^7p5
zY1d}Ox2ZPlXa4fq@6&=9y(L+vwo3YiUkhg_eC)XXoKgqF3QJdpYZnbm*@~R+F_lOy
zJ+o~4&cKH2t6t@8p0w*U6NAsQ=wqv2s2<{Y5SS;kAVyl@^KJW?&3B9o`e*!9Jhe60
z_x7oW8|;lgJG-5pdsFdCR4DKDP-YG@^(onx!}uIFNfw^9cp&#l=abn#i3BSa1qMbA
h2L>jA1_qV_#utx|9t_`@bP?!N22WQ%mvv4FO#mcBf<^!U

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/meta.json
new file mode 100644
index 00000000000..2ed4c3638b9
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/meta.json
@@ -0,0 +1,20 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/blob/master/icons/obj/objects.dmi, modified by rosieposieeee",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base"
+    },
+    {
+      "name": "open"
+    },
+    {
+      "name": "closed"
+    }
+  ]
+}
diff --git a/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/open.png b/Resources/Textures/DeltaV/Objects/Storage/barrel.rsi/open.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfc92c166d4378a6145536c6386dd95e55c9ea7f
GIT binary patch
literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhX8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT000C1
zNkl<ZScTQrU1(cn7{Kv=x-Mzfq-m2TJt;kD4sDjK>*{Q&wL`~LRvcaw=0y=i5FNt2
z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH
z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{<Chi9e*$>xtV0GE81UeBHvnMk77#jZ
zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTC<UKz&k-(hBUk*SCAvWT*P
zeDRst#j?=C$j>Q<s0oltWuKaBFld$W$k|S&@2nmTaLHwruU;8e+Fq(~DM%#<Re;CR
zB!Btw1+HE9R$ROg@%}44eDd8Q_c#8m9^kPw$@O-T&)@0di?41e_v2ahC9`V(sdf1!
z7dMvE>_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu?
zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(}
z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml`
zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k
zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz
z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{
z1Nx<AX43+%n+^C)RvZq;6YbyF*Z{y{u@H$w2!%of0s(q;YwSPXJsLo4)hX>Y+IunY
zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)5<erdlO5(
zIAW`g@Op-yW7*mPJ-tR;4igVU39LrFvIp{jcruOEs8;~aP6Ot;dL?h^w<P!KsQoK2
zL~|#ce9^;z<`ym6TUiCrFEs<X4GEAEJotRR+5n>1ftZPrN@Y3aG;*x*IKkDF>Js!z
z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE
zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U
z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY|
zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$
Ef&g0-IRF3v

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Storage/keg.rsi/base.png b/Resources/Textures/DeltaV/Objects/Storage/keg.rsi/base.png
new file mode 100644
index 0000000000000000000000000000000000000000..05686978222cf81f73140592730be7bb6c48dcea
GIT binary patch
literal 4087
zcmV<T4+!vyP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00009a7bBm001r{
z001r{0eGc9b^rhX8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT000ky
zNkl<Zc%1E<eNfv~y2n4^B@jpm5JD4#lu#&8DJ@Wn?Mh$lZ56A7TJO}|anv1et>cb&
zdhhCbSH~G<oVwT5-Rs<$b**0K>K$j-&Q&X;y;XZ_-&`wFprtRgr6n{VNeS->1j0-1
zAMqR#5<;N%?jPIdujH5W`+dLXd!F;0=XcH%h1culZ`l+#1(>G*ReAcbHymhnD6Wgq
z|1*BX0tnzzb21L6n>>@2fqoAF4yPLcy+%c&Wne)>=8G@z0FqObv|0xjgddRrRe5@E
zR$3f-jS7d;O-Iid;yVy@O?>~cM7WXoa|$59TiTsul~t0nawPypqY;4K-d;Q&pC?$Y
zRxB0^TyCZ?Tl1rc;EzvkF=n$FlgR{tQmI6z(*a<!*#Kxeb&8IL;}PRWB!J6MAiw()
z5F{>Nz6{{&{10s`77J?og&#!#m!UvDQ#>CaH#b*`4}JsigGGWLRsgM5>#eS?rm?Ys
z;%qZ!&qV+lEdwE4u+*GP-_!(W$1>^f?;|B8mFDJV1_uWhB!X6}^%fTw%V!nEb&?tt
z6BZx9qRgkc-9l+;8MU>wVe#h_AS)}Al-^DXvo!%hMu7Pf09aP6XJpXL*>ipL>oV!+
z=)5ig1b)%2sU&DsoNsmj1PA~G@Nziaw6r@T!k<+Dp}v^UFdgM*g8Pe*y;#lU@Hj2)
zPSk28E<?eByg=Zq?H6#lJQQYYh)#^9{i-W0zW*vA;zl_9umWUdWs)`4O;%c5NC6y9
zcStw%_lS<T^aXi=KR!&4cqsSxkNo}ubo7kPi62sc0$q~VHlbko6le@eDZtDTNKR1(
z<N~1xIPD(JM1e8J%Z1*dh(wqTKa>E1!%Pp16hEW@l}4?%dBk^<IW>-~v^X>wNjSTP
zg4SSRv#rH~Kyd;bw?*a!0^eVN*>ZqT`2JiiePh@r6tm(72~cU&dJD5P>^<+40*E=7
zS@i@uoeoR8h4{F5nF|QB*=$&?R^nT~nvMZ356vU6eVK-qcITWT_~RERAfHi~tzk6p
z4ooIfNZiq}QOwz9dV726Jn)vp7Xr+NA0$A5F3G#GM8}`%`=$jj6tH>oX4=}?0LaP7
z0l?$&kkH)@Kzhm;*Dko|i}sSU>0avV>$&p9J^(4eu}ed9PJ;qnl6T$GBq;#Ek~{CG
zyu6&YL!Xj5sbEoon(ltzv=~XxMyXT+1n@g}@E~gY1u4MK%2PSq)Ek5!BtTW3-Yaf0
z#&|L1EW@CRBPz$tEnR=1(J~OQ1oll$05CZ`E@MD~DwoguTr63#geza{!+$!>m6-VB
z7bo~Sf91**?n+fN;=U|nKy+d(0I5+i@?OF1`;4D3)n>u&9>dypUiKvvevkmSYqZ`T
zr5D?Tf{LYu7*ugMZ0BVl0^jl?mc~%mM6eVYWOH*f#uy(?Bpv|x1Sl>Bd>Ng8aGMJs
zd;w5zT!!5}M%|?rj4@u)JPN*c&M^hFTCKcLv9yrrfh%$jrf+%-qtS@XW(zqF0T}~k
zE`!46S`Pj3XD)*x1^^-P1-I@)@5&f3nY@I$OD(hFhfjol2txWbRa8_|;BKs?a%(n*
z#pwZU?N@yyyD!_hcySa}X*G3qbvRBOkU?-kiBJgq{QP**a}59?c^u#0J}>+^1u$=}
zra0CvfuDQo&rA$Q1+<MxoC08CIEvrBx1H|Gb}rX<(VKr44SV<SO}A%30<29}Qnr03
zx{IHaTb@CBu7O`Zx;FrCCXZL%_^BL-=5Yg-gS876pt{=E`O2-?5?HN{m2FIEO8ME^
z<4cHKu5l^E@%`=8UUFYoDqOu(6%s!bb}0PjaYNV_qOh5uAP_y&$Dt<Q60@mP$Dzhv
z%FIasIGm$cdpwkxljLWBolo4(#fzg-fQ4j&0zW@Lo;`1UEjzB)#M59IlAi$@EJKnT
zz^0NMCX-U<#1ESYWo2dZc%h1qziwsuVikH#{B$P^)&|^X>Ny$k`{3{-zxt>3{QAGH
z(9zMkphPGuE0f<mvV`CM+flTM(Xzt=W2ON9zn{74=7HPuc&Ei37C&Snv~Fn<$1V*4
zuzOnx|M}IKpb>A6H?n*8%XD^j^2a~E!8&!XBqIpzeBySVedP!M;+c^qLIVHQ=QgnC
zt*<4%KL`J7p*-T}cP!_HkD9{b&zcD7l?s|ipk_-RtsR~6!4Bsr*0fdZ*s+609(e?S
zr=NbBQ>RW*Hg;CFIp03aFaLQX5AQz8+H_w^I-f+yoEpbB-5%b5VLiY5{b816Cx#sD
z*#vMnN6E{|q~^<3iW9)$i7*i=&?R~GN`>50`=;AN&6Ye4HML2_8{&#sxpJjkcL6DY
z7@ZC4SMkz^b*xSIz08OglSn*3ynqS(7ay$P$kCHw=YLQ<D9NGb%T|fs((c6J3629H
zJ;49FAkcQMnLLv((|YH;lG4&LnUq+qRvH@{czl^J01otzqcJU&0{B}b9uNxOX}v^p
zif;vIwK@Yv-{Bkuko;P$PI7K7jtD<&CJ4S9-Zr7&#Rn_M&yVNi!DiH{iM)3XN=wTC
zXl!g?n{gP2bCjwFR&(*<C@+0jC-3#Q`DB8j@DF_a9ePc?6k|d$-9cC1Fsn8f&kH}|
zgAqaO#Rn^>+?vgnpYNr*x*CAm+FIU!VZ8*7q@(jSfBgJ>-{`038e}#ovcUP`&--X>
zX08s*E7!kXo9Q7lZNB)|bvP=>+~`i<NV|DDd{cm%0^Ahfug&4FYBvQ4CqPx6-kYJ*
za_OoAwOToAyHIwcDnueRm&?P_#d^AW2g7m+DL_@8-n$~h!09f#+zoDtF=IBHiEsTX
zplwIb7zyf3RFk75Bsv4G!}SXxI_|$KJu<Ap9Uaezt25v_z-ZnbSS%I_CoGbO=u0Rr
zAzy}MLBhdW)M{nGj;!~)y#ehVPB+VoHge?TS#<FZI(o)%xjdLRS6_FL#B5x8NA+x2
zRm7RIhl7sD6sxxf>`c$aB|w0xJiT|*x)Pel4VX+Ox(~f80m|;)i7i&eXRp`D_TrWG
zo?SIeo%$C0)o+;`i>J@iPx_|Euv)E@xX<(DsjKrAp(;=B-Li5qO{!&*OR6%3=(te~
zi*F-p<!yZSdX3~D?4DgU7{}c-{Ldc1H$Z|*ajcy~$C?7T1PSoejx|^l?*!oV`@fM7
z-}b-;QjHaSzV~(6UK~bl{g*#bUtdqdULWX+3<EKh)mW`o{=R5{H{L$6AOW7*v4;OX
zn~ce1V&Zr$r@QO`lx^Qhd3ibe|MeG=gRr}{@1oCE$44I@0epkB;^AKdU>g1+h)a+F
zHLu){J$fshot;u)faOISx#iXsQdxh?sNN+HB!n<ezV;t<c6PGLc$%8$_62}eR#tie
zjvqg+2=(2c%Sqb`GBY!I^O=8;T*LuQSMBs*2rIjLC*Pkt&6%@@C6{}4)sUH)iD7bo
z5SJhU-uz%EpM7hjuC9*dV-46Ryo?OG$;$Z&=_zAanoh~~qBuba;2$5vwH^1vom>80
z?!;79R(hX#<{9ei>p6P#C;;o%ucy4coY!7^O^Q&UOY(m4<v;TFK7u-{SiN0d^Doi>
zFqf>PyFZSOw!e^|Rbhxxa3-#dii!&Exy{Ct5AB&<00H{hx6?;V(TTC7M#Yez$|Wg1
z4g1w^gH-P@tf8W!B7kJs-8*UQ83+(SbiT8*6PwKzAb`<mBr`Kpir_CmX<BlC=Vesy
zqOPuvEc=NdE{4UoG1T3|i2E{qQxi-Mk4ula=QdlwU_>N<u=Gujkv)Eq?~a{7uTe2M
zHoYa)wYWsC5TZIHebZwAQh*p^79Aa(y!`UZvh)5^K#1`C^Usr&mC1yy10et)x#%@2
z8R;{wHc1ZAaich#ZdR{bLwjs~5ch}$c<=3p__Wct%OZkWR$3g(i#Bp)JerY<{~M&b
z=xq0)cV*Bl+rAU4)ygmKi|5fDAFz7sebm<00?1R}nK7Wbxfy`!>T15*{|WEC{Sbfn
zWE7Lh6u`wFZ>A;W{~b$WCpmNWZ~zy8drP}{bjJtb1$gzj4FQq2&(lv!yOXjz@278S
z3de~9L7<|umV>pdTb_=?>6Qt}ukKCZ*;kIRdh30%y2EC(@yRFqID7V-0-&hqR_}fH
z-7kN$TCIGy{}Wz)ZUevlv|lD*dX0)>XSy+Ot_~2z-}Gy$NR5i3;fs9~W@|`QrUa}=
z&%Sabasg(#wAE@2Iqy0QYkZ?)KY_#PCOR>e;fzWE2^wR}3fM^wB>+tCFi+Sz5L^Hf
zyN)wCJdR$Y3cw4+MdS?-IAtOdVE48XUT>MgY&Mf|wTV7YKj2F-XM&0#<DY&;C&scU
zPet4CD(L|a?>@@l;Gp7XRaM>?y&fRoz)~E<0!%m@{OP~}g;uNezW>5{=>a*3C%M+@
z_SGQzrR5?>&m0VqvZpFj=vrKY#bRMsVH7WX)HJ&QTCLVwvn7v@?Y?D2ZNI>Z41;eP
z%y<`wPK;%8cwCOQ#bTi-u2WWXx(o%3e1DCaCkvziWjQ(C*tj@c(NO`ld!i;#Jvqhr
z*cc6MZBl@mH!qNI%OceF3)5AoW0{!EX6Y4zix?;|7^%t>PIuX5rOE>aH#J|j2JB%5
z3Gm{B71UmG)8F4Gt1|%k5Vie+ycVC}+neu6S^_}Y&=p2U#)(ge#p+a(kglQnRvj;W
zSQpS)2;NAYd0lcj*ULz^6O+azpY4waFgh|GmS;y?Iw>isR4-KpaGBKu-f3|&GU6t~
z(ThTjEP0*zVDP<ml3N@gn9Jp1M70QjpKi<!0*%Ck0DnH*4nTtYntUY}9pZ9x&}+Is
zPnXMs*9BdA9SI349xqgd_W<z40gpBf<zNqbr2?<ZcYR=SrUVVL9|TD0ojxBBz`eb_
z*HtX7)9K_u2<z9)%_aG&kBdU>I~Wyxn)7T>0E?<FVKK%m048i5LG5Sz%{HO9?lXfM
z%_VG!%)%&7+mCf%awECSDu6g92SOez|5*1#VmFe@tO8W!>Aj`qWJWcyoNspUO}8hY
zcv`Pf@lnGyF7ys5L`~1ybY(!f{Ehh2RHJ1;auL|u$`(mXQDwR|UCFXyJ@L+Q8Z85}
zatZ4JTQ_7fGU(=TQ?D#H1u&=j-pfnP$$Zps4M6_BZfR1)#SoF2f6>ITOG5!%wv{cC
z{}!?IjRkPoSfV3At789=&iQ+Qa3TMS>u_^g1S?TpzL4U`aL*P+lMCUppeZmj@I=y?
ph1?T~-AFDs4@PbZ@HZ~N{{gn|Ehg^L9e)4-002ovPDHLkV1jxWvIqbG

literal 0
HcmV?d00001

diff --git a/Resources/Textures/DeltaV/Objects/Storage/keg.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Storage/keg.rsi/meta.json
new file mode 100644
index 00000000000..cbbc0d6e89f
--- /dev/null
+++ b/Resources/Textures/DeltaV/Objects/Storage/keg.rsi/meta.json
@@ -0,0 +1,15 @@
+{
+  "version": 1,
+  "license": "CC-BY-SA-3.0",
+  "copyright": "Made by rosieposieeee",
+  "size": {
+    "x": 32,
+    "y": 32
+  },
+  "states": [
+    {
+      "name": "base",
+      "directions": 4
+    }
+  ]
+}

From 0aa1fa8108ac2f2031db493494c3e1c9b370938a Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 00:01:07 +0200
Subject: [PATCH 2/7] Cleanup

---
 .../Structures/Storage/Crates/barrel.yml      |  55 ------------------
 .../_NF/Recipes/Crafting/Graphs/barrel.yml    |  26 ---------
 .../_NF/Recipes/Crafting/barrel.yml           |  12 ----
 .../Storage/Barrels/wood.rsi/closed.png       | Bin 339 -> 0 bytes
 .../Objects/Storage/Barrels/wood.rsi/icon.png | Bin 1138 -> 0 bytes
 .../Storage/Barrels/wood.rsi/meta.json        |  20 -------
 .../Objects/Storage/Barrels/wood.rsi/open.png | Bin 1138 -> 0 bytes
 7 files changed, 113 deletions(-)
 delete mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml
 delete mode 100644 Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml
 delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png
 delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png
 delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json
 delete mode 100644 Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png

diff --git a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml
index 1b568262482..0f5f702f97a 100644
--- a/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml
+++ b/Resources/Prototypes/_NF/Entities/Structures/Storage/Crates/barrel.yml
@@ -1,58 +1,3 @@
-- type: entity
-  parent: CrateGeneric
-  id: WoodenBarrel
-  name: wooden barrel
-  description: A musty old wooden barrel.
-  components:
-  - type: Sprite
-    sprite: _NF/Objects/Storage/Barrels/wood.rsi
-    layers:
-    - state: icon
-      map: ["enum.StorageVisualLayers.Base"]
-    - state: closed
-      map: ["enum.StorageVisualLayers.Door"]
-  - type: Icon
-    sprite: _NF/Objects/Storage/Barrels/wood.rsi
-    state: icon
-  - type: Damageable
-    damageContainer: StructuralInorganic
-    damageModifierSet: Wood
-  - type: Destructible
-    thresholds:
-    - trigger:
-        !type:DamageTrigger
-        damage: 30
-      behaviors:
-      - !type:PlaySoundBehavior
-        sound:
-          collection: WoodDestroy
-      - !type:SpawnEntitiesBehavior
-        spawn:
-          MaterialWoodPlank1:
-            min: 1
-            max: 4
-      - !type:DoActsBehavior
-        acts: [ "Destruction" ]
-  - type: Construction
-    graph: WoodenBarrel
-    node: woodenbarrel
-    containers:
-    - entity_storage
-  - type: Fixtures
-    fixtures:
-      fix1:
-        shape:
-          !type:PhysShapeAabb
-          bounds: "-0.2,-0.3,0.2,0.4"
-        density: 150
-        mask:
-        - SmallMobMask #this is so they can go under plastic flaps
-        layer:
-        - MachineLayer
-  - type: Climbable
-  - type: StaticPrice
-    price: 50
-
 - type: entity
   parent: StorageTank
   id: BaseBarrel
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml
deleted file mode 100644
index ac91b2e2370..00000000000
--- a/Resources/Prototypes/_NF/Recipes/Crafting/Graphs/barrel.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-- type: constructionGraph
-  id: WoodenBarrel
-  start: start
-  graph:
-    - node: start
-      edges:
-        - to: woodenbarrel
-          steps:
-            - material: WoodPlank
-              amount: 5
-              doAfter: 5
-
-    - node: woodenbarrel
-      entity: WoodenBarrel
-      edges:
-        - to: start
-          steps:
-            - tool: Prying
-              doAfter: 2
-          completed:
-            - !type:SpawnPrototype
-              prototype: MaterialWoodPlank1
-              amount: 5
-            - !type:EmptyAllContainers
-            - !type:DeleteEntity
-
diff --git a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml b/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml
deleted file mode 100644
index a6649928cba..00000000000
--- a/Resources/Prototypes/_NF/Recipes/Crafting/barrel.yml
+++ /dev/null
@@ -1,12 +0,0 @@
-- type: construction
-  name: wooden barrel
-  id: WoodenBarrel
-  graph: WoodenBarrel
-  startNode: start
-  targetNode: woodenbarrel
-  category: construction-category-storage
-  description: A musty old wooden barrel.
-  icon:
-    sprite: _NF/Objects/Storage/Barrels/wood.rsi
-    state: icon
-  objectType: Structure
\ No newline at end of file
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/closed.png
deleted file mode 100644
index b111827b8e5ded4cdf0b14e4ed96426d126971bd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 339
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz&H|6fVg?31We{epSZZGe6qGJ;
zjVKAuPb(=;EJ|f?PR%K<ELI3EDNV`DR|v_^&pEjKVGU5(Jx>?Mkcif|m#w)DIS4d7
zv~P915aGeH+SO4yy80snWBzkbn}#y8uxVV4Ax-|1+_pq;dm1b<Jk`ZveDxgP=^7p5
zY1d}Ox2ZPlXa4fq@6&=9y(L+vwo3YiUkhg_eC)XXoKgqF3QJdpYZnbm*@~R+F_lOy
zJ+o~4&cKH2t6t@8p0w*U6NAsQ=wqv2s2<{Y5SS;kAVyl@^KJW?&3B9o`e*!9Jhe60
z_x7oW8|;lgJG-5pdsFdCR4DKDP-YG@^(onx!}uIFNfw^9cp&#l=abn#i3BSa1qMbA
h2L>jA1_qV_#utx|9t_`@bP?!N22WQ%mvv4FO#mcBf<^!U

diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/icon.png
deleted file mode 100644
index bfc92c166d4378a6145536c6386dd95e55c9ea7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhX8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT000C1
zNkl<ZScTQrU1(cn7{Kv=x-Mzfq-m2TJt;kD4sDjK>*{Q&wL`~LRvcaw=0y=i5FNt2
z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH
z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{<Chi9e*$>xtV0GE81UeBHvnMk77#jZ
zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTC<UKz&k-(hBUk*SCAvWT*P
zeDRst#j?=C$j>Q<s0oltWuKaBFld$W$k|S&@2nmTaLHwruU;8e+Fq(~DM%#<Re;CR
zB!Btw1+HE9R$ROg@%}44eDd8Q_c#8m9^kPw$@O-T&)@0di?41e_v2ahC9`V(sdf1!
z7dMvE>_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu?
zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(}
z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml`
zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k
zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz
z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{
z1Nx<AX43+%n+^C)RvZq;6YbyF*Z{y{u@H$w2!%of0s(q;YwSPXJsLo4)hX>Y+IunY
zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)5<erdlO5(
zIAW`g@Op-yW7*mPJ-tR;4igVU39LrFvIp{jcruOEs8;~aP6Ot;dL?h^w<P!KsQoK2
zL~|#ce9^;z<`ym6TUiCrFEs<X4GEAEJotRR+5n>1ftZPrN@Y3aG;*x*IKkDF>Js!z
z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE
zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U
z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY|
zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$
Ef&g0-IRF3v

diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json
deleted file mode 100644
index 8e941fd7d61..00000000000
--- a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/meta.json
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  "version": 1,
-  "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation PR https://github.com/tgstation/tgstation/pull/38977, modified by rosieposieeee",
-  "size": {
-    "x": 32,
-    "y": 32
-  },
-  "states": [
-    {
-      "name": "closed"
-    },
-    {
-      "name": "open"
-    },
-    {
-      "name": "icon"
-    }
-  ]
-}
diff --git a/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png b/Resources/Textures/_NF/Objects/Storage/Barrels/wood.rsi/open.png
deleted file mode 100644
index bfc92c166d4378a6145536c6386dd95e55c9ea7f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1138
zcmV-&1daQNP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800009a7bBm001r{
z001r{0eGc9b^rhX8+1ijbW?9;ba!ELWdK8EY;$>YAX9X8WNB|8RBvx=!KdMT000C1
zNkl<ZScTQrU1(cn7{Kv=x-Mzfq-m2TJt;kD4sDjK>*{Q&wL`~LRvcaw=0y=i5FNt2
z6}<4q8xizEuXZ!WypvuC_M%jZMb?6`!rCp9cG)UPld{C5Uon|!(vRas$T8`blaDIH
z=juJ@JTK4hJnwrruSS+-o@HqMcYya^>{gv{<Chi9e*$>xtV0GE81UeBHvnMk77#jZ
zL|0<~%uNQlefvHD-`)vT1gQvc$z_#aJO4axcLUe1dsTC<UKz&k-(hBUk*SCAvWT*P
zeDRst#j?=C$j>Q<s0oltWuKaBFld$W$k|S&@2nmTaLHwruU;8e+Fq(~DM%#<Re;CR
zB!Btw1+HE9R$ROg@%}44eDd8Q_c#8m9^kPw$@O-T&)@0di?41e_v2ahC9`V(sdf1!
z7dMvE>_x&Q5vl-d&vT5P)bsKiPCoi@ylnA&MD{dH-yCCZGRVY(H1VaoM+3Os4ZQu?
zt*7Rdicd#e>^GV5?F#%l`F(8w$*f~w>;o+RALt%z$JQ+{^6t25;pv-W#8#sC{X6(}
z1>)W*0-KrI0OwCOVKwRr3&RWz4Ut}$!0m3p)-3=ablQsML|0?XO$O2Tk1{_$j~Ml`
zd9cS%iyPGgOeT{oiXDu$XIThrBev?;alMMe;Q+vHw-@C{A`$F%JCR6)*vvO92b1)k
zHuHO;jrj-5Boc}00eyXaNRmX{JB72;!2aW10G5MEPC1Q5`G@a?*E76%`2w@v7!!Bz
z)CM?b(~=TAbaizxI5^0oiLaGz9BVudfVr+-nX?esreA7C^THUR**T)=49@yB#+Q<{
z1Nx<AX43+%n+^C)RvZq;6YbyF*Z{y{u@H$w2!%of0s(q;YwSPXJsLo4)hX>Y+IunY
zYiRQrh;8Wr_{-)5U?;P~dVC!Kt^dcOC8-&3<^VJXo>*J4RfpB6FUpT6)5<erdlO5(
zIAW`g@Op-yW7*mPJ-tR;4igVU39LrFvIp{jcruOEs8;~aP6Ot;dL?h^w<P!KsQoK2
zL~|#ce9^;z<`ym6TUiCrFEs<X4GEAEJotRR+5n>1ftZPrN@Y3aG;*x*IKkDF>Js!z
z&B{2H%CcqYARJz+9#Gf?R($lHHgm$HXUP{Y>PSBFZ=44#2a`w_M^*m=6#+!CgO(OE
zk|fdiXs&2|3->```vY1x;Y5P1txeUpFAF$~0FWf9=((*e_dkgJ5o2$2lW-ydP*L%U
z0q1O5Wjz4}Q!-Y37z|p~&#z)Y9&zR%H#Q16OyL0(D7u%7W>r7EssVWfK;Mbnu`GY|
zl2f_o>sp!CtcH7ax$8=bR|Pl>DHW9#t{L!e$1?}~4bn|!-yh?@1poj507*qoM6N<$
Ef&g0-IRF3v


From 7e4ab9c3e1d0b38ee2f9eeaaeceb8c64a934133c Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 00:34:47 +0200
Subject: [PATCH 3/7] Update drinks_keg.yml

---
 .../_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
index 9dc17368c4d..b65374da65b 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
@@ -25,7 +25,7 @@
   - type: SolutionContainerManager
     solutions:
       drink:
-        maxVol: 600
+        maxVol: 250
   - type: Drink
   - type: DrawableSolution
     solution: drink
@@ -34,7 +34,7 @@
   - type: DrainableSolution
     solution: drink
   - type: SolutionTransfer
-    transferAmount: 50
+    transferAmount: 100
     maxTransferAmount: 100
     minTransferAmount: 10
     canChangeTransferAmount: true

From af9bcf50d935a73589ae5b597e90869a00932807 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 01:02:46 +0200
Subject: [PATCH 4/7] Keg = cask

---
 .../Objects/Consumable/Drinks/drinks_keg.yml   |  15 ++++++++++-----
 .../Consumable/Drinks/keg_steel.rsi/icon.png   | Bin 1044 -> 808 bytes
 .../Drinks/keg_steel.rsi/icon_open.png         | Bin 808 -> 0 bytes
 .../Consumable/Drinks/keg_steel.rsi/meta.json  |   2 +-
 .../Drinks/keg_steel.rsi/stopper.png           | Bin 0 -> 603 bytes
 .../Consumable/Drinks/keg_wood.rsi/icon.png    | Bin 1139 -> 834 bytes
 .../Drinks/keg_wood.rsi/icon_open.png          | Bin 834 -> 0 bytes
 .../Consumable/Drinks/keg_wood.rsi/meta.json   |   2 +-
 .../Consumable/Drinks/keg_wood.rsi/stopper.png | Bin 0 -> 603 bytes
 9 files changed, 12 insertions(+), 7 deletions(-)
 delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/stopper.png
 delete mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon_open.png
 create mode 100644 Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png

diff --git a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
index b65374da65b..65054b438f6 100644
--- a/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
+++ b/Resources/Prototypes/_NF/Entities/Objects/Consumable/Drinks/drinks_keg.yml
@@ -1,20 +1,25 @@
 - type: entity
   parent: BaseItem
   id: DrinkKegBase
-  name: keg
+  name: cask
   abstract: true
-  description: I don't have a drinking problem - the keg solved it.
+  description: I don't have a drinking problem, the cask solved it.
   components:
   - type: Sprite
     sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
     state: icon
+    scale: 0.8, 0.8
     layers:
     - state: icon
+    - state: stopper
+      visible: true
       map: ["enum.OpenableVisuals.Layer"]
     - state: paper
       map: ["enum.PaperLabelVisuals.Layer"]
   - type: Item
-    size: Huge
+    size: Large
+    shape:
+    - 0,0,2,2
   - type: Clothing
     sprite: _NF/Objects/Consumable/Drinks/keg_steel.rsi
     quickEquip: false
@@ -48,8 +53,8 @@
     visuals:
       enum.OpenableVisuals.Opened:
         enum.OpenableVisuals.Layer:
-          True: { state: "icon_open" }
-          False: { state: "icon" }
+          True: { visible: false }
+          False: { visible: true }
       enum.PaperLabelVisuals.HasLabel:
         enum.PaperLabelVisuals.Layer:
           True: { visible: true }
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon.png
index aa1db87fd2e47752ef20fdc6ea2df5bcc5d31c9c..aa4a2fa7c1bc329009198f3adcb1eb78ad674e5e 100644
GIT binary patch
delta 796
zcmV+%1LORZ2&e{-8Gi!+002a!ipBr{0fK2mLr_UWLm*IcZ)Rz1WdHyu&y|r)C`3^l
z#eW8oMiXWsS-i!tqJ(6rAySlPMj0%;_r?r0@6Ghy$i`CHDhnSQUke*+widQZDIX<U
z8!KWXJ^%Yg&7?-Tb-TaLz2|iAxez$WnwDGB1D0KIVq;NlCVx4r)jboWl@Lud>!zEZ
zjE^R$I6iKvQtM5(%Hn^cF}3KLP^AeEnR%xmydXTVTF5Kj5e}P6dP?|IxXY0X3g0W;
zDDsQqjL!j;8Fmt}Vd1c_mMLSSjLjv-67Cm{q%2$V12aWVDPB`-Wmn9fd#V=(7wze|
z(q*<Y#yFEqp?_hp!ZKM3bjxas;u4enXa#?p@1GKvA+BXiag30|LihcsKlt6Po9^o^
zCIzEV`{a3V9Z<IgUz?uydFXjxM^OC;7k0^?JAlD=(Kkz4WFJE7aCTYJjBPmIfYyh+
z?&!W$Ei;f#!|REBQxaOPp<%Ar+s{77caV^-Caz$24}Ur{l09GH-Sy?Y{dvakkLWjP
z5ptu_11%;1002l(OjJckNJy@(uBN7@m6es#)6>Dh!I_zvhK7cqprCkoc%q`BbaZr^
zo12A&g^i7kmX?;Wv9X<<or;Qzva+&sb8}{9W`Ti$0001f-W2`-000<tQchF<|NsC0
z|NsC0|9}7g|NsC0|NsC0|Ns90%@Z!_00009a7bBm001r`001r`0jlENk^lez)Ja4^
zR5(x7lFPEfAP_`(h!JtXTtf2ye`*JZ(STKVt7k)oKB?&iYWs(;6BNT^<uxGCS{q}m
zeRt$bot!&QPb?h17D1hi*>k1Xk)WNf<|1510e`d=T3`GiTtnC$=g?G#&<pBzBMJhM
zZ-xj&k%UOL7t-C%QJC$0>V&_P^DN|?1|eEpH)b1q!DBK14k9h36Ot$1U!jtY0*stF
z1n3|^JEvoZWe~7}3xK$`3hx4HGV3}DFnsH|lp^^{*k2SJkFb1vQ9B4KJXQ|FCw@TK
awiO4!2}z_!IH!jI0000<MNUMnLSTYxuXZp1

delta 1034
zcmV+l1oiu<29yYp8Gi-<0047(dh`GQ0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ
z#a~lJkxEfJ6miH<oh*ooI7$_ZV4<`XT6HkF^b49aBq=VAf@{ISkHxBki?gl{u7V)=
z0pjZ7r060g{x2!Ci1FaKAMfrx?%n}Hqrz0PYXVR;%SgpzVt+QbD)zi0fG~m>z@WrT
zJ&|6_z;k@v!^hXVD9`df_vh$W@+Jd(BJmv44U2e#cxKbmIqwsPSV>Zd&xywkx*+i*
z*JYRAI2RojcxK4Rq~?i3#A307<ql>gLnWRjjwq@|`9juZh4U6?wNhiPd-4|s^4dz8
z>oi9Y#}X1qLVtve8p^1^LX=jG6cZ`hk9qiq9e<KsGP%lN<XAuzDkR4b{s+IiH49Ud
zZc-oybidg4$0*RV3pDGt{e5iP%@e@?3|wh#f3*S3ev)2qYmp-$xD8xfw>5bWxZDB4
zPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4S#TO2#gged)?#Ry`8=Nd#2Uj
z4`~r{qf=Ik{{R3024YJ`L;#uqfB;Kk&IeWi000SaNLh0L04^f{04^f|c%?sf00007
zbV*G`2j>hK2q7{2CNS>+000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}
z0005(Nq<B^R9M69R=bMAKomW@q!^H(7FH&bMzFBRXQa`_fADAg8*TgoYtbek2u`Ai
zk{B}q2Q0G1lEG(^i3{80RAb`YbLQTYI~OQX;-B#)yTP)oIPLv(I+cp4$dV3+L-Cw*
zF4m{hDOtucVw61OqtOVy?*jmA+lJ?PZ~x!x^?z=E##ti1@{li=O8@|4?2g>?JTS&!
z7{<%})oK-!$s{!s-&q+*PX0)qJfoDp-CL<t{>B5%W>c(hOJEqr)9E{%4geqwL)f<c
zxq!`PgT-PY>YEVU;xRL`+3YvCq7?rOEz61rg8=~Ga5y|VJr(tOU6cp_=JWYmA7n~Q
z$bShTB5)Q6A>f=t*L66KQ@jM%>lNK@7q07q5P~2GatWx_YT%qh(=?pV=i&mQD8hET
zg|6#T-LlbW003Oq{oI6?%LR_(fDj@AXW@7}f^&Y?DGLekeIKf-f^!Z+NbU>-K>*G<
zeBT#FEF_@SYJpM;RaHe`88F6Rnr3RVQhzdTwYcB!L(?<>z-qP1Mci(;#pgI4k5gN*
zk|&*U9D@)d0_XL>dcFSKgkcy80WuzlqA0Wex$lDH?%(hCnL?r{lJbd?W4eh=(|qc5
zudv(g?oLf9#YgkNtBL4QOmbb{lFCd(|2`9zC{f}EsVN3I+B-r$00000NkvXXt^-0~
Eg3DysbpQYW

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/icon_open.png
deleted file mode 100644
index aa4a2fa7c1bc329009198f3adcb1eb78ad674e5e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 808
zcmV+@1K0eCP)<h;3K|Lk000e1NJLTq001BW001Be0{{R3M5Kzw0004kX+uL$Nkc;*
zP;zf(X>4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE
zQrRjC9~)l_8*8=}wn`}<C0iRSVk15O`$o;AM!9vnzs|kqbnm$kILMloThjxUU2tM!
zQEetUtJOUdq?Hg&H0!3DpNx+ts5m}usZ#4rx60ywqcOGUnoy+)51DzVAiN+vuv*9~
z-VqL)OL|K9RJhBL3ku&W-6-;l;*8G$l^J#tv0>q`u$C!fqm0cZ#}e)rj-)JG@&hwP
zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi
zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z<IgUz?uydFXjxM^OC;7k0^?JAlD=(Kkz4
zWFJE7aCTYJjBPmIfYyh+?&!W$Ei;f#!|REBQxaOPp<%Ar+s{77caV^-Caz$24>~iF
zJzwG7_2s?&dB*RL=r?H*a--4%EhYc}07y_wR7FTgNUpA~rlzKqm6g-e)4{>PnVFe}
zhK8V^pm=zAqN1X7bab1Wn}vmijg5_#mX@)xv7Mcrii(P|va)k?b7p2{fq{Vl004g8
z6#f7J02p*qPE-H?|NsC0|NsC0|NsC0|NsC0|NsC0{{YPsF6saP010qNS#tmYE+PN`
zE+PS{;@y$}007iUL_t(IPt}skvcez`M0to2all+c^8bHo2ZzysRd=grLxw)7=>=;0
zhp!V9!(-(&AkbPHW2}95<V&5LJ5Nt69KIGoos8LYrPz_6ov!90Tt)%36<S~XAY4P(
z9p}(ghtLb^b|VS`k#B|wM3IC@winXf&QX}{ed>h2l=Cd)oCYCUTsLMLd%<Hd{|+K8
zr4y1T-d~}TjslFFIRxk+K|7~ohh-43f(wASwhHe8YBK9O3NU=@xs)RLOW0o&9FMSk
md{H|HDm+#W!zX?~*tQ422}z_!IH!jI0000<MNUMnLSTZ=2y{~b

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
index a1bd68a8f45..63de9c888a2 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "icon"
         },
         {
-            "name": "icon_open"
+            "name": "stopper"
         },
         {
             "name": "equipped-BACKPACK",
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/stopper.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_steel.rsi/stopper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e72ee5650f2975966b75d3644e92f92f43f4f6d
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004kX+uL$Nkc;*
zaB^>EX>4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE
zQrRjC9~)l_8*8=}wn`}<C0iRSVk15O`$o;AM!9vnzs|kqbnm$kILMloThjxUU2tM!
zQEetUtJOUdq?Hg&H0!3DpNx+ts5m}usZ#4rx60ywqcOGUnoy+)51DzVAiN+vuv*9~
z-VqL)OL|K9RJhBL3ku&W-6-;l;*8G$l^J#tv0>q`u$C!fqm0cZ#}e)rj-)JG@&hwP
zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi
zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z<IgUz?uydFXjxM^OC;7k0^?JAlD=(Kkz4
zWFJE7aCTYJjBPmIfYyh+?&!W$Ei;f#!|REBQxaOPp<%Ar+s{77caV^-Caz$24>~iF
zJzwG7_2s?&dB*RL=r?H*a--SxIZXfn010qNS#tmYE+PN`E+PS{;@y$}000JJOGiWi
zngD<ROJdFkRsaA12XskIMF-~$83-XU{3bB(0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbNHAzH4R9Hvt$1xEAKnTRZn-`0LbBqN9K!XCl%{G|`0Djo+
pi0Ivuw>_yUW#%3L004jsX#g~n3JcPX<9h%A002ovPDHLkV1giW`KkZ_

literal 0
HcmV?d00001

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon.png
index 1feb2f18d3ebd8b2e3b7241d3cded03d1bb11539..26bdf5d55156292fbdc700e1db62d5add2d67e70 100644
GIT binary patch
delta 822
zcmV-61IhgJ2*L)C8Gi!+002a!ipBr{0fK2mLr_UWLm*IcZ)Rz1WdHyu&y|r)C`3^l
z#eW8oMiXWsS-i!tqJ(6rAySlPMj0%;_r?r0@6Ghy$i`CHDhnSQUke*+widQZDIX<U
z8!KWXJ^%Yg&7?-Tb-TaLz2|iAxez$WnwDGB1D0KIVq;NlCVx4r)jboWl@Lud>!zEZ
zjE^R$I6iKvQtM5(%Hn^cF}3KLP^AeEnR%xmydXTVTF5Kj5e}P6dP?|IxXY0X3g0W;
zDDsQqjL!j;8Fmt}Vd1c_mMLSSjLjv-67Cm{q%2$V12aWVDPB`-Wmn9fd#V=(7wze|
z(q*<Y#yFEqp?_hp!ZKM3bjxas;u4enXa#?p@1GKvA+BXiag30|LihcsKlt6Po9^o^
zCIzEV`{a3V9Z<IgUz?uydFXjxM^OC;7k0^?JAlD=(Kkz4WFJE7aCTYJjBPmIfYyh+
z?&!W$Ei;f#!|REBQxaOPp<%Ar+s{77caV^-Caz$24}Ur{l09GH-Sy?Y{dvakkLWjP
z5ptu_11%;1002%<OjJcN7XWuR0CF_|W-tJdLjZ(60BJD*Tq^)=GXQ&gdv7!Vl9G~A
zCID(N09z^mUS3{3Jw0G80B0}&Ycc>{EC5d>07fAISSbK1Dk=Z~0BjFYAOHXW8gx=l
zQ~&?}|9}7g|NsC0|NsC0|NsC0|NsC0|Ns906e0lH00009a7bBm001r`001r`0jlEN
zk^lez=1D|BR5(x7lF^cbAPhx;)U_!#0a<JP{~v8&16u6NzV03$5btqvbuim6{5ioW
zx-IM*39PlwIe??n?#yKvzQ!Lw9DUpbb8#-`#(${Og1QbRZ^HE?;INOd_KGLr=CdM5
zQ|oc+1arR=F{1aFFQTa$bqPd~8j&D$!px9jBLR<{@I51@2I71YA|z(%;1L-U#9o+W
zu)Z!tS{|JcCerx@dUPc>Bj2c@AY)ok*YVJS6D%h|MrZ*cuC>B0JoEoi)^&aMf|OuZ
zV=oDzRy+v#M2W)^hL0yIBSAs8g}2Qo{(-P<FZzy8KyJK}R{#J207*qoM6N<$g3SzU
A0ssI2

delta 1129
zcmV-v1eW{42J;Az8Gi-<0047(dh`GQ0fcEoLr_UWLm+T+Z)Rz1WdHyuk$sUpNW(xJ
z#a~lJkxEfJ6miH<oh*ooI7$_ZV4<`XT6HkF^b49aBq=VAf@{ISkHxBki?gl{u7V)=
z0pjZ7r060g{x2!Ci1FaKAMfrx?%n}Hqrz0PYXVR;%SgpzVt+QbD)zi0fG~m>z@WrT
zJ&|6_z;k@v!^hXVD9`df_vh$W@+Jd(BJmv44U2e#cxKbmIqwsPSV>Zd&xywkx*+i*
z*JYRAI2RojcxK4Rq~?i3#A307<ql>gLnWRjjwq@|`9juZh4U6?wNhiPd-4|s^4dz8
z>oi9Y#}X1qLVtve8p^1^LX=jG6cZ`hk9qiq9e<KsGP%lN<XAuzDkR4b{s+IiH49Ud
zZc-oybidg4$0*RV3pDGt{e5iP%@e@?3|wh#f3*S3ev)2qYmp-$xD8xfw>5bWxZDB4
zPr77Cj^w8)6bium8GTa@7`g@e*4*A&`#607GSt=b4S#TO2#gged)?#Ry`8=Nd#2Uj
z4`~r{qf=Ik{{R3024YJ`L;#uqfB;Kk&IeWi000SaNLh0L04^f{04^f|c%?sf00007
zbV*G`2j>hK2oE%eOU+CG000?uMObu0Z*6U5Zgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}
z0006@Nq<B^R9M69mOF3LP!z|1P2!Z0nr9^g!8{g(qJk8u3=CPJ2#GI%6g~uFW`6<3
zj#(LykgB$`)d>(%san(}D4{}Dpd>i2)_E}8I*y_7BObcsNLRksKKK4l?)lxD12dc1
z8QWag2|0zK*Z0pxxHS`DMW5Vp-dh8w-?T>EVSkul5<$dYEja=QCYZ;Q{U2R-4TpX~
z%mopz{1M|$&n>R3yv8(5+FPrq&Oa}~hacWM5%b#t`<MSK4q%!ll}cse-1)eFdVK@v
z<cnNMK}LrAS3yoX-`ZQNELJyM{+R{QE}w%7E5+y#Ha9ht!W#_3Af;<$<o|ulBlkG-
zQh)gGz15~ahB<}d;~S#iI1z|17f@AI<X=$$Fbo4lQC!b&@3c|c0LqQY9C!w>a4*lT
zUpfF%9ISq@vu*pPldvb}Y3}P21Mp-ZYwE<83#5~fmc+tAT3Qm~-G>EkAL`RH(CI;H
zyTs!26PVVuKs#{hnehL)rqPND;ZYxIYkwM249ukh0II5v7_d12s8*|}s!Dxb!y3SG
zpJ))?y$Gp<lh?EqjDeOV7-(8z7i(>%W1yzwM<m+|2WjIe?A*)~=_-Ek)H!+w?}IUr
zc~Kmt<jZEs^D6dbVDPC#Z5yN*408Sq03!w(Eu!CqZ3~7&!GOF|5&}C=KgCxbOJY^G
zhbw(k2k<qKCC4sSAL@M(h?jN8M8Bu9%(r)=RYW!iw)H=jCI<1l3y0Sn=)7*gP$k)T
vMKm4^K)GCY|9S1}p~|x}uL);1vzh$`P0j*)tjEil00000NkvXXu0mjftLOeE

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon_open.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/icon_open.png
deleted file mode 100644
index 26bdf5d55156292fbdc700e1db62d5add2d67e70..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 834
zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabRA=0U~I~Cb`J1#c2)=|%1_J8No8Qr
zI6rlwuZByY%+Y$biEhGaijjMcZdlZkvQjZ<N}8Lb&Ythbcue1){c`Wbv7nn;-15@#
z+|t?G#I|{9%Bx08YbPn&{{QWEc8S~0(%t*d?R{SIey4!NiCNR4FEdYzEl5fZ%vG~o
zebrWY$y5Pflh?~;&+qA1TVY|Bw=(Fp@AgxV>K7YseK9LwDJTET%H;}s6l^v`ozT7~
z$T!=&%IinSj?)vlx$bM<)%eu?sOLQ6RLL@-jfoF8Y?!8*ytwDA>T#iW;(beWqCYVk
zyZULy1?QxOpP661N}Nsn?aLjPQnwi&vzY9&Fmb~nqe!lj(^=h*geL#ZV6C71e!kFj
z#dWDZg*_7vJAMDV!v4qIwX@&7)>UI&9Ps-|Wxi~{cGmdW^S)QUsEl_H_{$+)c5=RT
z!@=^4=H5{$@=mV{$|5iI<XYTsxYoYs-HUx8y2cay4!`cK2^NZ4w=i+tjoat#j+alE
zuug4VLOH*c@g&>$hj+g|-TSxl*!%t$=9z*;i!U+jssSU#FTf|n)li(F+?=7vlp)Q4
zVS+P5iycFzAw!HdL#{DHb#-;V3B#mGlY-P3vJ4rbwHV^!;%seg6LcBU4H&YG7~*so
z{8bs;6d58k8ML&tfJWx<2Pyz5sgfYS;QzP)gNPEtEubpS0*}aI1_nJP5N2HU=<Xz-
z;4@Db#}EtutCKEHYF6NJZM?Eo(~L1P`|p4G+yv&RH)r;}lam*CUszOXa9jV6<w1>I
zx^JX8*K9p!*|7NXyECa0`;N&w$kg6pDK6A|er(0%rd@oh`G>x$JlN2`;aivb!)Ke7
zJc3^rzG5lfFKoEz`waa>E2T;~T_#FRR46%gW<ruOWB=R_w#v)c9@PjbsieJpASfw(
zByL8^hJAW2QF3zy)GqyGttwG9SH8bup+a(0!1a$88ijS#9o;e*71wP&q-XQ_f8e#!
z+HXx$62g)>7lzqz{B-F&EY#MouBGhgxV?4zS@nO78*=r3_4zyG?U@t~^f7~{tDnm{
Hr-UW|#!_jL

diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
index a1bd68a8f45..63de9c888a2 100644
--- a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
+++ b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/meta.json
@@ -11,7 +11,7 @@
             "name": "icon"
         },
         {
-            "name": "icon_open"
+            "name": "stopper"
         },
         {
             "name": "equipped-BACKPACK",
diff --git a/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png b/Resources/Textures/_NF/Objects/Consumable/Drinks/keg_wood.rsi/stopper.png
new file mode 100644
index 0000000000000000000000000000000000000000..7e72ee5650f2975966b75d3644e92f92f43f4f6d
GIT binary patch
literal 603
zcmV-h0;K(kP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F80004kX+uL$Nkc;*
zaB^>EX>4Tx04UFukxeK>Q5?m829ZV+W+7R;#jv7;WT_!ilx9X5EWG!|3^nh~^xnwE
zQrRjC9~)l_8*8=}wn`}<C0iRSVk15O`$o;AM!9vnzs|kqbnm$kILMloThjxUU2tM!
zQEetUtJOUdq?Hg&H0!3DpNx+ts5m}usZ#4rx60ywqcOGUnoy+)51DzVAiN+vuv*9~
z-VqL)OL|K9RJhBL3ku&W-6-;l;*8G$l^J#tv0>q`u$C!fqm0cZ#}e)rj-)JG@&hwP
zPAOhfY-Lx>pL?no1{dw=xYA{|GsZZROrc@0!ZKM3bjxas;u4enXa#?p@1GKvA+BXi
zag30|LihcsKlt6Po9^o^CIzEV`{a3V9Z<IgUz?uydFXjxM^OC;7k0^?JAlD=(Kkz4
zWFJE7aCTYJjBPmIfYyh+?&!W$Ei;f#!|REBQxaOPp<%Ar+s{77caV^-Caz$24>~iF
zJzwG7_2s?&dB*RL=r?H*a--SxIZXfn010qNS#tmYE+PN`E+PS{;@y$}000JJOGiWi
zngD<ROJdFkRsaA12XskIMF-~$83-XU{3bB(0000PbVXQnLvL+uWo~o;Lvm$dbY)~9
zcWHEJAV*0}P*;Ht7XSbNHAzH4R9Hvt$1xEAKnTRZn-`0LbBqN9K!XCl%{G|`0Djo+
pi0Ivuw>_yUW#%3L004jsX#g~n3JcPX<9h%A002ovPDHLkV1giW`KkZ_

literal 0
HcmV?d00001


From 80a34ad72d6afa2de835171cfb88e774cdf64bf0 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 01:04:36 +0200
Subject: [PATCH 5/7] Update boozeomat.yml

---
 .../Catalog/VendingMachines/Inventories/boozeomat.yml       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
index 2b7eaed942d..cc13362eb9f 100644
--- a/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
+++ b/Resources/Prototypes/Catalog/VendingMachines/Inventories/boozeomat.yml
@@ -9,9 +9,9 @@
     DrinkJigger: 5
     DrinkIceBucket: 2
     BarSpoon: 3
-    DrinkKegSteel: 4 # Frontier: kegs
-    DrinkKegWood: 4 # Frontier: kegs
-    DrinkKegPlastic: 4 # Frontier: kegs
+    DrinkKegSteel: 2 # Frontier: kegs
+    DrinkKegWood: 2 # Frontier: kegs
+    DrinkKegPlastic: 2 # Frontier: kegs
     CustomDrinkJug: 2 #to allow for custom drinks in the soda/booze dispensers
     DrinkAbsintheBottleFull: 1
     DrinkAleBottleFull: 5

From 0f7f00960a49d0286875c5ca1daa7a4583adfdb0 Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 01:14:24 +0200
Subject: [PATCH 6/7] Update barrel.yml

---
 .../DeltaV/Entities/Structures/Storage/Crates/barrel.yml  | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
index aa64c070024..3ffa4dacf5c 100644
--- a/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
+++ b/Resources/Prototypes/DeltaV/Entities/Structures/Storage/Crates/barrel.yml
@@ -62,7 +62,7 @@
   - type: SolutionContainerManager
     solutions:
       tank:
-        maxVol: 500
+        maxVol: 1000 # Frontier 500<1000
   - type: ExaminableSolution
     solution: tank
   - type: UserInterface
@@ -121,7 +121,7 @@
       tank:
         reagents:
         - ReagentId: RootBeer
-          Quantity: 500
+          Quantity: 1000 # Frontier 500<1000
 
 - type: entity
   parent: WoodenKeg
@@ -136,7 +136,7 @@
       tank:
         reagents:
         - ReagentId: Beer
-          Quantity: 500
+          Quantity: 1000 # Frontier 500<1000
 
 - type: entity
   parent: WoodenKeg
@@ -151,4 +151,4 @@
       tank:
         reagents:
         - ReagentId: Wine
-          Quantity: 500
+          Quantity: 1000 # Frontier 500<1000

From 4d11f9fa66f601e08b4bac6ec436d820b7f0223b Mon Sep 17 00:00:00 2001
From: Dvir <dvirf01@gmail.com>
Date: Fri, 27 Dec 2024 01:14:29 +0200
Subject: [PATCH 7/7] Update kilderkin.yml

---
 Resources/Maps/_NF/Shuttles/kilderkin.yml | 62 ++++++++++++-----------
 1 file changed, 33 insertions(+), 29 deletions(-)

diff --git a/Resources/Maps/_NF/Shuttles/kilderkin.yml b/Resources/Maps/_NF/Shuttles/kilderkin.yml
index fede346a962..257ac1814bb 100644
--- a/Resources/Maps/_NF/Shuttles/kilderkin.yml
+++ b/Resources/Maps/_NF/Shuttles/kilderkin.yml
@@ -889,7 +889,6 @@ entities:
       parent: 1
     - type: Physics
       canCollide: False
-      bodyType: Static
     - type: Fixtures
       fixtures: {}
 - proto: BenchSofaLeft
@@ -900,8 +899,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 5.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaMiddle
   entities:
   - uid: 121
@@ -910,8 +907,6 @@ entities:
       rot: 3.141592653589793 rad
       pos: 6.5,1.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BenchSofaRight
   entities:
   - uid: 122
@@ -920,8 +915,6 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 7.5,2.5
       parent: 1
-    - type: Physics
-      bodyType: Static
 - proto: BlastDoor
   entities:
   - uid: 278
@@ -1702,19 +1695,6 @@ entities:
     - type: Transform
       pos: 2.5,1.5
       parent: 1
-    - type: ContainerContainer
-      containers:
-        board: !type:Container
-          showEnts: False
-          occludes: True
-          ents: []
-        bank-ATM-cashSlot: !type:ContainerSlot
-          showEnts: False
-          occludes: True
-          ent: null
-    - type: Physics
-      canCollide: False
-    - type: ItemSlots
 - proto: DefibrillatorCabinetFilled
   entities:
   - uid: 321
@@ -3228,19 +3208,11 @@ entities:
     - type: Transform
       pos: -4.5,-4.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
   - uid: 320
     components:
     - type: Transform
       pos: -3.5,-4.5
       parent: 1
-    - type: FuelGenerator
-      on: False
-    - type: Physics
-      bodyType: Static
 - proto: PottedPlantRandom
   entities:
   - uid: 363
@@ -4498,7 +4470,7 @@ entities:
       rot: -1.5707963267948966 rad
       pos: -4.5,-6.5
       parent: 1
-- proto: WarpPointShip
+- proto: WarpPoint
   entities:
   - uid: 496
     components:
@@ -4560,6 +4532,33 @@ entities:
       rot: -1.5707963267948966 rad
       pos: 2.5,-5.5
       parent: 1
+- proto: WoodenBarrel
+  entities:
+  - uid: 620
+    components:
+    - type: Transform
+      pos: -5.5,3.5
+      parent: 1
+  - uid: 621
+    components:
+    - type: Transform
+      pos: -5.5,2.5
+      parent: 1
+- proto: WoodenKegBeer
+  entities:
+  - uid: 617
+    components:
+    - type: Transform
+      pos: -4.5,3.5
+      parent: 1
+- proto: WoodenKegWine
+  entities:
+  - uid: 618
+    components:
+    - type: Transform
+      rot: 1.5707963267948966 rad
+      pos: -5.5,1.5
+      parent: 1
 - proto: Wrench
   entities:
   - uid: 554
@@ -4567,4 +4566,9 @@ entities:
     - type: Transform
       pos: -4.203125,-4.8230324
       parent: 1
+  - uid: 619
+    components:
+    - type: Transform
+      pos: -4.5121074,1.5808618
+      parent: 1
 ...