From 6db6b423f4e3b6540ec875692f3ef660fc238c31 Mon Sep 17 00:00:00 2001
From: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Date: Thu, 3 Aug 2023 21:53:06 -0400
Subject: [PATCH] official security anti-inflatable armament (#18634)

---
 .../Melee/Balloon/BalloonPopperComponent.cs   |  24 ++++++++
 .../Melee/Balloon/BalloonPopperSystem.cs      |  54 ++++++++++++++++++
 Resources/Audio/Effects/attributions.yml      |   5 ++
 Resources/Audio/Effects/balloon-pop.ogg       | Bin 0 -> 7265 bytes
 .../Locale/en-US/weapons/melee/melee.ftl      |   2 +
 .../Catalog/Fills/Lockers/security.yml        |   2 +
 .../Prototypes/Entities/Objects/Fun/toys.yml  |  10 ++++
 .../Entities/Objects/Weapons/Melee/needle.yml |  16 ++++++
 Resources/Prototypes/tags.yml                 |   3 +
 .../Objects/Weapons/Melee/needle.rsi/icon.png | Bin 0 -> 307 bytes
 .../Weapons/Melee/needle.rsi/meta.json        |  14 +++++
 11 files changed, 130 insertions(+)
 create mode 100644 Content.Server/Weapons/Melee/Balloon/BalloonPopperComponent.cs
 create mode 100644 Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
 create mode 100644 Resources/Audio/Effects/balloon-pop.ogg
 create mode 100644 Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/needle.rsi/icon.png
 create mode 100644 Resources/Textures/Objects/Weapons/Melee/needle.rsi/meta.json

diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperComponent.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperComponent.cs
new file mode 100644
index 0000000000..1f7ac592fc
--- /dev/null
+++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperComponent.cs
@@ -0,0 +1,24 @@
+using Content.Shared.Tag;
+using Robust.Shared.Audio;
+using Robust.Shared.Serialization.TypeSerializers.Implementations.Custom.Prototype;
+
+namespace Content.Server.Weapons.Melee.Balloon;
+
+/// <summary>
+/// This is used for weapons that pop balloons on attack.
+/// </summary>
+[RegisterComponent]
+public sealed class BalloonPopperComponent : Component
+{
+    /// <summary>
+    /// The tag that marks something as a balloon.
+    /// </summary>
+    [DataField("balloonTag", customTypeSerializer: typeof(PrototypeIdSerializer<TagPrototype>))]
+    public string BalloonTag = "Balloon";
+
+    /// <summary>
+    /// The sound played when a balloon is popped.
+    /// </summary>
+    [DataField("popSound")]
+    public SoundSpecifier PopSound = new SoundPathSpecifier("/Audio/Effects/balloon-pop.ogg");
+}
diff --git a/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
new file mode 100644
index 0000000000..d7864ba16c
--- /dev/null
+++ b/Content.Server/Weapons/Melee/Balloon/BalloonPopperSystem.cs
@@ -0,0 +1,54 @@
+using Content.Server.Hands.Systems;
+using Content.Server.Popups;
+using Content.Shared.IdentityManagement;
+using Content.Shared.Popups;
+using Content.Shared.Tag;
+using Content.Shared.Weapons.Melee.Events;
+
+namespace Content.Server.Weapons.Melee.Balloon;
+
+/// <summary>
+/// This handles popping ballons when attacked with <see cref="BalloonPopperComponent"/>
+/// </summary>
+public sealed class BalloonPopperSystem : EntitySystem
+{
+    [Dependency] private readonly SharedAudioSystem _audio = default!;
+    [Dependency] private readonly HandsSystem _hands = default!;
+    [Dependency] private readonly PopupSystem _popup = default!;
+    [Dependency] private readonly TagSystem _tag = default!;
+
+    /// <inheritdoc/>
+    public override void Initialize()
+    {
+        SubscribeLocalEvent<BalloonPopperComponent, MeleeHitEvent>(OnMeleeHit);
+    }
+
+    private void OnMeleeHit(EntityUid uid, BalloonPopperComponent component, MeleeHitEvent args)
+    {
+        foreach (var entity in args.HitEntities)
+        {
+            foreach (var held in _hands.EnumerateHeld(entity))
+            {
+                if (_tag.HasTag(held, component.BalloonTag))
+                    PopBallooon(uid, held, component);
+            }
+
+            if (_tag.HasTag(entity, component.BalloonTag))
+                PopBallooon(uid, entity, component);
+        }
+    }
+
+    /// <summary>
+    /// Pops a target balloon, making a popup and playing a sound.
+    /// </summary>
+    public void PopBallooon(EntityUid popper, EntityUid balloon, BalloonPopperComponent? component = null)
+    {
+        if (!Resolve(popper, ref component))
+            return;
+
+        _audio.PlayPvs(component.PopSound, balloon);
+        _popup.PopupCoordinates(Loc.GetString("melee-balloon-pop",
+            ("balloon", Identity.Entity(balloon, EntityManager))), Transform(balloon).Coordinates, PopupType.Large);
+        QueueDel(balloon);
+    }
+}
diff --git a/Resources/Audio/Effects/attributions.yml b/Resources/Audio/Effects/attributions.yml
index 6624f15ba6..0d5702171a 100644
--- a/Resources/Audio/Effects/attributions.yml
+++ b/Resources/Audio/Effects/attributions.yml
@@ -1,3 +1,8 @@
+- files: ["balloon-pop"]
+  license: "CC-BY-4.0"
+  copyright: "Taken from Aesterial-Arts on freesound.org and converted to mono by EmoGarbage404 (github)"
+  source: "https://freesound.org/people/Aesterial-Arts/sounds/633835/"
+
 - files: ["pill_insert.ogg", "pill_remove.ogg"]
   license: "CC-BY-NC-SA-3.0"
   copyright: "Amateur foley and audio editing by Bright0."
diff --git a/Resources/Audio/Effects/balloon-pop.ogg b/Resources/Audio/Effects/balloon-pop.ogg
new file mode 100644
index 0000000000000000000000000000000000000000..c3bb51f4e87adc812975b55491c21ef7e3524ef9
GIT binary patch
literal 7265
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
Q1?G;8iZK6c2Su{}KVx-~SO5S3

literal 0
HcmV?d00001

diff --git a/Resources/Locale/en-US/weapons/melee/melee.ftl b/Resources/Locale/en-US/weapons/melee/melee.ftl
index ad18c43121..6dddfcc824 100644
--- a/Resources/Locale/en-US/weapons/melee/melee.ftl
+++ b/Resources/Locale/en-US/weapons/melee/melee.ftl
@@ -1 +1,3 @@
 melee-inject-failed-hardsuit = Your {$weapon} cannot inject through hardsuits!
+
+melee-balloon-pop = {CAPITALIZE(THE($balloon))} popped!
diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
index 0795d59f05..d7997b1d4d 100644
--- a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
+++ b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -67,6 +67,8 @@
       - id: ClothingHeadsetSecurity
       - id: ClothingHandsGlovesColorBlack
       - id: ClothingShoesBootsJack
+      - id: WeaponMeleeNeedle
+        prob: 0.1
 
 - type: entity
   id: LockerBrigmedicFilled
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 0769a04a9b..12e97de4d9 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -721,6 +721,11 @@
     size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: synb
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Tag
+    tags:
+    - Balloon
 
 - type: entity
   parent: BaseItem
@@ -735,6 +740,11 @@
     size: 24
     sprite: Objects/Fun/toys.rsi
     heldPrefix: corgib
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Tag
+    tags:
+    - Balloon
 
 - type: entity
   parent: BaseItem
diff --git a/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
new file mode 100644
index 0000000000..cfe6c7b273
--- /dev/null
+++ b/Resources/Prototypes/Entities/Objects/Weapons/Melee/needle.yml
@@ -0,0 +1,16 @@
+- type: entity
+  parent: BaseItem
+  id: WeaponMeleeNeedle
+  name: official security anti-inflatable armament
+  description: A specialty weapon used in the destruction of unique syndicate morale-boosting equipment.
+  components:
+  - type: Sprite
+    sprite: Objects/Weapons/Melee/needle.rsi
+    state: icon
+  - type: MeleeWeapon
+    damage:
+      types:
+        Piercing: 1
+  - type: Item
+    size: 1
+  - type: BalloonPopper
diff --git a/Resources/Prototypes/tags.yml b/Resources/Prototypes/tags.yml
index a0a6433c61..5d22537db1 100644
--- a/Resources/Prototypes/tags.yml
+++ b/Resources/Prototypes/tags.yml
@@ -22,6 +22,9 @@
 - type: Tag
   id: Baguette
 
+- type: Tag
+  id: Balloon
+
 - type: Tag
   id: BaseballBat
 
diff --git a/Resources/Textures/Objects/Weapons/Melee/needle.rsi/icon.png b/Resources/Textures/Objects/Weapons/Melee/needle.rsi/icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..14ef636b6f447b7db40cd708ed0590916dad3318
GIT binary patch
literal 307
zcmV-30nGl1P)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px#?MXyIR9J=W*1ZmbFcbyg<ImvBnCQUZ6LeuE@qK(2-@t{@$$`Zf2PYB-M;dd}
zRd9k3q=C}gy7WvWgnlQvPzr>Ec+5UYs=vWHeCY#MMB4i^A9x`pE?L%VIV&&*cUE95
z?xcVT&R)P2XDu)VXDcujXDMKVTNkj!tqO49lM8U+05CUw;Jn_j;Q+8O#q&>z)thj<
zU0J@M(Tmi0UY0mK?ri(V;6n9(ToGaWe6iw#1!5tZLj>2%yV1Ucu@F@uB~EGT^vs~e
zcTrSzuf3#we)EC%jzAGLBXBYIc76_}^(F(rIUW)M0AG$o%~P7w5H$b*002ovPDHLk
FV1oKtfLj0n

literal 0
HcmV?d00001

diff --git a/Resources/Textures/Objects/Weapons/Melee/needle.rsi/meta.json b/Resources/Textures/Objects/Weapons/Melee/needle.rsi/meta.json
new file mode 100644
index 0000000000..d8c80a1fd6
--- /dev/null
+++ b/Resources/Textures/Objects/Weapons/Melee/needle.rsi/meta.json
@@ -0,0 +1,14 @@
+{
+    "version": 1,
+    "license": "CC0-1.0",
+    "copyright": "Created by EmoGarbage404 (github) for Space Station 14.",
+    "size": {
+        "x": 32,
+        "y": 32
+    },
+    "states": [
+        {
+            "name": "icon"
+        }
+    ]
+}