From 0536ce6f95aced669913dacc7d89554ee6bc652f Mon Sep 17 00:00:00 2001 From: MACMAN2003 Date: Mon, 26 Feb 2024 15:15:53 -0800 Subject: [PATCH] add NanoTrasen balloon (#25543) nt balloon surprised one didn't exist already --- .../Prototypes/Catalog/Fills/Crates/fun.yml | 1 + .../Markers/Spawners/Random/maintenance.yml | 1 + .../Prototypes/Entities/Objects/Fun/toys.yml | 19 ++++++++++++++++++ .../Structures/Machines/Computers/arcades.yml | 1 + .../Textures/Objects/Fun/toys.rsi/meta.json | 13 +++++++++++- .../Objects/Fun/toys.rsi/ntb-inhand-left.png | Bin 0 -> 602 bytes .../Objects/Fun/toys.rsi/ntb-inhand-right.png | Bin 0 -> 582 bytes .../Textures/Objects/Fun/toys.rsi/ntb.png | Bin 0 -> 346 bytes 8 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-left.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/ntb-inhand-right.png create mode 100644 Resources/Textures/Objects/Fun/toys.rsi/ntb.png 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 0000000000000000000000000000000000000000..d650573ce88367a00a480868bc8afbd0aeac4eba GIT binary patch literal 602 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1quc4evc&978JN-p<)4@aX~4)@eT@bmu-l;yKmPka5{2fu=;( z7n|DJZ&YN=u~1ojk9nJ*XhY4W6%0=%yRs^*=TQw?zt?obHHLfFjw)ZwXXv^ybdqy0LGg9e2;Q* zpqR_5hWGFIJQ)nx**6+lhzcG7`iVtnwp!zi#oQH=Z!SOQe`punpwqmebJ;F|Cc$@i zE~&kAvp$sDeYVl%i<|*#2*an7i|xaZukrL>4KW9LD$+YZevPKxtN6DC)v`$;|8XrKASXG`QweS5j5 zM^huG`K*7}rE=i%->u%4MbeEEaJQ{JG@6MEp(*h+X~sfd7Mr87>d5JY`+cz?>w^$Z<7PnBjt& zlQ+YHUxosc1wvx?=N9~aefEEX><#uB9r2{w3E{D?#GO0?Mb-v>a(Fx4ZpE$>=?!W= z3_V$fj0UTYvK+XP@@&rTgKsqsRHd!HDZhjvwZ2C0aEfVn8|Sr9!lvI6;>1s;*b3=DjSL74G){)!Z!;CoLO$B+p3WC>PfIRmH6MF$$0*(GYYtNuIh zj5zp=^JotrA76l6qQfNS3f`Lkn?17}DsLQI|J+={F8+qkmYqHUvob!UMT<);X3j}E z!Z1lz;oU60Whb`^$WD0Euz$^;1gR$iSr$zx><1W5C|)UGxyi@C2;?iVH!z$LRB-5X zK5?q;%zpbrmzj7PjyOE{J^Q&z>fwc<0*x{aJPl&Lj9pJ1b{05vF>ClSPiYEd4|u~6 zVAWuBl1appA(}}=l;^F+0+Sz(4LR%wbe5Y)wWUcN2xXeY+*YQvgl&O^U=Y`dA_kp* k>?YEDvt29>G&C|YYzopr0GCmAjQ{`u literal 0 HcmV?d00001 -- 2.52.0