From: MACMAN2003 <macman2003c@gmail.com>
Date: Mon, 26 Feb 2024 23:15:53 +0000 (-0800)
Subject: add NanoTrasen balloon (#25543)
X-Git-Url: https://git.smokeofanarchy.ru/gitweb.cgi?a=commitdiff_plain;h=0536ce6f95aced669913dacc7d89554ee6bc652f;p=space-station-14.git

add NanoTrasen balloon (#25543)

nt balloon

surprised one didn't exist already
---

diff --git a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
index d5e87fe0b5..f41d5282f3 100644
--- a/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
+++ b/Resources/Prototypes/Catalog/Fills/Crates/fun.yml
@@ -298,6 +298,7 @@
       - id: MrDips
         orGroup: Giftpool
       - id: RevolverCapGun
+      - id: BalloonNT
       - id: ClothingShoesClownLarge
       - id: ClothingHeadHatMagician
       - id: BeachBall
diff --git a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
index 9aa6dc9141..5481ddbda4 100644
--- a/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
+++ b/Resources/Prototypes/Entities/Markers/Spawners/Random/maintenance.yml
@@ -32,6 +32,7 @@
         - Basketball
         - Football
         - BalloonCorgi
+        - BalloonNT
         - PonderingOrb
         - Skub
         - DrinkMugDog
diff --git a/Resources/Prototypes/Entities/Objects/Fun/toys.yml b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
index 5566b65bf4..86470ac804 100644
--- a/Resources/Prototypes/Entities/Objects/Fun/toys.yml
+++ b/Resources/Prototypes/Entities/Objects/Fun/toys.yml
@@ -1010,6 +1010,25 @@
     tags:
     - Balloon
 
+- type: entity
+  parent: BaseItem
+  id: BalloonNT
+  name: nanotrasen balloon
+  description: Specially designed to inflict maximum psychological damage to Syndicate operatives.
+  components:
+  - type: Sprite
+    sprite: Objects/Fun/toys.rsi
+    state: ntb
+  - type: Item
+    size: Small
+    sprite: Objects/Fun/toys.rsi
+    heldPrefix: ntb
+  - type: Damageable
+    damageContainer: Inorganic
+  - type: Tag
+    tags:
+    - Balloon
+
 - type: entity
   parent: BaseItem
   id: BalloonCorgi
diff --git a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
index 64a443cffc..d2ba7cd544 100644
--- a/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
+++ b/Resources/Prototypes/Entities/Structures/Machines/Computers/arcades.yml
@@ -72,6 +72,7 @@
     - PlushieRouny
     - PlushieBee
     - PlushieSlime
+    - BalloonNT
     - BalloonCorgi
     - ToySword
     - CrayonBox
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/meta.json b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
index 11f08bc0dd..ef50532eba 100644
--- a/Resources/Textures/Objects/Fun/toys.rsi/meta.json
+++ b/Resources/Textures/Objects/Fun/toys.rsi/meta.json
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd",
+  "copyright": "Taken from tgstation at https://github.com/tgstation/tgstation/commit/e1142f20f5e4661cb6845cfcf2dd69f864d67432, orb, orb-inhand-left and orb-inhand-right created by Pancake, plushie_diona and plushie_diona1 created by discord user Deos#5630, toy-mouse-equipped-HELMET is a resprited 1-equipped-HELMET in mouse.rsi by PuroSlavKing (Github), plushie_xeno by LinkUyx#6557, plushie_hampter by RenLou#4333, beachball taken from https://github.com/ss220-space/Paradise/commit/662c08272acd7be79531550919f56f846726eabb, beachb-inhand by ;3#1161, bee hat and in-hand sprites drawn by Ubaser, plushie_penguin by netwy, plushie_arachnid by PixelTheKermit (github), plushie human by TheShuEd, NanoTrasen Balloon by MACMAN2003",
   "size": {
     "x": 32,
     "y": 32
@@ -172,6 +172,14 @@
             "name": "corgib-inhand-left",
             "directions": 4
         },
+        {
+            "name": "ntb-inhand-right",
+            "directions": 4
+        },
+        {
+            "name": "ntb-inhand-left",
+            "directions": 4
+        },
         {
             "name": "synb-inhand-left",
             "directions": 4
@@ -183,6 +191,9 @@
         {
             "name": "synb"
         },
+		{
+			"name": "ntb"
+		},
         {
             "name": "corgib"
         },
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png
new file mode 100644
index 0000000000..d650573ce8
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png
new file mode 100644
index 0000000000..2f978de38a
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png differ
diff --git a/Resources/Textures/Objects/Fun/toys.rsi/ntb.png b/Resources/Textures/Objects/Fun/toys.rsi/ntb.png
new file mode 100644
index 0000000000..76400a6a64
Binary files /dev/null and b/Resources/Textures/Objects/Fun/toys.rsi/ntb.png differ