From 26e87a1eaf7e67378bddd157961a63e63a8d7cbd Mon Sep 17 00:00:00 2001 From: Thinbug Date: Tue, 26 Nov 2024 13:19:51 -0300 Subject: [PATCH 1/8] Empty commit From 8e103b05a05694b546e869022bf5a6f2551f9060 Mon Sep 17 00:00:00 2001 From: Thinbug Date: Wed, 18 Dec 2024 12:08:21 -0300 Subject: [PATCH 2/8] wawa balloons --- .../WaterBalloon/WaterBalloonComponent.cs | 18 +++ .../WaterBalloon/WaterBalloonSystem.cs | 64 +++++++++++ .../Prototypes/Catalog/Cargo/cargo_fun.yml | 10 ++ .../Prototypes/Catalog/Fills/Crates/fun.yml | 11 ++ .../Markers/Spawners/Random/maintenance.yml | 2 + .../Entities/Objects/Fun/water_balloons.yml | 107 ++++++++++++++++++ Resources/Prototypes/Palettes/balloons.yml | 11 ++ .../Objects/Fun/water_balloons.rsi/icon.png | Bin 0 -> 139 bytes .../Fun/water_balloons.rsi/icon_inflated.png | Bin 0 -> 247 bytes .../icon_inflated_fill-1.png | Bin 0 -> 193 bytes .../Objects/Fun/water_balloons.rsi/meta.json | 34 ++++++ .../water-balloon-box-inhand-left.png | Bin 0 -> 279 bytes .../water-balloon-box-inhand-right.png | Bin 0 -> 274 bytes .../water_balloons.rsi/water_balloon_box.png | Bin 0 -> 317 bytes .../water_balloon_cargo_icon.png | Bin 0 -> 193 bytes 15 files changed, 257 insertions(+) create mode 100644 Content.Shared/WaterBalloon/WaterBalloonComponent.cs create mode 100644 Content.Shared/WaterBalloon/WaterBalloonSystem.cs create mode 100644 Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml create mode 100644 Resources/Prototypes/Palettes/balloons.yml create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/icon.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated_fill-1.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/meta.json create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_box.png create mode 100644 Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_cargo_icon.png diff --git a/Content.Shared/WaterBalloon/WaterBalloonComponent.cs b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs new file mode 100644 index 000000000000..dc8fd3b8b8e0 --- /dev/null +++ b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs @@ -0,0 +1,18 @@ +using Content.Shared.Chemistry.Components; +using Content.Shared.FixedPoint; + +namespace Content.Shared.WaterBalloon; + +[RegisterComponent] +public sealed partial class WaterBalloonComponent : Component +{ + [DataField] + public FixedPoint2 MaxVolume = 10; + + [DataField] + public bool Filled = false; + + [DataField] + public string FilledPrototype = "FilledWaterBalloon"; + +} diff --git a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs new file mode 100644 index 000000000000..165970dcc44f --- /dev/null +++ b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs @@ -0,0 +1,64 @@ +using Content.Shared.Chemistry.Components; +using Content.Shared.Chemistry.EntitySystems; +using Content.Shared.Sprite; +using Robust.Shared.Network; +using Robust.Shared.Timing; +using Robust.Shared.Containers; + +namespace Content.Shared.WaterBalloon; + +public sealed class WaterBalloonSystem : EntitySystem +{ + [Dependency] private readonly SharedSolutionContainerSystem _solutions = default!; + [Dependency] private readonly IGameTiming _gameTiming = default!; + [Dependency] private readonly INetManager _net = default!; + [Dependency] private readonly SharedContainerSystem _containerSystem = default!; + + public override void Initialize() + { + SubscribeLocalEvent(CheckIfFull); + } + + /// + /// Checks if the balloon has reached its MaxVolume value + /// + private void CheckIfFull(Entity ent, ref SolutionContainerChangedEvent args) + { + if (_gameTiming.IsFirstTimePredicted) //prevents bad prediction shenanigans + { + if (ent.Comp.MaxVolume == args.Solution.Volume) + { + if (args.Solution.Name == null) + return; + + TieBalloon(ent, args.Solution, args.Solution.Name); //send the entity solution and its name + } + } + } + + /// + /// Ties the balloon (deletes the entity and spawns a new one with the same solution and color) + /// + private void TieBalloon(Entity ent, Solution balloonSolution, string solutionName) + { + //keeps the balloon ghost away + if (!_net.IsServer) + return; + + //drop empty balloon in the floor if its inside a container + if (_containerSystem.IsEntityInContainer(ent)) + { + _containerSystem.TryRemoveFromContainer(ent); + } + + var coords = Transform(ent).Coordinates; + EntityUid spawnedBalloon = EntityManager.SpawnEntity(ent.Comp.FilledPrototype, coords); + + //fill the new balloon with the "empty" balloon solution + if (!_solutions.TryGetSolution(spawnedBalloon, solutionName, out var balloonContainer)) + return; + _solutions.TryAddSolution(balloonContainer.Value, balloonSolution); + + EntityManager.QueueDeleteEntity(ent); + } +} diff --git a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml index 61085f13b944..50800a5eb485 100644 --- a/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml +++ b/Resources/Prototypes/Catalog/Cargo/cargo_fun.yml @@ -88,6 +88,16 @@ category: cargoproduct-category-name-fun group: market +- type: cargoProduct + id: FunWaterBalloons + icon: + sprite: Objects/Fun/water_balloons.rsi + state: water_balloon_cargo_icon + product: CrateWaterBalloons + cost: 500 + category: cargoproduct-category-name-fun + group: market + - type: cargoProduct id: FunPlushies icon: diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index 411dc3072103..bd0fe72edd79 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -277,6 +277,17 @@ - id: WeaponWaterPistol amount: 4 +- type: entity + id: CrateWaterBalloons + parent: CratePlastic + name: water balloons crate + description: Bring forth the splashing war with these silly balloons! + components: + - type: StorageFill + contents: + - id: BoxWaterBalloon + amount: 2 + - type: entity id: CrateFunBoxing parent: CrateGenericSteel diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml index 6a22da58eb95..1043f523900c 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml @@ -219,6 +219,7 @@ - id: PowerCellMedium - id: PowerCellSmall - id: Soap + - id: EmptyWaterBalloon - id: Wirecutter - id: Screwdriver - id: Wrench @@ -260,6 +261,7 @@ - id: ToolboxMechanicalFilled - id: ClothingBeltUtility - id: ToolboxArtisticFilled + - id: BoxWaterBalloon - id: GeigerCounter - id: trayScanner - id: HandheldGPSBasic diff --git a/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml new file mode 100644 index 000000000000..9796748ae2b1 --- /dev/null +++ b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml @@ -0,0 +1,107 @@ +- type: entity + parent: BaseItem + id: EmptyWaterBalloon + suffix: Empty + name: empty water balloon + description: Fill it up to reveal it's true color! + components: + - type: Sprite + sprite: Objects/Fun/water_balloons.rsi + layers: + - state: icon + - type: WaterBalloon + - type: Item + size: Tiny + - type: SolutionContainerManager + solutions: + balloon: + maxVol: 10 + - type: DrawableSolution + solution: balloon + - type: RefillableSolution + solution: balloon + - type: DrainableSolution + solution: balloon + - type: ExaminableSolution + solution: balloon + - type: Spillable + solution: balloon + +- type: entity + parent: BaseItem + id: FilledWaterBalloon + suffix: do not spawn :c + name: water balloon + description: ready to splash your enemies! + components: + - type: Sprite + sprite: Objects/Fun/water_balloons.rsi + layers: + - state: icon_inflated_fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + - state: icon_inflated + map: [ "spriteMap" ] + - type: RandomSprite + available: + - spriteMap: + icon_inflated: Balloons + - type: Item + size: Normal + - type: SolutionContainerManager + solutions: + balloon: + maxVol: 10 + - type: ExaminableSolution + solution: balloon + - type: Spillable + solution: balloon + - type: Appearance + - type: SolutionContainerVisuals + maxFillLevels: 1 + fillBaseName: icon_inflated_fill- + solutionName: balloon + - type: DamageOnLand + damage: + types: + Blunt: 5 + - type: Damageable + damageContainer: Inorganic + - type: Destructible + thresholds: + - trigger: + !type:DamageTrigger + damage: 5 + behaviors: + - !type:SpillBehavior + solution: food + - !type:PlaySoundBehavior + sound: + path: /Audio/Effects/Fluids/splash.ogg + - !type:DoActsBehavior + acts: [ "Destruction" ] + +- type: entity + parent: BaseAmmoProvider + id: BoxWaterBalloon + suffix: Box + name: water balloons dispenser + description: Dispenses 25 colorful water balloons, Donk.Co is not responsible for any injuries. + components: + - type: Sprite + sprite: Objects/Fun/water_balloons.rsi + layers: + - state: water_balloon_box + - type: Item + size: Normal + inhandVisuals: + left: + - state: water-balloon-box-inhand-left + right: + - state: water-balloon-box-inhand-right + - type: BallisticAmmoProvider + whitelist: + components: + - WaterBalloon + proto: EmptyWaterBalloon + capacity: 25 + diff --git a/Resources/Prototypes/Palettes/balloons.yml b/Resources/Prototypes/Palettes/balloons.yml new file mode 100644 index 000000000000..f50d672811d8 --- /dev/null +++ b/Resources/Prototypes/Palettes/balloons.yml @@ -0,0 +1,11 @@ +- type: palette + id: Balloons + name: Balloons + colors: + red: "#fd538d" + pink: "#ff16ca" + green: "#66fd53" + cyanish: "#45ff80" + yellow: "#fff65b" + orange: "#ff16ca" + blue: "#500bfb" diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/icon.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..0a7842d6c9892796dcbed3be71d3ebd37d9681e3 GIT binary patch literal 139 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}uAVNAArY-_ zFBvi(P+&OX&?er@*`vVEYT;vQP}@GIiAU0T(h~P4m+~Z1oXgBrd=BZj>zr65UC5;V kl%we9**S07JSWYo-Nzy8TK!qH9cUnfr>mdKI;Vst0PmVAmjD0& literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated.png new file mode 100644 index 0000000000000000000000000000000000000000..c62ce10461a005aae9cf36badeba7cbeaed953ea GIT binary patch literal 247 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}8$DedLn2z= zP7UO0G2n5zoa&u_iCKkRgnx#dg89U{7vTvL@0u~Pihr_8oi&puim^$7Bd=xV_nB(3 zwo^JTMJ_+T@8dTqR);qfPl%7`ZC2orJIq*<5_H~yA)^53cm_{bKbLh*2~7ZUf?q8F literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated_fill-1.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated_fill-1.png new file mode 100644 index 0000000000000000000000000000000000000000..5abb71b06c094e867e0848c13e6907dcacaef839 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY-_ zrx@}bP~c%+xa!c6|MI6;cwQdi+IDNzst;$kB`Zx7Xc0&%SIRCZpU-y8BX!=J2luR( zICmdl4Qr0P`@q3v_160z9awLK8_KOXF#FG9hqY7r+-&FPGuTP3HGQQ%gTe~DWM4fM3+jr literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/meta.json b/Resources/Textures/Objects/Fun/water_balloons.rsi/meta.json new file mode 100644 index 000000000000..e094978d7466 --- /dev/null +++ b/Resources/Textures/Objects/Fun/water_balloons.rsi/meta.json @@ -0,0 +1,34 @@ +{ + "version": 1, + "license": "CC0-1.0", + "copyright": "Made by Thinbug for ss14 :33", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "icon_inflated" + }, + { + "name": "icon_inflated_fill-1" + }, + { + "name": "water_balloon_box" + }, + { + "name": "water-balloon-box-inhand-left", + "directions": 4 + }, + { + "name": "water-balloon-box-inhand-right", + "directions": 4 + }, + { + "name": "water_balloon_cargo_icon" + } + ] +} diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-left.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..93287419e51132794b48b4d80a7fea9d1a9bff74 GIT binary patch literal 279 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|E_%8+hE&XX zd&`io$w8p?VY}h6Ylm2DS;Rj?%sIeZ!SL=u=9-tL3pX0HWNZ{`b4ohO*Vg!d^^LSi zwJNvIOa>ajz%XO(k)nvn=?nkH&DUGDxqZ_XsVh$+Gy2%Cu76cLt*Ko=EUfumf7GNc zx7Y1Emz*x<@H)y?)iX1&@85fGW)=m{-)CBEsXfbuxhs1`<6} zXUpEx7prC2eD%iu$ghHT)_vObw|QSJ%XY?+uWyxolp1E(9a3THc=%0lNk341gGIjH Wee+94 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-right.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/water-balloon-box-inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..db3b9a5c760c135cd3d4f2d7515754893e797f70 GIT binary patch literal 274 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|&Um^whE&XX zd&`jPkb_9e!_E~Qb6p+QHm9ze%Dm(&m)rsC3aRXB=B9`a9kcAIhZNpyQkwPre`sVy zW9p4}y(~Zz7!KS&nbZ~&`|Dfvrkn16FN+_((6HLOK5o5==jA{>^-6C=9w+AMuYD(N zIdR-SUAu|#%=UJlNqx(IKhOWndXPaS)AIJr%1^O@j1ED;qWe~I$)y}E zmpm-L8P`X=;!)9c-!0o{SI#zxDZ`psOlAG?wIysX*!MJ_11bLXnz2g6B=_b6rV M)78&qol`;+02<_IN&o-= literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_box.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_box.png new file mode 100644 index 0000000000000000000000000000000000000000..d4668b35027e6306de617ae152fae245856cd0f8 GIT binary patch literal 317 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}-#uL%Ln2y} z6C_v{Cy4Zv9PsFRB!9H(e`nzFi`AVO#gQHx|F|zUJ-q$?`j4v~CyA#1IC$X0{0Mgg z!Pg8?jEkHZ*mgv?vY%s=`Rcwh%hHqY$A_oV%=?`;uSvLfACng+N+>pZV(RIuK zr1b=6OyY#k(PuZfmzZ`*oRvLrU_)2q*YB2WY`b6ceC{(gIAWCJBB(4nVGi58{r`@B zc+t$qe0W&^hrCvwfb!ZEYAdbkCa!Y|Db+Fj%;)*6uPM-g%gu~|AvDvC=cZ!PQ(zD< Nc)I$ztaD0e0sveHgdP9@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_cargo_icon.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/water_balloon_cargo_icon.png new file mode 100644 index 0000000000000000000000000000000000000000..f16d2170ddd751d0fbecd40e2b254b63a1d5ee41 GIT binary patch literal 193 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R})t)YnArY-_ zryBA#81OL9USzKBkSgI)D!=bo8kvU7)Xo;?6{~Mq)7(8A5T-G@yGywo>h(-AT literal 0 HcmV?d00001 From 0b2c1ef18fe9d6503b49f9dc361e53a4d78ce43e Mon Sep 17 00:00:00 2001 From: Thinbug Date: Wed, 18 Dec 2024 12:37:04 -0300 Subject: [PATCH 3/8] fixies --- .../Prototypes/Entities/Objects/Fun/water_balloons.yml | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml index 9796748ae2b1..f23ff8009555 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml @@ -1,7 +1,6 @@ - type: entity parent: BaseItem id: EmptyWaterBalloon - suffix: Empty name: empty water balloon description: Fill it up to reveal it's true color! components: @@ -30,9 +29,9 @@ - type: entity parent: BaseItem id: FilledWaterBalloon - suffix: do not spawn :c + suffix: DO NOT SPAWN name: water balloon - description: ready to splash your enemies! + description: Ready to splash your enemies! components: - type: Sprite sprite: Objects/Fun/water_balloons.rsi @@ -73,7 +72,7 @@ damage: 5 behaviors: - !type:SpillBehavior - solution: food + solution: balloon - !type:PlaySoundBehavior sound: path: /Audio/Effects/Fluids/splash.ogg From 1229e773add4d4e0daaeb0512c3727d1a91b2221 Mon Sep 17 00:00:00 2001 From: Thinbug Date: Wed, 18 Dec 2024 13:05:18 -0300 Subject: [PATCH 4/8] deleted some useless stuffies, changed string to EntProtoId --- .../WaterBalloon/WaterBalloonComponent.cs | 13 +++++-------- Content.Shared/WaterBalloon/WaterBalloonSystem.cs | 2 +- 2 files changed, 6 insertions(+), 9 deletions(-) diff --git a/Content.Shared/WaterBalloon/WaterBalloonComponent.cs b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs index dc8fd3b8b8e0..23bf48df3f98 100644 --- a/Content.Shared/WaterBalloon/WaterBalloonComponent.cs +++ b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs @@ -1,18 +1,15 @@ -using Content.Shared.Chemistry.Components; using Content.Shared.FixedPoint; +using Robust.Shared.Prototypes; namespace Content.Shared.WaterBalloon; [RegisterComponent] public sealed partial class WaterBalloonComponent : Component { + /// + /// Holds the entity thats gonna be spawned after the empty balloon is full + /// [DataField] - public FixedPoint2 MaxVolume = 10; - - [DataField] - public bool Filled = false; - - [DataField] - public string FilledPrototype = "FilledWaterBalloon"; + public EntProtoId FilledPrototype = "FilledWaterBalloon"; } diff --git a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs index 165970dcc44f..2d6276898bf2 100644 --- a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs +++ b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs @@ -26,7 +26,7 @@ private void CheckIfFull(Entity ent, ref SolutionContaine { if (_gameTiming.IsFirstTimePredicted) //prevents bad prediction shenanigans { - if (ent.Comp.MaxVolume == args.Solution.Volume) + if (args.Solution.MaxVolume == args.Solution.Volume) { if (args.Solution.Name == null) return; From 0c1ff174e6ee39e487edd68cc52a5feff1ffa4c5 Mon Sep 17 00:00:00 2001 From: Thinbug Date: Wed, 18 Dec 2024 13:21:01 -0300 Subject: [PATCH 5/8] yeah its way nicer --- Content.Shared/WaterBalloon/WaterBalloonSystem.cs | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs index 2d6276898bf2..f5e68cc04a35 100644 --- a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs +++ b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs @@ -24,15 +24,12 @@ public override void Initialize() /// private void CheckIfFull(Entity ent, ref SolutionContainerChangedEvent args) { - if (_gameTiming.IsFirstTimePredicted) //prevents bad prediction shenanigans + if (_gameTiming.IsFirstTimePredicted //prevents bad prediction shenanigans + && args.Solution.MaxVolume == args.Solution.Volume + && args.Solution.Name != null) { - if (args.Solution.MaxVolume == args.Solution.Volume) - { - if (args.Solution.Name == null) - return; + TieBalloon(ent, args.Solution, args.Solution.Name); //send the entity solution and its name - TieBalloon(ent, args.Solution, args.Solution.Name); //send the entity solution and its name - } } } From b84f2300def5f0cc549ad951af84425e9a67d09e Mon Sep 17 00:00:00 2001 From: Thinbug Date: Thu, 19 Dec 2024 12:19:46 -0300 Subject: [PATCH 6/8] more more fixies --- Resources/Prototypes/Catalog/Fills/Crates/fun.yml | 4 ++-- .../Entities/Objects/Fun/water_balloons.yml | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml index bd0fe72edd79..5c751b4903b6 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml @@ -285,8 +285,8 @@ components: - type: StorageFill contents: - - id: BoxWaterBalloon - amount: 2 + - id: BoxWaterBalloon + amount: 2 - type: entity id: CrateFunBoxing diff --git a/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml index f23ff8009555..3287d4976605 100644 --- a/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml +++ b/Resources/Prototypes/Entities/Objects/Fun/water_balloons.yml @@ -36,14 +36,14 @@ - type: Sprite sprite: Objects/Fun/water_balloons.rsi layers: - - state: icon_inflated_fill-1 - map: ["enum.SolutionContainerLayers.Fill"] - - state: icon_inflated - map: [ "spriteMap" ] + - state: icon_inflated_fill-1 + map: ["enum.SolutionContainerLayers.Fill"] + - state: icon_inflated + map: [ "spriteMap" ] - type: RandomSprite available: - - spriteMap: - icon_inflated: Balloons + - spriteMap: + icon_inflated: Balloons - type: Item size: Normal - type: SolutionContainerManager @@ -89,7 +89,7 @@ - type: Sprite sprite: Objects/Fun/water_balloons.rsi layers: - - state: water_balloon_box + - state: water_balloon_box - type: Item size: Normal inhandVisuals: From d56f0d74488ff011d5830db246df564af73cc912 Mon Sep 17 00:00:00 2001 From: Thinbug Date: Thu, 19 Dec 2024 12:35:34 -0300 Subject: [PATCH 7/8] me whem i forget what i did 5 minutes ago --- Content.Shared/WaterBalloon/WaterBalloonComponent.cs | 1 - Content.Shared/WaterBalloon/WaterBalloonSystem.cs | 1 - 2 files changed, 2 deletions(-) diff --git a/Content.Shared/WaterBalloon/WaterBalloonComponent.cs b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs index 23bf48df3f98..5146aae73da9 100644 --- a/Content.Shared/WaterBalloon/WaterBalloonComponent.cs +++ b/Content.Shared/WaterBalloon/WaterBalloonComponent.cs @@ -1,4 +1,3 @@ -using Content.Shared.FixedPoint; using Robust.Shared.Prototypes; namespace Content.Shared.WaterBalloon; diff --git a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs index f5e68cc04a35..609e7b134c69 100644 --- a/Content.Shared/WaterBalloon/WaterBalloonSystem.cs +++ b/Content.Shared/WaterBalloon/WaterBalloonSystem.cs @@ -1,6 +1,5 @@ using Content.Shared.Chemistry.Components; using Content.Shared.Chemistry.EntitySystems; -using Content.Shared.Sprite; using Robust.Shared.Network; using Robust.Shared.Timing; using Robust.Shared.Containers; From a4ff49db3959c5fcde7d0808047567503ed4b647 Mon Sep 17 00:00:00 2001 From: Thinbug Date: Thu, 19 Dec 2024 13:27:59 -0300 Subject: [PATCH 8/8] made the sprite suck a bit less --- .../Fun/water_balloons.rsi/icon_inflated.png | Bin 247 -> 305 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated.png b/Resources/Textures/Objects/Fun/water_balloons.rsi/icon_inflated.png index c62ce10461a005aae9cf36badeba7cbeaed953ea..2d88854841e113b5c322219712b790edf5efc35f 100644 GIT binary patch delta 265 zcmV+k0rvj)0kHy*F@NhxL_t(oh3%Cwj)O1|MPDKi7odQGik@R}D30Y4$rTMk9KgsR zZxOjcSv+15WedO3`kw!1WQ`$_NF+Xp*4l+MkGqSuZTmRu{MkFQSmUN?25G=6V~=P8 zT5IQxw{5%B7DWNTG)=uEfOrDleBbw=&WDf?OgN6CtLu6IM1ST0S@!B{S(e}wo}!8o z=CN8)fS7`@cf=F;3&(MMH-Lm-0Amc++UUa8T8uG4ooEjzrCe2213;eVL1Tb<{9