From fdc7e2e7c801a48192e730992ca6529e7af93d93 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Wed, 5 Jun 2024 14:26:06 -0400 Subject: [PATCH 01/28] Pirate Uplink and New Drip. Adds in a fully operational pirate coconut uplink, as well as new drippy drip. Listed as draft as awaiting updated icon sprites. --- Resources/Locale/en-US/_NF/store/currency.ftl | 1 + .../Locale/en-US/_NF/store/uplink-catalog.ftl | 37 ++- .../Prototypes/Catalog/Fills/Crates/antag.yml | 15 ++ .../Structures/Storage/Crates/crates.yml | 4 +- .../_NF/Catalog/pirate_uplink_catalog.yml | 226 ++++++++++++++++++ .../_NF/Entities/Clothing/Head/hats.yml | 30 +++ .../_NF/Entities/Clothing/Neck/cloaks.yml | 11 +- .../Entities/Clothing/OuterClothing/coats.yml | 11 + .../_NF/Entities/Clothing/Shoes/boots.yml | 26 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 22 ++ .../_NF/Entities/Objects/Specific/pirate.yml | 107 +++++++++ .../Objects/Weapons/Melee/piratehook.yml | 14 ++ Resources/Prototypes/_NF/Store/categories.yml | 25 ++ Resources/Prototypes/_NF/Store/presets.yml | 12 + .../Hats/pirate_hat.rsi/equipped-HELMET.png | Bin 0 -> 867 bytes .../Head/Hats/pirate_hat.rsi/icon.png | Bin 0 -> 392 bytes .../Head/Hats/pirate_hat.rsi/inhand-left.png | Bin 0 -> 384 bytes .../Head/Hats/pirate_hat.rsi/inhand-right.png | Bin 0 -> 383 bytes .../Head/Hats/pirate_hat.rsi/meta.json | 26 ++ .../pirate_hat_luffy.rsi/equipped-HELMET.png | Bin 0 -> 498 bytes .../Head/Hats/pirate_hat_luffy.rsi/icon.png | Bin 0 -> 378 bytes .../Hats/pirate_hat_luffy.rsi/inhand-left.png | Bin 0 -> 474 bytes .../pirate_hat_luffy.rsi/inhand-right.png | Bin 0 -> 457 bytes .../Head/Hats/pirate_hat_luffy.rsi/meta.json | 26 ++ .../pirate_parrot.rsi/equipped-NECK.png | Bin 0 -> 409 bytes .../Neck/Cloaks/pirate_parrot.rsi/icon.png | Bin 0 -> 695 bytes .../Cloaks/pirate_parrot.rsi/inhand-left.png | Bin 0 -> 257 bytes .../Cloaks/pirate_parrot.rsi/inhand-right.png | Bin 0 -> 268 bytes .../Neck/Cloaks/pirate_parrot.rsi/meta.json | 26 ++ .../equipped-OUTERCLOTHING.png | Bin 0 -> 1524 bytes .../Misc/pirate_captain.rsi/icon.png | Bin 0 -> 627 bytes .../Misc/pirate_captain.rsi/inhand-left.png | Bin 0 -> 461 bytes .../Misc/pirate_captain.rsi/inhand-right.png | Bin 0 -> 460 bytes .../Misc/pirate_captain.rsi/meta.json | 26 ++ .../Shoes/Boots/pirate.rsi/equipped-FEET.png | Bin 0 -> 408 bytes .../Clothing/Shoes/Boots/pirate.rsi/icon.png | Bin 0 -> 546 bytes .../Shoes/Boots/pirate.rsi/inhand-left.png | Bin 0 -> 324 bytes .../Shoes/Boots/pirate.rsi/inhand-right.png | Bin 0 -> 332 bytes .../Clothing/Shoes/Boots/pirate.rsi/meta.json | 26 ++ .../Boots/pirate_luffy.rsi/equipped-FEET.png | Bin 0 -> 287 bytes .../Shoes/Boots/pirate_luffy.rsi/icon.png | Bin 0 -> 585 bytes .../Boots/pirate_luffy.rsi/inhand-left.png | Bin 0 -> 389 bytes .../Boots/pirate_luffy.rsi/inhand-right.png | Bin 0 -> 392 bytes .../Shoes/Boots/pirate_luffy.rsi/meta.json | 26 ++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1187 bytes .../Jumpsuit/pirate_luffy.rsi/icon.png | Bin 0 -> 423 bytes .../Jumpsuit/pirate_luffy.rsi/inhand-left.png | Bin 0 -> 277 bytes .../pirate_luffy.rsi/inhand-right.png | Bin 0 -> 276 bytes .../Jumpsuit/pirate_luffy.rsi/meta.json | 26 ++ .../equipped-INNERCLOTHING.png | Bin 0 -> 1305 bytes .../Jumpsuit/pirate_slops.rsi/icon.png | Bin 0 -> 468 bytes .../Jumpsuit/pirate_slops.rsi/inhand-left.png | Bin 0 -> 441 bytes .../pirate_slops.rsi/inhand-right.png | Bin 0 -> 417 bytes .../Jumpsuit/pirate_slops.rsi/meta.json | 26 ++ .../Devices/pirate_uplink.rsi/icon.png | Bin 0 -> 654 bytes .../Devices/pirate_uplink.rsi/inhand-left.png | Bin 0 -> 261 bytes .../pirate_uplink.rsi/inhand-right.png | Bin 0 -> 262 bytes .../Devices/pirate_uplink.rsi/meta.json | 22 ++ .../Pirate/pirate_doubloon.rsi/doubloon.png | Bin 0 -> 486 bytes .../Pirate/pirate_doubloon.rsi/meta.json | 22 ++ .../Weapons/Melee/pirate_hook.rsi/icon.png | Bin 0 -> 630 bytes .../Melee/pirate_hook.rsi/inhand-left.png | Bin 0 -> 447 bytes .../Melee/pirate_hook.rsi/inhand-right.png | Bin 0 -> 468 bytes .../Weapons/Melee/pirate_hook.rsi/meta.json | 22 ++ 64 files changed, 810 insertions(+), 5 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml create mode 100644 Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/piratehook.yml create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/equipped-HELMET.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/equipped-NECK.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/equipped-OUTERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/equipped-FEET.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/equipped-INNERCLOTHING.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/icon.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/doubloon.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/icon.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/inhand-right.png create mode 100644 Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json diff --git a/Resources/Locale/en-US/_NF/store/currency.ftl b/Resources/Locale/en-US/_NF/store/currency.ftl index e6bb8966930..b09b85ff6a6 100644 --- a/Resources/Locale/en-US/_NF/store/currency.ftl +++ b/Resources/Locale/en-US/_NF/store/currency.ftl @@ -1 +1,2 @@ store-currency-display-security-telecrystal = FUC +store-currency-display-pirate-telecrystal = DB diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 9ff0cb4f2cd..bca68675bfd 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -141,4 +141,39 @@ uplink-security-stingergrenade-box-desc = A box containing 4 stinger grenades. uplink-security-breachingcharge-box-name = Breaching Charge Box uplink-security-breachingcharge-box-desc = A box containing 4 breaching charges. uplink-security-hoverbike-name = NFSD Hoverbike Flatpack -uplink-security-hoverbike-desc = Flatpack containing NFSD issued turbine with bike handles. Keys already slotted in the ignition. Very safe. \ No newline at end of file +uplink-security-hoverbike-desc = Flatpack containing NFSD issued turbine with bike handles. Keys already slotted in the ignition. Very safe. + +store-category-piratehardsuits = EVA Suits +store-category-pirateweapons = Weapons +store-category-pirateutility = Utility +store-category-pirateammo = Ammunition +store-category-pirateexplosives = Explosives + +uplink-pirate-hardsuit-name = Pirate HardSuit +uplink-security-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. +uplink-pirate-hardsuit-captain-name = Pirate Captain's Hardsuit +uplink-pirate-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. +uplink-pirate-crate-captain-name = Pirate Captain's Crate +uplink-pirate-crate-captain-desc = A crate filled with the necessary goodies for a pirate captain. +uplink-pirate-crate-name = Pirate Crate +uplink-pirate-crate-desc = A crate filled with the necessary goodies for a pirate. +uplink-pirate-magboots-name = Pirate Magboots +uplink-pirate-magboots-desc = Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. +uplink-pirate-hoverbike-name = Pirate Hoverbike +uplink-pirate-hoverbike-desc = Yarr! Dis be me sovereign space shuttle. Now, whaur me rum? +uplink-pirate-blunderbuss-name = Blunderbuss +uplink-pirate-blunderbuss-desc = Deadly at close range, an illegal shotgun often found at the side of a pirate. +uplink-pirate-revolver-name = Pirate Revolver +uplink-pirate-revolver-desc = An odd, illegal, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. +uplink-pirate-cannon-name = Pirate Cannon +uplink-pirate-cannon-desc = Kaboom! +uplink-pirate-cannonball-name = Cannonball +uplink-pirate-cannonball-desc = A ball made to be shot from a cannon. +uplink-pirate-grapeshot-name = Grapeshot +uplink-pirate-grapeshot-desc = A cluster ball made to shoot a wide range of small projectiles. +uplink-pirate-glassshot-name = Glassshot +uplink-pirate-glassshot-desc = A brittle glass ball that will fire multiple projectiles in a tight spread. +uplink-pirate-crateammo-name = Cannonball Crate +uplink-pirate-crateammo-desc = A crate filled with cannonballs. +uplink-pirate-satchel-name = Pirate Satchel +uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml index fd1af8a3b98..101c86b2330 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml @@ -32,3 +32,18 @@ amount: 2 - id: ClothingHeadsetFreelance # Frontier amount: 3 # Frontier + +- type: entity + id: CratePirateChestAmmo + name: crews ammo chest + suffix: Filled + parent: CratePirate + components: + - type: StorageFill + contents: + - id: CannonBall + amount: 6 + - id: CannonBallGrapeshot + amount: 6 + - id: CannonBallGlassshot + amount: 6 diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index bd7c4acaadd..cf20f579472 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -426,7 +426,7 @@ description: A space pirate chest, not for station lubbers. components: - type: Sprite - sprite: Structures/Storage/Crates/piratechest.rsi + sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi layers: - state: crate map: ["enum.StorageVisualLayers.Base"] @@ -440,7 +440,7 @@ offset: "0.0,-0.09375" map: ["enum.PaperLabelVisuals.Layer"] - type: Icon - sprite: Structures/Storage/Crates/piratechest.rsi + sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi state: crate_icon - type: Appearance - type: EntityStorageVisuals diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml new file mode 100644 index 00000000000..8afa084e637 --- /dev/null +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -0,0 +1,226 @@ +- type: listing + id: UplinkPirateHardsuit + name: uplink-pirate-hardsuit-name + description: uplink-pirate-hardsuit-desc + productEntity: ClothingOuterHardsuitPirateEVA + icon: { sprite: Clothing/OuterClothing/Hardsuits/pirateeva.rsi, state: icon } + cost: + Doubloon: 2 + categories: + - UplinkPirateHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateHardsuit + name: uplink-pirate-hardsuit-captain-name + description: uplink-pirate-hardsuit-captain-desc + productEntity: ClothingOuterHardsuitPirateCap + icon: { sprite: Clothing/OuterClothing/Hardsuits/piratecaptain.rsi, state: icon } + cost: + Doubloon: 3 + categories: + - UplinkPirateHardsuits + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateCaptainCrateFilled + name: uplink-pirate-crate-captain-name + description: uplink-pirate-crate-captain-desc + productEntity: CratePirateChestCaptain + icon: { sprite: Structures/Storage/Crates/piratechest.rsi, state: crate_icon } + cost: + Doubloon: 8 + categories: + - UplinkPirateBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + - !type:BuyerJobCondition + whitelist: + - PirateCaptain + +- type: listing + id: UplinkPirateCrateFilled + name: uplink-pirate-crate-name + description: uplink-pirate-crate-desc + productEntity: CratePirateChest + icon: { sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi, state: crate_icon } + cost: + Doubloon: 8 + categories: + - UplinkPirateBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateCrateFilledAmmo + name: uplink-pirate-crateammo-name + description: uplink-pirate-crateammo-desc + productEntity: CratePirateChestAmmo + icon: { sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi, state: crate_icon } + cost: + Doubloon: 5 + categories: + - UplinkPirateBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateSatchelFilled + name: uplink-pirate-satchel-name + description: uplink-pirate-satchel-desc + productEntity: ClothingBackpackPirateFilled + icon: { sprite: Clothing/Back/Satchels/leather.rsi, state: crate_icon } + cost: + Doubloon: 6 + categories: + - UplinkPirateBundles + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateMagboots + name: uplink-pirate-magboots-name + description: uplink-pirate-magboots-desc + productEntity: ClothingShoesBootsMagPirate + icon: { sprite: _NF/Clothing/Shoes/Boots/magboots-pirate.rsi, state: icon } + cost: + Doubloon: 2 + categories: + - UplinkPirateUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateHoverbike + name: uplink-pirate-hoverbike-name + description: uplink-pirate-hoverbike-desc + productEntity: VehicleHoverbikePirateKey + icon: { sprite: _NF/Objects/Vehicles/hoverbike.rsi, state: keys } + cost: + Doubloon: 10 + categories: + - UplinkPirateUtility + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateBlunderbuss + name: uplink-pirate-blunderbuss-name + description: uplink-pirate-blunderbuss-desc + productEntity: WeaponShotgunBlunderbuss + icon: { sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi, state: icon } + cost: + Doubloon: 4 + categories: + - UplinkPirateWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateRevolver + name: uplink-pirate-revolver-name + description: uplink-pirate-revolver-desc + productEntity: WeaponRevolverPirate + icon: { sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi, state: icon } + cost: + Doubloon: 3 + categories: + - UplinkPirateWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateCannon + name: uplink-pirate-cannon-name + description: uplink-pirate-cannon-desc + productEntity: WeaponLauncherPirateCannon + icon: { sprite: Objects/Weapons/Guns/Launchers/pirate_cannon.rsi, state: icon } + cost: + Doubloon: 6 + categories: + - UplinkPirateWeapons + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateCannonball + name: uplink-pirate-cannonball-name + description: uplink-pirate-cannonball-desc + productEntity: CannonBall + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: ball } + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateGrapeshot + name: uplink-pirate-grapeshot-name + description: uplink-pirate-grapeshot-desc + productEntity: CannonBallGrapeshot + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: grapeshot } + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink + +- type: listing + id: UplinkPirateGlassshot + name: uplink-pirate-glassshot-name + description: uplink-pirate-glassshot-desc + productEntity: CannonBallGlassshot + icon: { sprite: Objects/Weapons/Guns/Ammunition/Explosives/explosives.rsi, state: glassshot } + cost: + Doubloon: 1 + categories: + - UplinkPirateAmmo + conditions: + - !type:StoreWhitelistCondition + whitelist: + tags: + - PirateUplink \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 0d9c7cb69b0..84bf74cdae5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -138,6 +138,36 @@ - ClothMade - WhitelistChameleon +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatPirate + name: pirate's hat + description: Y'Arrgghhh. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hats/pirate_hat.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/pirate_hat.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + +- type: entity + parent: ClothingHeadBase + id: ClothingHeadHatPirateLuffy + name: suspicious pirate's hat + description: This here hat be lookin' suspicious. + components: + - type: Sprite + sprite: _NF/Clothing/Head/Hats/pirate_hat_luffy.rsi + - type: Clothing + sprite: _NF/Clothing/Head/Hats/pirate_hat_luffy.rsi + - type: Tag + tags: + - ClothMade + - WhitelistChameleon + - type: entity parent: ClothingHeadBase id: ClothingHeadHatNfsdBeretGreen diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml index 9138eaca6de..6e88c180d93 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -16,4 +16,13 @@ description: A top of the line cloak for Frontier Outpost's station representative. Made from exquisite fibers and furs, this thing must have cost a fortune! The fact this cloak was even issued shows the trust Central Command is placing in their representative on this outpost. components: - type: Sprite - sprite: _NF/Clothing/Neck/Cloaks/sr.rsi \ No newline at end of file + sprite: _NF/Clothing/Neck/Cloaks/sr.rsi + +- type: entity + parent: ClothingNeckBase + id: ClothingNeckCloakPirateParrot + name: polly the pirate parrot + description: A mute parrot named polly, that enjoys crackers and cannons. + components: + - type: Sprite + sprite: _NF/Clothing/Neck/Cloaks/pirate_parrot.rsi \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml index 872f9fc7a21..3f731167066 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml @@ -144,3 +144,14 @@ sprite: _NF/Clothing/OuterClothing/Misc/sr_jacket.rsi - type: Clothing sprite: _NF/Clothing/OuterClothing/Misc/sr_jacket.rsi + +- type: entity + parent: ClothingOuterStorageBase + id: ClothingOuterCoatPirateCaptain + name: pirate captain's coat + description: Y'arrgh har fiddle di dee. + components: + - type: Sprite + sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi + - type: Clothing + sprite: _NF/Clothing/OuterClothing/Misc/pirate_captain.rsi diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml index 7d67242c132..c7799615b28 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml @@ -30,4 +30,28 @@ - type: Sprite sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi - type: Clothing - sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi \ No newline at end of file + sprite: _NF/Clothing/Shoes/Boots/nfsd_cream_boots.rsi + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsPirate + name: pirate boots + description: These boots can hold an endless hoard of foot. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/pirate.rsi + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/pirate.rsi + - type: Matchbox + +- type: entity + parent: ClothingShoesBaseButcherable + id: ClothingShoesBootsPirateLuffy + name: suspicious pirate sandals + description: A rather suspicious looking set of pirate sandals. + components: + - type: Sprite + sprite: _NF/Clothing/Shoes/Boots/pirate_luffy.rsi + - type: Clothing + sprite: _NF/Clothing/Shoes/Boots/pirate_luffy.rsi + - type: Matchbox \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 31351e1bbf0..06cd464c3ac 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -232,3 +232,25 @@ sprite: Clothing/Uniforms/Jumpsuit/lawyergalaxyblue.rsi - type: Clothing sprite: Clothing/Uniforms/Jumpsuit/lawyergalaxyblue.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPirate + name: pirate slops + description: A raggedy but comfortable uniform to plunder the sector. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi + +- type: entity + parent: ClothingUniformBase + id: ClothingUniformJumpsuitPirateLuffy + name: suspicious pirate uniform + description: A rather suspicious looking set of pirate underclothes. + components: + - type: Sprite + sprite: _NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi + - type: Clothing + sprite: _NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml new file mode 100644 index 00000000000..699202c1555 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -0,0 +1,107 @@ +- type: entity + name: doubloon + parent: BaseItem + id: Doubloon + suffix: 20 DB + description: A dirty gold coin used for nefarious pirate exchanges. + components: + - type: Sprite + sprite: _NF/Objects/Specific/Pirate/pirate_doubloon.rsi + state: doubloon + - type: Item + sprite: _NF/Objects/Specific/Pirate/pirate_doubloon.rsi + size: Tiny + - type: Stack + count: 20 + stackType: Doubloon + - type: StaticPrice + price: 0 + - type: StackPrice + price: 200 + - type: Currency + price: + Doubloon: 1 + +- type: entity + parent: Doubloon + id: Doubloon1 + suffix: 1 DB + components: + - type: Stack + count: 1 + +- type: entity + parent: Doubloon + id: Doubloon5 + suffix: 5 DB + components: + - type: Stack + count: 5 + +- type: entity + parent: Doubloon + id: Doubloon10 + suffix: 10 DB + components: + - type: Stack + count: 10 + +# Uplinks +- type: entity + parent: BaseItem + id: BasePirateUplink + name: pirate uplink + description: A coconut with an antenna? + suffix: Empty + noSpawn: true + components: + - type: Sprite + sprite: _NF/Objects/Devices/pirate_uplink.rsi + layers: + - state: icon + - type: Item + sprite: _NF/Objects/Devices/pirate_uplink.rsi + heldPrefix: icon + - type: UserInterface + interfaces: + enum.StoreUiKey.Key: + type: StoreBoundUserInterface + - type: ActivatableUI + key: enum.StoreUiKey.Key + - type: Store + preset: StorePresetPirateUplink + balance: + Doubloon: 0 + - type: Tag + tags: + - PirateUplink + +- type: entity + parent: BasePirateUplink + id: BasePirateUplinkRadioDebug + suffix: Pirate, DEBUG + components: + - type: Store + preset: StorePresetPirateUplink + balance: + FrontierUplinkCoin: 99999 + +- type: entity + parent: BasePirateUplink + id: BaseSecurityUplinkRadioPirateCaptain + suffix: P. Captian 20 + components: + - type: Store + preset: StorePresetPirateUplink + balance: + FrontierUplinkCoin: 20 + +- type: entity + parent: BasePirateUplink + id: BaseSecurityUplinkPirateCrew + suffix: Crew 15 + components: + - type: Store + preset: StorePresetPirateUplink + balance: + FrontierUplinkCoin: 15 \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/piratehook.yml b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/piratehook.yml new file mode 100644 index 00000000000..dbab8379828 --- /dev/null +++ b/Resources/Prototypes/_NF/Entities/Objects/Weapons/Melee/piratehook.yml @@ -0,0 +1,14 @@ +- type: entity + name: pirate hook + parent: BaseKnife + id: PirateHook + description: A pirate hook. + components: + - type: Tag + tags: + - Knife + - type: Sprite + sprite: _NF/Objects/Weapons/Melee/pirate_hook.rsi + state: icon + - type: Item + sprite: _NF/Objects/Weapons/Melee/pirate_hook.rsi diff --git a/Resources/Prototypes/_NF/Store/categories.yml b/Resources/Prototypes/_NF/Store/categories.yml index 4ed53144bec..48010a26f5f 100644 --- a/Resources/Prototypes/_NF/Store/categories.yml +++ b/Resources/Prototypes/_NF/Store/categories.yml @@ -23,3 +23,28 @@ id: UplinkSecurityExplosives name: store-category-explosives +#pirate +- type: storeCategory + id: UplinkPirateBundles + name: store-category-piratebundles + +- type: storeCategory + id: UplinkPirateHardsuits + name: store-category-piratehardsuits + +- type: storeCategory + id: UplinkPirateWeapons + name: store-category-pirateweapons + +- type: storeCategory + id: UplinkPirateAmmo + name: store-category-pirateammo + +- type: storeCategory + id: UplinkPirateUtility + name: store-category-pirateutility + +- type: storeCategory + id: UplinkPirateExplosives + name: store-category-pirateexplosives + diff --git a/Resources/Prototypes/_NF/Store/presets.yml b/Resources/Prototypes/_NF/Store/presets.yml index 7f43f074571..4c237b8acd5 100644 --- a/Resources/Prototypes/_NF/Store/presets.yml +++ b/Resources/Prototypes/_NF/Store/presets.yml @@ -27,3 +27,15 @@ - UplinkSecurityExplosives currencyWhitelist: - FrontierUplinkCoin + +- type: storePreset + id: StorePresetPirateUplink + storeName: Pirate Uplink + categories: + - UplinkPirateHardsuits + - UplinkPirateWeapons + - UplinkPirateAmmo + - UplinkPirateUtility + - UplinkPirateExplosives + currencyWhitelist: + - Doubloon \ No newline at end of file diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/equipped-HELMET.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/equipped-HELMET.png new file mode 100644 index 0000000000000000000000000000000000000000..2a35ac54e396721405d9c90f3463cb4cb3af1283 GIT binary patch literal 867 zcmV-p1DyPcP)Px&14%?dRCt{2n$K$*K@`W|1e1!%CZu~2dP8U{| zQ#=SeTDB7y%jh|dXnG-W@#Ap&gGhWCga-7+Uckle-4Xx*vb8PtpSX%5lJI$ zKv=+{R%F&hXRR3N?r?a*ljEa6tNQHxVy;gg>?BRsw|6Ab4HDb=SDwDH7Wv-4X(G(^?HvhM!YucA+|CgH zhKw*yrwcdMy_5lS{|hhyS|%OXJn^Gt$KD1ql@Vq*8pBr32*i}xEFpum0cYnIB>dnB z<8-?GeE;B(B=y&|e{e{?ef=WbAH)p tt&L}q0000EWmrjOO-%qQ00008000000002eQ|k1|%Oc%$NbB7>k44ofy`glX(ebYk0aihD5Z! zoqRg0*+HbO-Z`o1pwo**0XbZI12Qg!n$Hc5iw)0Xy}zLAg3#;>D<}0FDp`8O!)lgV zWXtE=XJzNkn9q@HP~d1%==kiGEv2z^&DpbY%eQ(ioIUIHuH~Y)L?XL+l#4kSJgz^w zpEP$HXTHAwr5CRaepx;9=3|KXz`{K*Vc!#tYfsKkPw9~j&nT+b=5E}tac#f-;;Ol# zCVDqN-;L<@!$iv?zukE*OEfIk?pd$rEje%9sXKjz3xDpbk673~`}L{Z zuW{w+YfgMRWpQ$;m}}tT;0!-JJ`rGlcU%95s*kO>pI;@7^;YTte7 k+7e&@@})+2ruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ0HaK(JOBUy literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..8242ee5774d160e86aed58e4973c9d2f211043b7 GIT binary patch literal 384 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%z6+B%WLn`LH zy>-y*u!F#{kNM@7yE~NjHHb#rYk#z1rZaP1Y4W(71o;Ue(Wf;QiE-`#=-yZ zw`@pBo8jXp$q6(O1U?i`zIegT`hV$~^*iPq^lNW_wm0}geq#57P!@g9T|4G&Jy%*+ zmNO~j=n^e8&mf;=t8dm`t6J*AE5ZLu&GVk6t^Ty^^1Vtc#G6!JF01)tcK_tXM$b!H zZfjTVC<{L~f0Oxw6M`ulYckLM-hKNuXVdiWe)qPnuFX&PKIx+w`T1M+)0)pw_NQ)L zJeiSUxVJw?bn>2Jue4eBY`2^-Ln`LH zy=Cit#6hI>;pCY*KU$T_nifc;3W~BGJT^Z+`FXhF>J{||oHpD(6Vp9G>79U*hR=iA zRZrRu%-lIyE1U^vBnX)3_4DhN&fR=JO)u!^>dh-XgJc)I5>WM2oRws9_iWtc_fHXK@^0;f!>) zUp!oP-)1)2aerpiOr8%E-jSRgu!=?ENV+E5(fVYF<2NwSmGMrqD`UjX72ne$@DypdL zVd(h#a@Sg4{iH1=j7+&<91p)2?tS}mr}gg8=LhV=PY7Mfu}C|nb?o|Kg_Q40roN2b zKi9tW!og!*j5F3pe2m&H&#FXxflTz*WrL}Bz z9@~wj@-t4UKivFhVxRbvS@AB&;NLzU-XnXzKHXs|y>-=d?Q8wKo+i?LooP&q+B6P4 zJevFJ&(ZbrGq*g|+4uV+gR}jTn+0du9fLu>c+vi`w21%Y-rDe0KN%XzUJDvbF`V$? zBKuXLy<7B8Klu5F?Yyk-nw=saGz?B;+c6xwsvDj&srJ{B$m*IIX>XLci^XQUhX?|k1|%Oc%$NbB7>k44ofy`glX(ebOL@9DhD5Z! zooeXU>LB1SzwXB0Z)Rd)_YRzDajsyoPIi1R`9?=)M~C|dg=0^mGxT>mY?vkgV6(z+ z=R_lYMHS=CyY-oQ7HD)W(&)CZOe>t2{x;&z!>77c_b=aQJ^$T&u~G3(%SA2o-mQyn zxMa?5+39)ql~e!r@V(7m_rI)Lc`LMqVbA)4bL^kbRqk1zv`sB?*MfDg_fAPzd$YTw zIB55(3-7+p)jz->W+DBgo`JnWVVQe(Ys))k;g#!rbQXVJbYk;)8229+jmEb?bkkFknyEPc&7RKGH3zW V96$^Lmx3pQC{I^Emvv4FO#n-apqT&w literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..377e65156baf9c0fbc45d0a5d6ecbbf914085b49 GIT binary patch literal 474 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zt2|vCLn`LH zy|vKaDNyA2M}5D0cQ5d=F`9KJIBTeMU(87_HZksf!lN>4X4*&n5B&;}S6v+k9WYd*6>UeCa#y^P2T=K7-HwmJKf|XZ5e+{@j5CmL%mR1nN8!^oehqlw#UH z;S}$NIqn`$*&6QJG@Yz*xTN!3@XY+#lP~3)Gc)MVPA%TcQgcSx;ZOL>D|rkz&L}VW zCe5(zGl!DWC;7e1dqkT=jNVQ828gTe~DWM4f DU@X&s literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..853847e597e14f2e28ac504780748721aa3c9c77 GIT binary patch literal 457 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zGd*1#Ln`LH zy|v%#aDd41kMXWTE1bNoHFo?+4_@x4*LTjYv84FjGnI39=lo`{YvjKed*`U5OTam=j<=*j|aHr7VeUJ;w_j{e{@gS z*JaB@6@wc-7EJiIOIG$>Zn~aXwVmk0r;pwD=D9z9ctCRVXBLU?=IJj#RTVFe&2KT? zZE@E#_O;FH)6$6&8eK_y>*`kD&(s%r`17szq%OHpgAhqbN4Lyxjk?H$30J$ zHq|%mJgK6;_S@|Ev`2bgauDY;Fid$KJb8b`X=cQyvvr01V*g=h%)oG9 rQM_*L#MF&3#xg()_);T0(|mmyw18|5sD+n;Cxcj?u6{1-oD!Muzv?q0cYg?-1uhtC!)D=5;Ob$IJa|G>3k zM_A9P&N;pRW!~QFm(E>&Zf?0}pWS=q_g~mMIy%I-9y=Ven2`EBV#&5SnG?OEp7iQJ zc=>bbuQ{AN8*RdM&QIk?OZJvHJdI3;me+C93~Y=Q_7$lX%7K`8mtttGB{)1Gfz#<2Fxqnl@HnPi{;(EFMftl4`! zoo#WPZSwQbhd-P<6HZB#Wv^@4#B%Js~M{Qui9OI?_+yXzD)W12QE->CCL7F pVcbMVv#JhYi1MXIc&7RKGH3zW96$^Lmx3pQC{I^Emvv4FO#nXGw7>uW literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/icon.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..fb821672ae65dcdedc2934562ef47dee5ae22060 GIT binary patch literal 695 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE3?yBabR7dyjKx9jP7LeL$-D$|4g~mwxHkN6 z5Rix#l$%n|BO&h`DeJ$0-+cj(p!j+QP98DQK2Zi)yYNMA-h#3{J9lz^ELU@?)4Gz# ztL7Q9Oh+_ywpGAnb3WNgM~)nk*Vf&#Ws9_3AiwLZ`@g<1a0#sM^}IVaifw+^m{e7Z2HS>UeaVQD$3ugFF z84%WW7cPaJDI7Ij^T z`cNX$Aqwu6g?w zYuA3cE4(oNwZox(A`*)ZeyFnOVBp>_KZ}u}P^q-DK>f`q~@Nhe8RMn@vrO&dqPP-?hJBwjKPu`WX>F>5>Id6WJ zUg!60Md`VqY0poc)ce73C06t3lv}&LEaLzE;NACE8_s`So!i&`r68x2QBICKbc+Al zf1kYrr-laZ-Nu;uby?&0RXNOl@dsA!J;JH=lb&aMbXo!e1-%O9U+ z$U0YjM_g^fZ^vjJ+vR%qvO&f$Ff_d9{J#6nt@B@bzO8zx+;U}8zd+DyJEw@Xzd0Bf t{&Y+CGdtgxes6LKsFW`?!ZXd+mq82221TipNv literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..60d93726e5dcd48c364d961815cfe1727b86bf9b GIT binary patch literal 268 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|)_A%&hE&XX zduuQ6Ap-%nfbA0tggM(BPccX~tlh-uoT9SLW8$$8krs~!AEZCWWu8>Oe{=4B0iec) z{o=FrYJc;*|4pZ7XBaN}~W+6ehoH^q5?1_D9(luyBXB3909)KN`k6Vuc*-f$zz zm|1`8wKG7;7;9!BXXpFRcE$z+d3>o6o@u_m3|c@o2M~k6rQpdR%G1@)Wt~$(695;; BVb%Zu literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json new file mode 100644 index 00000000000..d54984433da --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-NECK", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/equipped-OUTERCLOTHING.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/equipped-OUTERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..c05d68330d0acebf78f5933059af5d740aca5b01 GIT binary patch literal 1524 zcmVPx)lu1NERCt{2nn7qAM-+ztk=9-bZ7oNtsa?^=iA{+ib?2r&CY1&0TB@q5fKp)5fLvZ#ILek*a85g^TPmu3u9@PRP0;6 z{rHi4?}y)OR+vL=|m`7f^hFaR~~bwZ~M zMvY-{x`O2KV{EW*%~x1iMEf5sYsjcEsBwa%LR{NLqmFy;??~GZB*3%n6YTQcI4ILl zV|8TIn5UjQaOJ)Rg;@CRqZ91a>|b3Ip=3?4i?=K&M1vXw%4YpQ8#M-8UC}_9h5Oeh z0*laAfXTU0mQC8tc=SE4n4UI|D<;wj#jU@5H;!$6l&#KgbSwh5FGjvXfNh<+|8xI% z-KE=BVEeIl4MeteiW+NPS7TnMx{Xn{zn?nxvq{A*06-o4#=+q5#a94v^!+;b^XEzT znzzd)6->^Jwva0rqWv9%BH8aBu*rS}JBFNnUjfbxC6Ln;WD;@kaEdnxs;LFt{d{$H zgJcqMhh6)rz8KbvRnpA1NSpxc#VSel#a#RC@D*VGd?}E#KYh~N zv-$I-LobKr!qx%%JBB?4X~VcuW=}yr`l9`IwA}}!^TTc@ZsbQ;8Vvn_TTB2uygdlM zF8o7){q?ug{XnCA6@Xp5DwqJOAoxXjDHDXi`+&*0QKqS_^{P5kqtm6Y6=RtM z1H7GW?7Y}6C{i0Cs}Ahdn%5cVJRI9Wg-wna3C-$*5?FxsVwD&cZE3`WEx>xQ+SMOI zqJ4|n_N}@-;=EXOyYm*M()OhyfIHC&vt>=^lnYy~eZ!*IG4_jLQMdE5t52Z!0YSKy zA7QV9VYaZ0)*{A*hB(^?LgQ> z0)*{A*hB(^?LgSP^a32}=kR;C-(viTyji}$Q6T0d0QL#>%4dH{`yl;7q{2=!0I*6r z%WT(h2WoY>F_3-;iU*VYC|rrz<>Axb9*zLE4Q@~L;jl=a3-tc@ zs~uu4LL-#P`zRH&MvdXMR1AYoj!>#EhO$xjgkrCmTF^ZyF^w3lQdn9b?fT+$#l3FK z7CQ>WTm)JN-W=#hPE(N66l4?fBOw(5Q$+)(?tqjFkKE7rnf-v1H_&Uo|DuX_g&c)n z#?o%x;&cV`cjN{|N`PlLxHl*P7z9uO!N3t5k(U5G1wqcSb??(ZJU!mSNbi=xW>D-O ziBiq>sl<=Xks^ zT`dd|cv6&@DI$xM0Q`);YEkGG#jZ(FHug)ek|Ua7Iz{ZfNxivCL6Ck1IJtMB&HmNd z4Z`z~_5kdf)KeFhUq{XjfL#I!|Hny0M8pfte?GvFJ*T!X_W%F@4rN$LW=%~1DgXcg a2mk;800000(o>TF0000Px%6G=otR9J=WmA`M(KorM6uASPEtOgt+wdz2sEU6G$G(0vGW*W8wV0`F^a_Ck95o3_uc#6JKr-D6ciK` z{NHFQqEY8F0F~x00JjSei9daHEc+=jjk4&?Y$Cls4VW;o^+LG;Uz9|=Q$#=RFd zhBoE-{R6pDJzL9^vZ14PU8?1|JiaZ?$H9W;d>l}*jCB3@RA=DUrQ7N&o7z$pW*N94 zNnyND(g6_3d_6Bp&Kr)ERwqejn+6jBqGo$t2#nq%qg+Xja_9@ zPbvu8kd6SDBziQSc0OsK-hUF5Us+;?IQb|(i_1bmO@O28DT zA*;eRXQ=C#RLcefckz|k+d6kMzmhzx-G`3ab+OIW=kVgIJZjf-l`2<-rZb3Er1OED zJe$U>U7_C4)BI^jI9t9RF#oVs8{zNds!(s}X${8`fcNc>Y2xIXf>nW=FqC=ze^j8` z>T4&>JqZ?d1qB5K1^>cNd%(<#sMxBU0000EWmrjOO-%qQ00008000000002eQ?gu1Vi zU$~8xA?24~Ry4!PI+l;0zhzH);Vxh+x8JO@t|dy`VG&S4HG{(a{($N??hF3xW7OI- oZ>P{7mwCWg;7g70O!M_+&;qhKfEWZW1y2T1p00i_>zopr0N{kd!vFvP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..f5ec854071166d1a3af6decd972b0d7f653f20cc GIT binary patch literal 460 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zb39!fLn`LH zy=9ws$UuVafqCX4r@3Vft2B~QoRbnB3dP%MJVhgjb4mS7NAe)aw|F$KSFVe#Va zTlV+n>FHm1ZxvZBt@>#DG!uh;!MBRnu9@_AU32W3jWstrif<(t1>D-mczv6|QYpt7 z4}L!Oj@hit+jDll zy+Tp_gI8al59|N_wsf`mzm4~IuX^>y{98ga+uv#>1o)*LY|I>bWcosz%f`%;Zm}|) zImhFXC4S(`nT917Cof+)vr+5O=L$)nWU7?t1N#)VPg1c>YUym}nr1Q@-8X+GJb$y1 llyo3468KUhJkxxA8MJ_G4j=}BOTm*tl&7no%Q~loCIIx^!KMHJ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/meta.json b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/meta.json new file mode 100644 index 00000000000..bf80b86ee5e --- /dev/null +++ b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by GentleButter for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-OUTERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..a9673adc1acb16a7338c1bcd9643fa71fa589976 GIT binary patch literal 408 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zEj(QuLn`LH zy>-y*u!8{GgZi}QsSYhs8$@ir?5v5t?-DS9Yg>YXiHY@N#n{ZF&O$v~f7NezlX~;! z-I=%f99)pV7k!WUN4J{?n;Y-2J|nZ*SMzh`!&OXzjvS2rt4r70`pd?*%RT$I&Suv6 z(C61@#m83)E6=)-cHnMc*jACBM_h05q&QA&ZMgdD?d{bGYkthtO4vDL=gfm=7XD6X zcVW?DGH#!lxN}D3`QLMO>aL|;)N^Cu4G7#}{eUmrwNpx5Q6W{KH@3%i{g2&`g$0qo z#h=n&dgsm(YWRD8jn=$4v&E)vHBUE0G97R~>~g=B&D`UUX!EA9C&KIuSHJz;v_RvN zH^YI$pI@(-I^o~H(^=hWQVa*y%ssv8-%T!$#@QL}>{6GXN4(^5-pl+rPx$!bwCyR9J=WmQ7B=KorOSoqlKu4d_CRi5p!RS6qTquyf-XT(R;Do`C~!1(vLg zY|w=XQ4+yK0`k$03uu{X-%M>{q9OB3nzS?T<3F#jGX)F=gTY`h>^7Ea;_Cc_FIN$k zt5E5@3L^l(%iGujfV1NR4gikLls>Lw!*v)Qo?gk^YR^AncLc?+tLR)F|E@w#o`LJw zNn=wh7aQ2ISz;sF#x|~F=L%9*Nc9z@c^rTTuD5YO8_I7fX6$?A~5rI(S6wUXIbd0WY0iqITCO{XEyk$LCC$m+YZx z;PYzWD@)&M1Za19=#R5;`(q33P7kd{pmNv7mm(e=mN@{3RiP>re?ZIvW^=hG{5_9H zn^e>Z;<lnHmF)VGMt4t<2p@A6z&rDw+03T?JkDjqlDaWWiDk17gnr000hU kSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g8#AV?EnA( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..f1c58dc3a565b8cc422cb30f47cd6277c98e7e3b GIT binary patch literal 324 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|o_M-AhE&XX zd+RJ$Q-VP2Lr+}|4a1`zw@dy{4;Q(${IZiyR7Ohk-w$@$qBeDXyFPUQ^?*U!&Ge1$ zE_vMkd$wxnZ=GxVijSRmB^<&2>z+$l=91&Zibs#0)cLSqY4zzNRt8b$w(bd8bm`84 zhao)s+ET;B&l~CZJBbR;^nLHI#V6hz7kzq-T^jR=$pPNa<@&CcZoZehrzZ2^w8--_ zco(dCeY@;I^`*L4*OyC5t{&e6a{xnweZoaWgZJz`Z}0Lo{`~)Kgy)Qt)ID%hT1*Wt~$( F69C2@hDrbc literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..0cd7d126fb6a34aae916d934c670798c96e33d44 GIT binary patch literal 332 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|-gvq=hE&XX zd()S@$w8#`;q0h@ge0$tTVMYFzh}_}xBTvX963SSMUQI3tQH@BcxX)@2T&6TIHXKg z-8JucRc-v4WxGxaZTJJyJOo9}(;6IF7r-%aqYGcn@&*0!1K+s<0ZWEbkV z>a*v6-}&{oUB>L2)!R0DDT@k9^1c`LS>(BXy~Fe~TbU!4P82(4vnKTF&pD|=--bP0l+XkKu)2pI literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/meta.json new file mode 100644 index 00000000000..762c194a368 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by GentleButter for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/equipped-FEET.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/equipped-FEET.png new file mode 100644 index 0000000000000000000000000000000000000000..28466deed5135afc9e652217acbf0e68b29b787c GIT binary patch literal 287 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|_ItWGhE&XX zd&`io$w8p?;dZkHVj&_bVlfBiiSa#f+`+Up{DZ=rLyIezS|fUnimADU8%U`B++U{l zK6k$|BhUaSc=u_|CKFBFEtA!jK8+N;Gc$X?O6KN!Y=`fk{lD=(Z{)4_DU(Xx{rRW&91Ok1sXCGtJkRK?}&{fSPkD Qcru9P>FVdQ&MBb@0ND6y{r~^~ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..4c6977b8ce8d9a3aaea53b269795c066f8e5fa5f GIT binary patch literal 585 zcmV-P0=E5$P)Px$=}AOER9J=Wl|4(tKp4mWX<{sGjZmtaTg5uKbcj&IcJKoTMJI9S*0G<&u}Hx| zoCHD8(Lu!uI=DC(#m!BNV6>$#d2xu>Cgz%?^##QHO_#gpp68dlTsA`VFWV;A!Y3s60NY))VDfKqNZ@U5s z*~MNO27ulr`dQ|)l=$H?9tru1Fc^$~%R7FBv2DjUK!pGR01jnXNoGw=04e|g00;m8 X000000Mb*F00000NkvXXu0mjfJgoW} literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..5e9775df2eff5ecbf14dcc5e1ee85c27e50fbf53 GIT binary patch literal 389 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zRXtrCLn`LH zy=9oiImt)`4 z`O zRrcSkLPC{$#M}eV&l@=w!r(yN|Bl-8;8Pgio49$2fTQuUGgSmf=?~O+jkl} zB35pDT2>?=)ugKG`}hAe?(ao<^6k6tDl-CY0D=R8nyRuc3v=V{+m-yz@S0@8qf`8> z_LS|`lFuLJMND5lKgG^-cZo!V+Uo`TmqwO9sW!bEyW4G&-g)g$duPomRo|$#k@5Ta z@JUOSPw(Day8XYnZg})r@$93UdsQ^&<(kB=*&358oGm16@XFt$&su8B@<~e^t5+4? zxwyjqq(xcTD!<6M#f#!jPg40BHEoZZYv}Sh#YPa9fyheh7xVXb7&B)EJ!jq*ykush z3A^b6Ab)0;)9oL5*Wbh)Fxb%ZzRXwT*8gX&3=9P>`xrJ^MEmrLC%p#h=1Yz6O!M_+ Z&;qhKK*j;VrQpdR%G1@)Wt~$(69Dt-ntK2M literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/meta.json new file mode 100644 index 00000000000..762c194a368 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-NC-SA-4.0", + "copyright": "Content created by GentleButter for Frontier Server", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-FEET", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..f1f944d2256c7ffb9bcb88c7a59594037aff6067 GIT binary patch literal 1187 zcmV;U1YG-xP)Px(LrFwIRCt{2n$K$-Wf;dl?`CG(q=N>fW}vL&wRWH*`Yz8+@Y-FIhyKC?Sps_zGu z?7Z{N`+eT;`|M&;98;=a2F`Uk7XWi9 z^m7vNYAmz{+CH}iIsmG1KS=-*{jzmDZM_WT6#7FMux?ErU}Y7;@=a}Crk^okeat2p z^KGiuE7>kFVW0u)@#+RZEzYiuQun?!6sGUEOt8&2`azby9=q;<|i=X_KnL^V!PjZ=R4s!U-a&odvK<&VF&Gc(}g+;bWrilLRfCJul* z<=Y~C(MLe%JiL75e0b`2oNsvfj<#{4a~@M?XJY+U%A1(#wIlJELw^^5$Y~m3NBhBk zXImENoQJAMTE3@HjS%097F^ZCwyYQy(G^je`SJUZyZ3LYr!Tyq-z!}Lpy6fmJ*bV- zFoZBN;qKn1TAW{MiDqrUYj0g4e=hnmdJ+U&|Na)QFF)VWmKB{^n=HTa(n$KEkATDB za5x+ehr{7;I2;bge*y6?xb{}Hy$M;&urQ(ssq{x6>+9!X;%C=rb6IpWx)n>x3@OqH}|0Is> zZIFIN6XV7%j7V<9Bx4-J$iE5?Dx1lYemlg&GO_{3aUhe-0AkIwH32rFjgdJN#kRe7 z%?e6GlmS;i8AC)ulC=O)Jj36MMH$eo9wZ>jf=On8S^aLsP}1TokpcboUW=uPJ_q$g zx=kyJ`qxjN)KAQM%_4-qu3ym5Dptt7xib+L8b2)R{d*@A7V`Y|V}%z#uP77W(P5qC zuOAK_hd5xnNWw7VH(<(V`}dzFV!-7~uWITcTi@-ny&3R!@p7|ZV`pzOyGLPwoxM#J zRb*JnHo?gQk=9hS0J8-@_2eOCk(4P%0opR*QDMg;C6xh5;iK9pqom`gR_Ee}^UWC2 znvlwXSFSAKPtP<969B&X_UBXqq~)D=Uv9oX2?E0E5qECh7LPO1li*1(&XVZIHwK5p z@%ZvDk2A8QCYE5(0000EWmrjOO-%qQ00008000000002eQ|k1|%Oc%$NbB7>k44ofy`glX(ebyL-AghD5Z! zoxIWOu!BUyes0fzIWCKw4;~f&;5g@w>~E%p&C%)$ojbd`zv$NR6qX2x3kq`e9uaU3 z7B1r3o8c9060W83-O;1ye|`PFKjrLf%?A^HEdSzA=BU?I>iBKik$uiDPW3c~?ERiy zYUP!}eS^hMy6*5L!BwZX)Sfu39T^+yx9ZcZMXFPnX8!uH0TlI7g+*3$TK+-cT?FMrP6JGr5-Hh1CQ zyUv=r(wUYWM($Hs7wPP<UlZ(AK2{(Fio zZ$3+^ow;1^vgH1UZ?k5fOfZn(X|q4Y{-Y^VIq}M(GGO@frABzB`T8`sSTm z_gSvq>cPH6#rERcwC`8eZU1NWTXyEwd!Fw>h5^Be=^LFd{K;5TR&uX~Ve4-WU-k(b z`!AF*2!8#|@$&Px_|q92m77sEIE%!ZXd+mq822<^Y)j1eby* OgD6i|KbLh*2~7YN0cL0b literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/inhand-right.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..1c388e4e486323823ed9f00bd3a4b64246bd018c GIT binary patch literal 276 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|ws^WYhE&XX zd+Q)?lY;>3g^NZ#y*Ij2Z!~OVJiUQo)&{}HoqQG#BB$KdIo8tpJ?~9p&A)TKoj{EY z3>_WCF7`EY^Uj`~a_06V@oNiAiZ?Yp)?Ac5dtdhKRb3i0uU%x)6P$hf>*qJyGyZ?o zjn^wKW16OS^ITndh4kX%pY2|Ac4(ZRGY4!K1H-jd$L2Q9c@&?#wf;juA>-C}JUyCP z3qWF?!W&eMZV!Ka&Y|lsLxX8GW7B5y|8`tin}9m`QX@Rme0>?TfNTz^Ntc2rgIJ!f KelF{r5}E*OU~NnQ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json new file mode 100644 index 00000000000..62d07416703 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/equipped-INNERCLOTHING.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/equipped-INNERCLOTHING.png new file mode 100644 index 0000000000000000000000000000000000000000..e2a14fbd838f772770df7072f7291d5142a97c81 GIT binary patch literal 1305 zcmV+!1?KvRP)Px(xk*GpRCt{2n$2(AL>R^&r}1WYopwW$Z9=0!qLv(*MQW5o5~M&*C>58U5Epu( zs(Rsskl@-2kx)wFHPx@yoL!h)$il3zx5BX?~hrxO}~7yLLcy3Zhdd-2MIYa&DvOv<*vB5ACkq zaMn|H^%;gvq%e{ma6DZs6Py^*93%cHRZuSOAT#x<(?=^&;MTwWT^2759d-Kl&o;Ml zyIjS>Tba=MO(P(w9d&+l=dUz$#0T$Y?)(+SeP1i^KB_ww&Rx9b(dUEq&-S^C*Ocmx z6anP7`E88(>G*wXwo8%$|zaVEpG zWP;6RCOh&H)Jc7z2uSqB5LbH;kEx#ecuYlH?Lne1{L4xd5`8fYruv~J6VQ@Lr(R1Y zFqrC(q%Y)vcua+=_F|7(P}TbO;V%0f({AE16>9Ghn3fG{QAgjjY^c3QBIyh70RUi_ z6qMT7qZTZy2E%Oci%&C%VW7H8Jo?pL0%91E`itZM08kVK-~O2G*q2|o^o1Ni3=@WF zgIYH1{d%3f4^Yd7VcH;u*{VHV*B5etVN%$&eVCRFyH=|kP^DYrIcM+W>Zt60D#riElf>~1}02&1GaUOaT~ZjnYTX?vPGzIc4e8R zhX(@B1c7?a!0n$NchngRXU{NyJ_4s$CMXpuLQaVMrzlYOxSLK7K1joFgD64{*!;EN z5l#<#6C)PRp6TexP>@D?c);TXw~b+l6antj;bNJfSgxPm9u%7Gglo8U{Wgiv^mO6v+Ypqy)q4PKulxx3)WB zLX>C@_=hAV1SL#JBoc`Te*xLw|k1|%Oc%$NbB7>k44ofy`glX(ebmw383hD5Z! zonq*J$U)@ze}Q#d_A&}j*&(?&(Lh#(r=ycod47{5yShF5WM&WB`7r0!(;XJJig`y8t%H}8{k-(u zOl!-D+_ysQ>ERRK9q#=y<5^^7%G`ef-&|MDIs+B%i{W|dR=hiFR!|yFjJu`o9=|rI{+x-j<86}@L#^0YM!0=_) z;t4JLfBjs`ZTap^d&qk0rpM>52~AQ;U)njFO>~o(s_>kypFBX4E3$h>X23bG{P)Y) z7?jsJrU$-|;(l7%3uH(X`d)MQ^SCY{(S1-zopr00zFqSO5S3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/inhand-left.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..7ba6421c21475779798ee7f5e6a71ced25914122 GIT binary patch literal 441 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zBRyRlLn`LH zy|vfxP=Lg-kL-&L4>&|{sPG*-D3Scf!)K1nUiNp5XL-ZlH59P(#5Kk=Xy>TNc61*+ z=aZ4tb^N8k6)v&(PTv3buT1`8V_AF2uT~Xk1qd7{in&pymt(#EU71wgjqF{O)%%R! zn8t3uJmcNmvs)Fv$y;(gk zeY=*nNTNtgkL@KcuNfW;Rhtfww|`Y~yyXhBWr z`6IR&1{|Slw;FkFTD3JS=i2`1=TqW?AAEUtU)?enxUbOcpCEr=YhEkQQCE}V z}}u7?bbCwDaNr*+uOwhZScQsQ@hifrgYv7iL(PZ2nwu!Tdb`^bQV1~<4(lY6r)g+KJT7L-RVFvnK|E^*34d1xTgE`>;-!|uFkeDUVhi;`0m@w zF6Yg>{8!f4I()*$5Le^pbxf0{sI2@N;|^qt8PwKtU;5%a>B~HoNlPw14t^V7FK^5Y zaW6xI)TdJ8gyg@b-{!ub-Dq=;)g;k)!qJ@!D0!W!ZXd+mjT4)fSP+Lcru9P>FVdQ&MBb@0L5an AMF0Q* literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json new file mode 100644 index 00000000000..62d07416703 --- /dev/null +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json @@ -0,0 +1,26 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "equipped-INNERCLOTHING", + "directions": 4 + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon.png b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon.png new file mode 100644 index 0000000000000000000000000000000000000000..6711040164222856e6bf8aba0c0e140ee9be9ede GIT binary patch literal 654 zcmV;90&)F`P)Px%E=fc|R9J=Wmc33RF%*Rl2?>$N5LP3BRuLM7>pngs5oqG=2jr znk}+v28lo-kv}vEMdXafxz}?&3#$|yDUxG*?9b=gz6QSaEw`2^uUzeg{{^zM>h*fN z<1^|=E#MzewqF@e++dm451LQ&| z0+Ogd2BJ5*je=Ul+jSx!$x8a;q|8B4x(Klv3?wtl5@h3wZ+Qa(MT`?xlH zu2Uv~;$VRE@z)9(O#nc<-DV@P0ph}?2cF04z0)7B%jSg98}RDR2nZTYgkcB(sMqW0 zbUNgGq(ju|%+1S{v!G1f-rbY+qL5L5dHUCCH3UI`YPE`+?r%RJd(h)bx~#)y*HfbI zpzEt^KOhZdf*n`rNzHnxo86l(S-(lHix?<75@=S=l7NgxBdk{Lt8U}a<1_XaF@ME# z6WT7?;>L@jh^$XN3ogRs=yPuQ$c70TO;jrD*ea#S2OJCZFHn>#@5`k8=Y@YwrZ)BC zbGoB6LrcFY72GfY=tkQq!0lER`1^7VV=tHz`Ghs?Efvy}mW%$*l{_*gOMLz#ami;u zEpt&ocBnFeY$!kmW`p>^WCCf~U{d*jXo)}Yg~|g1cmSE=;POK3v_1fTN6&ObIWmI) o000hUSV?A0O#mtY000O800000007cclK=n!07*qoM6N<$g7)z!V*mgE literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..c3a2979d911b85d7988569225b66de43f62b4aa3 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU_B4hE&XX zd&`jPkb?m0g^R)-T_udOr&v0^tLN`m2_6PeQ0!T+Vs>}GdY0T80^f; z0^7_^3ElL5x=eDnM)LQ^u6{St+UDxb%zW)p+pzz-dEl>S{?#C*K%n#bc4x`e!xyEF zf6To1R{4zVqOiZr%f1Po+g>So)y|>!w8YD{Z>92y`)A)5HruJXc76V$nD^&DKaBWa x%fJx!nc-)KqU}bma6O<=e5nzhX}-P;T0l0~B|!R8@MIv#;OXk;vd$@?2>_8CVGRHP literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..8ddfd55cfad1fbb2e9d5435ff3294ee25b3211c9 GIT binary patch literal 262 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|mU+53hE&XX zd&`jPkb?m0g}@EdMP4$QX%;u#`7d(s;2|%^2&u`8WOIN_27*h$lR=cHtDnm{r-UW|Qcz;# literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json new file mode 100644 index 00000000000..c50d327eb31 --- /dev/null +++ b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-4.0", + "copyright": "Created by GentleButter for Frontier Station", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + }, + { + "name": "icon" + } + ] +} diff --git a/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/doubloon.png b/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/doubloon.png new file mode 100644 index 0000000000000000000000000000000000000000..15c5c9caed62040568c8b9f521573e8438cb3b2b GIT binary patch literal 486 zcmV@P)Px$hDk(0R9J=WmAgs=F%&@0xH7xr;$yW_un+|;6tNLO5DP!W)=IGOQ~U}`?F1{q zN1=rZiU^CYIt;qwCX<2+3lXQ-w=zIJw;1fWzT%I2;a#!|@lMZDPJZuE}z| zG=o@zRLCbqWm8z6X)Tl=&T6jj@MH=?6+xkhL#R##cA3h_ON z2-G`d82}^mL9wp{eqgFn&}+0i%R7A&@19Vt0W(8{dlBV9=pC(~5=awZY#KQIUm@>Z z77L-ME)Br&6x1&nUi2X;A;q`Wi5`q)jD=9y*Q)}kUxG|JGSRu9PqjlnM!>`%U^lx|fbvPW3|KJP)Px%7D+@wR9J=Wm&&9fEhwRu9l^{0@EzZ~6cx zkJDu@6in6BF|ll2X0mWBUm$U2MlKZmgJ2kG&U`xO%r68-9pxwCvgmd+GTD62EX%g$ z$Kx^me%~pkGthG|n^0+*G8hb;z^oSSgV}@voU#?U!X!x|cJHTmcK~!cof^tkf$f4M zNyIJ;z*Vm&-khIr&E4GGn1cbGD7E*Qt6tBmp}_)3DaohnYwr#B>D55()7Bw5YBl=C ztH$;@W!6pol2)e-AWc)J7>xnljz$L79^`6_jR9?z$~8M+VT{jd(-6U}ZyE*iZQ@;d zm25a1)=r$JsgpA|2DF0N{bu<>Ii>i0_pJ$pAX_ZR%Zeh;0jTtv&v%gqBJ z2%}{yhJnA&S_55PbPa&k8iQcI$SKPTgQzcnvv$j=bj}$n$`YeBCrTn^T;oKZ&eoVQ zMsZ9Ku3e)v%=s7plrpyyu&KBca_ zeGeB*-B)lY&^-r zXls<{SDT*OKL6c)q)T#|?RfjIC>mUd?Mi-OTB?UA{%_ccxzdg|i`! zKSgzP`PLS-Ef&1SZ*TA;#A&jq3eObJM<+Z|)|T8-RvD{MgCx9WHrmq zdwk+2U&=L3(Wz~^^oBtpdj0~Dc*eC`13$}cEBkh&y2Zt1={MF4o$$90*4bl$9a4C2)i1Kvxb6Mw<&;$U755UL( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..891b7911b50288009677896638f766fd6f383c07 GIT binary patch literal 468 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D%zOFUg1Ln`LH zy|v%(kOKqT2Y!L5>IqVu&g>E$%=!s3HO%hw4&OX!@q=qed1i;Ao|@ka?jLM^d|8hI z{vT-!`uB9st_jZ;Jj~hg@4)fv=63aN zr=D+jyek@H!8a#Xn&HEjKda8fgz$!)O0}7zTTuOJnc<`R(q+zf=J!3kmZd%aZXmB; zy0OeWcZuUp(K~Ep*qIJ#Ce-Ke`kBJ6>whg)(R{w9eQEd!zuha;Umd#Bl_*Xq|!uD`=r=342NXRG^@{jbBXefd}XKGeqZ{b~%H+1UXH zMH7DR+kZLlRE7*QgInN~?DPdsO`n{uUQxPtYI*bNoYRLMFKtaUzcMpf*Yl<0@-yY` zA5)qZcXPT0{+qsRTk6w&X{)APH&|!9VCu@bjV3eCGaR^cu0d>BIoq_<|J)MyBrhB~ ya*jbzaOn@$^2Q{|-pQ_Nz{ucBjqptK^<~fkvN?bl1TF$k( literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json new file mode 100644 index 00000000000..ad89d35bc6c --- /dev/null +++ b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json @@ -0,0 +1,22 @@ +{ + "version": 1, + "license": "CC-BY-SA-3.0", + "copyright": "Made by GentleButter for use on Frontier Station 14.", + "size": { + "x": 32, + "y": 32 + }, + "states": [ + { + "name": "icon" + }, + { + "name": "inhand-left", + "directions": 4 + }, + { + "name": "inhand-right", + "directions": 4 + } + ] +} From c5bc18ae3f7b56bb08fcf4354a0481e03cbe47e8 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 09:55:49 -0400 Subject: [PATCH 02/28] Added fixed textures. Drip is good, uplink is FUBAR. --- .../_NF/Catalog/pirate_uplink_catalog.yml | 2 +- .../_NF/Entities/Clothing/Head/hats.yml | 2 +- .../Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- .../Clothing/Head/Hats/pirate_hat.rsi/icon.png | Bin 392 -> 379 bytes .../Head/Hats/pirate_hat_luffy.rsi/icon.png | Bin 378 -> 378 bytes .../Misc/pirate_captain.rsi/icon.png | Bin 627 -> 622 bytes .../Clothing/Shoes/Boots/pirate.rsi/icon.png | Bin 546 -> 716 bytes .../Shoes/Boots/pirate_luffy.rsi/icon.png | Bin 585 -> 577 bytes .../Uniforms/Jumpsuit/pirate_luffy.rsi/icon.png | Bin 423 -> 466 bytes .../Uniforms/Jumpsuit/pirate_slops.rsi/icon.png | Bin 468 -> 463 bytes .../Objects/Devices/pirate_uplink.rsi/icon.png | Bin 654 -> 849 bytes .../Pirate/pirate_doubloon.rsi/doubloon.png | Bin 486 -> 482 bytes .../Pirate/pirate_doubloon.rsi/inhand-left.png | Bin 0 -> 150 bytes .../Pirate/pirate_doubloon.rsi/inhand-right.png | Bin 0 -> 155 bytes .../Weapons/Melee/pirate_hook.rsi/icon.png | Bin 630 -> 621 bytes 15 files changed, 3 insertions(+), 3 deletions(-) create mode 100644 Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-left.png create mode 100644 Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-right.png diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index 8afa084e637..9efc00d99f9 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -15,7 +15,7 @@ - PirateUplink - type: listing - id: UplinkPirateHardsuit + id: UplinkPirateHardsuitCaptain name: uplink-pirate-hardsuit-captain-name description: uplink-pirate-hardsuit-captain-desc productEntity: ClothingOuterHardsuitPirateCap diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml index 84bf74cdae5..d50d73de3ae 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml @@ -140,7 +140,7 @@ - type: entity parent: ClothingHeadBase - id: ClothingHeadHatPirate + id: ClothingHeadHatPirates name: pirate's hat description: Y'Arrgghhh. components: diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 06cd464c3ac..41c36d06f6e 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -235,7 +235,7 @@ - type: entity parent: ClothingUniformBase - id: ClothingUniformJumpsuitPirate + id: ClothingUniformJumpsuitPirateSlops name: pirate slops description: A raggedy but comfortable uniform to plunder the sector. components: diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/icon.png index 6ac5b1f7da86929ced8cbd32fad8715804c7dade..d784bf1de24e84af24b445c42e0b7cbd7928e221 100644 GIT binary patch delta 352 zcmV-m0iXVe1N#DhiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c60UJp~K~z|U?UPSygD@C}f0i~aDH)U<2E%r+KMdCHw99hZSJ#tQ!EZ1{ z*r;n+rnFJWPKs8nbzM)*bBRgbyzdj<2xv4Kjpp1j+5(h+Qnj_Wmql$+5@tA#b6SCN z;jK(DVPgP5vXy@p=^YyQ`uwQqkbn*emTLh3Scw=b5o5U)$oJIGm*SlNufY87M&$+f zk?((hhV{NR(At8h+nJJS1~TY_(GdV(!p3<2h`{IwBH3Veby*Y_$)-5lqZfwfdB+Ld zPp>PtA%lKbW2{WG$~?}L5r*O3{LR@)Ny_tw#T)=&nkMqc#yLk21VxPNy2ZC`+s6s) y;`@GO1c36ZkD{nkzSb64mena?R}TISwSX4T0$M-|oQhvHXKI7yIsCzsVgV-6iJ(CM literal 392 zcmeAS@N?(olHy`uVBq!ia0vp^Dj>|k1|%Oc%$NbB7>k44ofy`glX(ebYk0aihD5Z! zoqRg0*+HbO-Z`o1pwo**0XbZI12Qg!n$Hc5iw)0Xy}zLAg3#;>D<}0FDp`8O!)lgV zWXtE=XJzNkn9q@HP~d1%==kiGEv2z^&DpbY%eQ(ioIUIHuH~Y)L?XL+l#4kSJgz^w zpEP$HXTHAwr5CRaepx;9=3|KXz`{K*Vc!#tYfsKkPw9~j&nT+b=5E}tac#f-;;Ol# zCVDqN-;L<@!$iv?zukE*OEfIk?pd$rEje%9sXKjz3xDpbk673~`}L{Z zuW{w+YfgMRWpQ$;m}}tT;0!-JJ`rGlcU%95s*kO>pI;@7^;YTte7 k+7e&@@})+2ruq6ZXaU(AKnwzxf+vG0Pgg&ebxsLQ0HaK(JOBUy diff --git a/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi/icon.png index 154d69bca2c2ac2953f6bb1f4c891bd7f074a057..9ba1a688f84d55eb1bf50d11ddb06298a47679eb 100644 GIT binary patch delta 330 zcmV-Q0k!`60{Q|WiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^pPPMf3Z%5 zFcgMAz0h8F7Y8Tbz{!M%@DbdM1G~@Q=HS4K_y|6TF}V)9OIrv|B@|jNB_s~^PYB65 zr|17D74N*9DoqeUhJ@U cfN^ZiKOre8De3>}7knv>+{YwR8Ix22Ci72|mjD0& delta 330 zcmV-Q0k!`60{Q|WiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bn2{kFe=$yl zKoCHme%Sr?HWpUiz{-R}cmz9RLGKytEG)Q)NAMuV%EjRW>zR9HYYcf_>0IQ9HEfl)@+bF cz%X{qKTS~-MN$4Mzc_7<+!_Y@zLQh|Cb@8zNdN!< diff --git a/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/icon.png b/Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi/icon.png index a6dfe2557fefd50d3730fec3ff2d729b03cc30d6..3c7a6b10df738faaddab30924b2b06b315f4429a 100644 GIT binary patch delta 597 zcmV-b0;>J<1nvZXiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c60uD(;K~z|U?UX%l(_j>ZAJ>iRTfw}^d}$&BqSupvN4t| z5^Gp8z<`vIu_GfB65=N?WCbBb4P~GM2~7z2JC`B0Ng(lmhm-}8BfZOe&%N)t$G#Uf z*kFVI9ZFho)VTnl(%c2$PNO1aZI<$3=p?)wmH~hr2yc2LWm)bjXn9nQIu~5}H^u(+ zjg!|q=&C|6l_YKlf*T4i?v5#6zbaQs?^7EqEa2RB!knF5a5b*YwTw8(wV$KC?xeC$y%v?P9fsxq+a(rxuKMQr6! z8Dn4v#EmKYR_VB&=d@7)uVdmW#NJLAmf^oCCA8>tQ) z)(rMd4a-o8?NpbPyY;8zHYCRbCNUp{=bbMKWY2$$%qfT;CwgoYY1ZdB-y<>llDxGnq8LA;Qv!ZO zcO}3FYRIaz^$F-&I@Pkqz+RjJb6e&9+-fd@+ zGZYjQ6cqg5Xey#n=Q9A6<}LuY8WkxU^U!xgFV$UhECAe4c-0$e%VPhAp`^+fyO>@V z_rq6CUhZJ(8sSXRbvG3JNO*R8O!?|%xm0?qbl}{Ez6=iJ_*5qpn@DCj<`zNp%a9)l zLx0A-7dD1}Hs$&K1G!Q?Tg#NPp`&(Ps^z&nzAetj!Gh*|98j^0bp7~LXW-VQ+v+Qu z+ENu}8Mq-yVZ2b%0T9W2Jugbm8;+G$CrM_T1`|JI5=5!)%_EyTohcK4uF1yqhMrO` zr3xL^EcR^!$I?m4uP@pD#uGQ4@3#7yW9jVM28T6&OC^oEp~p8bls0?)V0jT#<6(_H zRB7&}J>_9@Pbvu8kd6SDBziQSc0OsK-hUF5Us+;?IQb|(i_ z1bmO@O28DTA*;eRXQ=C#RLcefckz|k+d6kMzmhzx-G`3ab+OIW=kVgIJZjf-l`2<- zrZb39R;2TRojjYytX-kr(9`^BNH|-*9x(r~RU6^&3_=xGhd5`g#Zk7?rMnu1k< on=q7l{(n@U+v;m4%{>Vgbp-_l1qJ`YPkX@3i>TPDoRdfbCKcouYXATM diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi/icon.png index 8d30613deb76a8ed326d86991aa0a97ed1ead5be..9cb95c64e720fbc0d1dee7944e5030902ed98d9c 100644 GIT binary patch delta 692 zcmV;l0!#g(1k440iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c60&Gb{K~z|U?N&W&6j2mC_r96QhBd1M6xm>*!77ba8VfwE7Oc+P;Oy8z_#o*TC`z6DR*Y7bp8Dn%Z)=E^4z&G?Q z{DDhLi-_X1(XZ2PQK#L)!+W<%<6F;ORaW3)exZLHB0L>8| z2T(1+@US-+Ztord0DRBX&T4OS6+0Ud*1K7~*Sms$os9^4o2#_~Y@Y4i1041SLjXf- zD@t%>`2qkSO$Dh;dR!EzrDQK3E#brGBV6kM`vamUZv;>8GS)7u_C~+fNDZT=($q3#)C8W@=qs0nT&Q8gufQ z#4fpiqF6fm8AVtK0sz_3V3%}SM3a!(&(I|o$%s?Qh;41iA#LRI zJ96Mny0J?>3(Qp1G4M@6cpkVsmYqZtM3kQ^-`P(GQ8sJJ-(9F?{s3$oP20J!XYuU# ai|B8Oo@0)G7ry{ncM3Qz1F_wc`~fDF2QChiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60m4Z{K~z|U?UqeW!ax+q|DAql2@U8%jfopw8CP6_Q?PU68CAVUf0Km)J*aCpF;{y%=j?I)lu4BV>7#^Np$=qtsKVo+T#jmUATps_f zLQbB6>)1(SQ!5u6*s)n+BihC`u4Cs4QdUUy6{L9{yj#@04qfcr0HuA8>*l9l3n@lX z`!rI8n%DJzO7ps2$rJfoQ2DfKtAWoKOL}AM-dlnHmF)VGMt4t<2p@A6z&rDw+03T?JkDjqlDaWWiDk K17gpUrUE7mVCc~R diff --git a/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi/icon.png index 4c6977b8ce8d9a3aaea53b269795c066f8e5fa5f..348714efeda515ea24be8b45cbc49b5f90ae7cd4 100644 GIT binary patch delta 552 zcmV+@0@wY?1i=J(j&djbAUq15R67t06?o}%*$=o79uZlx)3tz z!n`r}-DCl{2MM^DMC~zCs>9-kk>5j&WoHLk0_OLBTlP;psH*lG)V?*M==nV|+4d)SFUsS?N0jx@NCXk(qYN q0OlYcKWz=b@X{GI9}U6(doPCqj>bMdbHg8bzOilnMmJrPBLXHy$nOpS delta 560 zcmV-00?+-y1jz({iBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60qIFZK~z|U?Ug-C!$26v|7l_@ZH-W>n_I;?xO9k6#CGrl2t_Ax=+?2H z#IZ=hL7W6Z(9uD~3Ocwr7{$#^i(s^+FL`l@*Cytgr1b@V#QRN`yXT(gm%HQ+U@#aA z24f(&L4u1J!E9;0=dDYPI=>(bCTWifK>3^=H?&YOV-<+UbO1oTZS|`S-X&F#1yhPx zaZ%Cgdw$~q1QQDdk%`Cju8h5q7xox3pS;+Yg!;jA9KxdE*q(wcm|@WX&kgh?1Q#mh zMAN=9G};<}y-gz?(^1Nao~tzU3jGwmLea4BZN-A*`g<$%+jt5c-mL&|FLkrSq2+O; zv@{OQj&q#kAUTH;GW0qs)htztaH338+ccR^Vrz zet4c>rJQK)UoXPYUSV`p0Kn?}Ep{)QMIRbB8~{vzMP?mmj6F6qA|WJTsA`VFWV;A!Y3s60NY))V yDfKod!Ed_)3E9P78U}#gCHh(Bvy}MZG9C%}iZB?Af6F_5g|ThNH$a7x8v-WpAosNZ diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/icon.png b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/icon.png index 57553472ce20fa0efdf568429a1d0b2af7966def..36b3bb6988a0ba7b5056cedb81e2e9e4b2c45180 100644 GIT binary patch delta 440 zcmV;p0Z0C)1JVP3iBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c60dh%1K~z|U?Ug-C!%!54pBs{(bP}lwMF;%@B2Eq}I0;Vfj{O6rgIgz| zLy5C=bg8R9L;3^6#X*EZE49?nkAz$YZ!{&X^hn+EK*-I1J?}l|y8jKoqHWWvBoz#33D6pfuWgL z-J7l%qP|To+`urgs>RZLx`i6(pc$EV-GlC1ANY9#jEwGI3^YLXP4ZbQ&_~k{96*tQ zB=H$Y&i=1|*b?yoMGq*KG`;S}M68E0H$b)pA_FlsPjPd0HBtPph(?@aXP z3oZcd*D>oCEm2O9cx!D}Ys*Gk4k`*zQHY8{962vLyg@3zx@^CDUS6@`Ff+5s;wt)|-C*w?4tHUN<={u#;)9G)ED i=5hdxeV^OACdWs6slJSi3<;l(fPQ=hMRACefdMAH)VHnx delta 397 zcmV;80doG*1E&LjiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60Y^zhK~z|U?US)e!$25-zY9rFoJ68S!NnKwL7dzj`vReZTPLAIiHnQ$ zEqn}dbPyL25ekjO5JOWFat^&{N?SBnDk%3sNOJ#wf4=;GcLxT8!C?5O^gwn&E{b(Q z_LjuHL+HwkfmFTsYjrwGWDD2?P8)v1(h;i5w0+3KD_LDtPO9>nq9v39nfmcTusA0} zd`hofD66eP+y7bKT7@ogmIfybxlm((JxIPc@S}q628$7(;H?FU}WYV&+-Dx-S!kLSgwyRZF r`;sywC7KMdcK_7TtJ~vC?uG5TSVhF zh1F=>rdhWYTKkW9)W%+?PCTUn06t!tfk9r(QyO}mx|BpBYU9aK)_>3Lb6lOD5jT>s z>;JhX4C0_)s2uW@{F6B|6;Nw0mC$Vbp0O<>K1A6IJ)R7!cO)*61!nhW$t6Dfh1 zOmnYOr^ADPJ$V1ZaOqx@rl&4IZQ@LOgPZ?A+bGy3< z0l-LV&{-V1#sYa=W6)U~MpBcVFDIaD42&h<2p5bj{oY}#@w(X71s)!sV*p?;1cX?^ f5iVT!8}>p3>I#KIp^)JRff|k3#TcRIldb_K3^<@(-#>uZ0xcR4_zP$(3Cka4R{ zG-%MW8VwpWZq=98enWKChIX?;+|&R7Z%?(*kNudN8rsc@lvHfhhNFX2@SNJ^xHvr_ zZp2|bQ>1qJ()Tthw8(Ak5{GA3k?zBd^qA&Zd1Rgb5cWg_aj9HIF`uDQxfmI%6&@J-zFX(xMbV85-Q7P%0Kl0F k2r+{zJb2zGoT&)a6$*tyq4fo0#!&d&3D-*+-A7?E5i z{5XcK#G{qe2Sx^PSa=$^j~w7&JrFY*y4S)CZ>I%-q z1@+aH;Q$P#fj-6sSS|n}Ki3`CVXm*Qab1^GDn+SOVq;?i=+gqlTq;+X0&`RtfL5yo zz}ni{f;w)0tbmqvlqmp{aj=}8cl?U%pMv8!*tXsCZchaaSu+_oUpj=QKs7AO0$^`% z?^vA_sDNf3ws62y%iJUhh_fGuB=5~*S(e{_Fz8# zZhJavK&@$hW`eLCxIC)?kVqsbl}bT?&Sq)3{WsiyQKK7&L6}ti_DNQ&Rf@%8;9sD& zV8HzUuZB7a0djY`Rmj{n&xzWcySux`3k%&M#PkDWP>3*dFqJ8uRU1n6((CzDAMi3HQr)9h?N=j-}GIDo#$%v3P$v_T&?$u}I?4aS4E!BSC<$9do&& z4D>4L3R|yMtI=+^0T?Tv!*V+KlBpWQZbsFA{8!}zP@vgta&mG)E|(LTOa=e}K0shM zgtcTC8zKr8fW3}UQ$sC|zF&>(t1hLFE@n0Y9G0c2Q+$gEZU0cK+`NLIL|Zj)#N ECOEc)e*gdg delta 648 zcmV;30(bq<295=PiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60xn5JK~z|U?UubxBQX?(4+#m8$PiW|fmRVKg@%eQW%@i%8brNSgoLPQ z^E7?~Dw-{_X$FZvB9T8d2}R_L$GO*YJqxQ894V4xd+g7D=i0sozV$7)mME`W?S=mZ zva{;-db{P&a5!|f@8=n``4d~KoX5b!6ZW#coy}&S14KdCx;#nxxZsphXRTK2FV!Xr znFQvb$itbMPN&XsoDP{F_JmsVI1Od~*HE@woI8NSAqh-Yn+*m4lgY%{mjt3<4vO19 z3W@{dLMQ@%lBhohqBpvYf?CAebs`|iO8VoZ%t2AQ2(cOr22e_!iGZZGex-7S?AK9J zK0T!SxHfyPQzn7pV1V@T*9sa<06@FlW+Sly;=-i|p2zFG(;u(P=7iB3@aoP82pUa< zVF&=I*X!tXI^=w$L)7Zb&C8XupiJG~-IMjAkWqktdHUCCH3UI`YPE`+?r%RJd(h)b zx~#)y*HfbIpzEt^KOhZdf*n`rNzHnxo86l(S-(lHix?<75@=S=l7NgxBdk{Lt8U}a z<1_XaF@ME#6WT7?;>L@jh^$XN3ogRs=yPuQ$c70TO;jrD*ea#S2OJCZFHn>#@5`k8 z=Y@ZNO{O;W<8!*BG($_jDHYr>0O&^BDZuSk7Wn&e4P!5u68VHR?JX73la`DA&Xqhe zCQE$&BXP-RKrM4oKz67yfov#124;i!z+?hx*oRb`II2;a#!|~toY&Ycl zwMqUFIc<)I$Dg;jXF0_{UHgvKK;M+ubyP%Y@22qwFb-#5$;8l2cdVgf=VDwfU#-d z^luG#@3L43MRjQahNqx@$?&2NNeL;wwLW?<7B@D4%D!GbK>ZSA(h-l&1tq^-fjF`< zVD<(^D#(|@fI55qA)ZP);!Od~(C#A`8SvKXUU{xRMjW;S-)^3@d*6s)ayg)X%Wfc9 yCF`9)$2TniR8qv!1fthMyqiH}z2UcE(`;z^x4Rp~4#x+-OtjrJ#wHMxzyT&}G{Lq2 delta 460 zcmV;-0W<#M1LgyNiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60ftFLK~z|U?UlPq1Thpq&$u$X zOYH7oKfm zzCW(Xa=bKySb|i@Cq-pbSf6PvlpoG&uJ7<<3PKe@p@>7MP6c@DEo-Tsu4FzD3MIhr zgXp4#-U+m=kkL)@lNBuwjwuiI;4Q4e+ZAXZnjthEc{xg`41j7u-$X!p!@N>v6?(oc zWMm5QJ%|W@)H`Gu03-83v9APvV5(BkYqUGdJAD)Ho=~j;Ged-X5#>SX9j%}eNE2Xe z8aVx5A@5xl3!$hk4Z!de)Grxc^dTuB#kbap9*kv-g;3eos{*KBf=oIx(Yc`Hw<{D! zRzhYyG*Usn6hi9k^@mI<>Buw%G()?GW+ddT)xGjVT#Yzv2fkG%Yxhngg30B8{w=!! zX_cgR0v+G908mL0OB0A*3z=>PqjlnM!>`%U^lx|fbvPW3|KIn diff --git a/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-left.png b/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-left.png new file mode 100644 index 0000000000000000000000000000000000000000..0c28a2e3b99761eed069bf1010ea18b4882414ee GIT binary patch literal 150 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|%sgEjLn`LH zy=BPDz`$|9An%W~qhiH_rX`{VtldC)hK8-{-t^~!SU~W=>^_h@aEKw4gF|Q4nd1pS h9$#vNXPU1sgBFm@0mLA1DR?r7@^tlcS?83{1OU@cC7}QS literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-right.png b/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/inhand-right.png new file mode 100644 index 0000000000000000000000000000000000000000..11fbf058e329a417177d906d5f3259f3270760fd GIT binary patch literal 155 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7TyC=jKx9jP7LeL$-D$|tUX;ELn`LH zy=lnHV8Fw&@ytX2B^<#_lDk6nZ*t`A*8(bGh&cQ5=iLuVONBukAPB1X2qYKkZJf@b m!zU7u4dn2pMtG+A`Z9pja{w_2Tne5HqC8#wT-G@yGywq5!zU2{ literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/icon.png b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/icon.png index 6832194d79115a9b056822887007dcfc6df14e4b..09f53492df512b893ade1c9b45d27a3579d4f559 100644 GIT binary patch delta 596 zcmV-a0;~P@1nmTWiBL{Q4GJ0x0000DNk~Le0000W0000W2nGNE0CReJ^Z)<=0drDE zLIAGL9O(c60u4z-K~z|U<(9i{8bKI^zuDcHv9OSAMWRSU3a4?OD(_&?#qB;oT6hOu zf+i1u{5UCdQ6!X&gOOR-%Zv-ma*;7J3n)d7gfyD{`Oo2hznlgBcL<;0yW!BLvl-Jg z-MAl(M)Z0;uUy^&c9E}(NRotpzwaf)DR>|Gx(L9l8j&w~9LHk&d2)XbK&#cNM7Sbw z4UFShY?A}rbUNbA<>kg*x7)Qx6L6;W-Xu4jPOSlS5}>u>)9r0-f`bJ#&l{)W20VRW z7nXxqXA7KvhwwElw*VkX60h$bEZ}Z9w6O93Un4qLzie0qfa|Na1u({75zOWpMNwiA)d%2zqS^3jg?9z=qQDx%nN}zzEBdIW zqa18Rk(31CYMV=Q0s+@oZEK9dn9b~YmQmz6rYtt@o9FIra5kc{EUWXkFCSq13#MZL zzJ8zcvH#$js-A!iJd^((7yNlB`7z3CrSTRJ1dEQn`}`AQEa_}kJzMtzubi%dQp&wC zz60n>EFcQQ>a3MoogMzL9!0qu=}BpW+E%ck{Lwy4+inPy!}cEfl2y delta 605 zcmV-j0;2ux1oi}fiBL{Q4GJ0x0000DNk~Le0000a0000a2nGNE0O0_bm;e9(0drDE zLIAGL9O(c60v1U`K~z|U?U&1H+dveCztLqTI2aNNUUcIw(oObV^&NtD%~lW4ZTt>? z32*uUCXdr)FBDAG)G@JaU1qXyEMFjTW=1X){DWW^Y0i9qI_JzU1Vy9_qh%|GfxpjM16^Kp4S?1fgJ8bMDa#6fgQzcnvv$j=bj}$n$`YeBCrTn^ zT;oKZ&eoVQMsZ9Ku3ec7$>0%7yEjxGuUlScw30tFdo From 74f2636f2f41ea0b2f0a9c5863b66228ccd5f326 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 11:14:32 -0400 Subject: [PATCH 03/28] Fix? Added tags and currency yml? FIX --- .../Prototypes/_NF/Catalog/pirate_uplink_catalog.yml | 2 +- .../Prototypes/_NF/Entities/Objects/Specific/pirate.yml | 2 +- Resources/Prototypes/_NF/currency.yml | 8 ++++++++ Resources/Prototypes/_NF/tags.yml | 3 +++ 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index 9efc00d99f9..9583e7ea4a3 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -86,7 +86,7 @@ name: uplink-pirate-satchel-name description: uplink-pirate-satchel-desc productEntity: ClothingBackpackPirateFilled - icon: { sprite: Clothing/Back/Satchels/leather.rsi, state: crate_icon } + icon: { sprite: Clothing/Back/Satchels/leather.rsi, state: icon } cost: Doubloon: 6 categories: diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index 699202c1555..05589e4a027 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -89,7 +89,7 @@ - type: entity parent: BasePirateUplink id: BaseSecurityUplinkRadioPirateCaptain - suffix: P. Captian 20 + suffix: P. Captain 20 components: - type: Store preset: StorePresetPirateUplink diff --git a/Resources/Prototypes/_NF/currency.yml b/Resources/Prototypes/_NF/currency.yml index bcc947e0059..6acf0679e1b 100644 --- a/Resources/Prototypes/_NF/currency.yml +++ b/Resources/Prototypes/_NF/currency.yml @@ -11,3 +11,11 @@ cash: 1: FrontierUplinkCoin1 canWithdraw: true + +- type: currency + id: Doubloon + displayName: store-currency-display-pirate-telecrystal + cash: + 1: Doubloon1 + canWithdraw: true + diff --git a/Resources/Prototypes/_NF/tags.yml b/Resources/Prototypes/_NF/tags.yml index c27282d82d8..20000687bda 100644 --- a/Resources/Prototypes/_NF/tags.yml +++ b/Resources/Prototypes/_NF/tags.yml @@ -61,6 +61,9 @@ - type: Tag id: SecurityUplink +- type: Tag + id: PirateUplink + - type: Tag id: DroneUsable From 84c771cf7fc43e9121d5e143455373de732c62b6 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 13:43:58 -0400 Subject: [PATCH 04/28] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA Uplink is working now. --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 2 +- .../_NF/Catalog/pirate_uplink_catalog.yml | 18 ++++++++++++++---- .../_NF/Entities/Objects/Specific/pirate.yml | 6 +++--- 3 files changed, 18 insertions(+), 8 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index bca68675bfd..0ee9a05411f 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -150,7 +150,7 @@ store-category-pirateammo = Ammunition store-category-pirateexplosives = Explosives uplink-pirate-hardsuit-name = Pirate HardSuit -uplink-security-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. +uplink-pirate-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. uplink-pirate-hardsuit-captain-name = Pirate Captain's Hardsuit uplink-pirate-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. uplink-pirate-crate-captain-name = Pirate Captain's Crate diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index 9583e7ea4a3..eae4cc10d8d 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -29,6 +29,9 @@ whitelist: tags: - PirateUplink + - !type:BuyerJobCondition + whitelist: + - PirateCaptain - type: listing id: UplinkPirateCaptainCrateFilled @@ -39,7 +42,7 @@ cost: Doubloon: 8 categories: - - UplinkPirateBundles + - UplinkPirateUtility conditions: - !type:StoreWhitelistCondition whitelist: @@ -58,7 +61,7 @@ cost: Doubloon: 8 categories: - - UplinkPirateBundles + - UplinkPirateUtility conditions: - !type:StoreWhitelistCondition whitelist: @@ -74,7 +77,7 @@ cost: Doubloon: 5 categories: - - UplinkPirateBundles + - UplinkPirateUtility conditions: - !type:StoreWhitelistCondition whitelist: @@ -90,7 +93,7 @@ cost: Doubloon: 6 categories: - - UplinkPirateBundles + - UplinkPirateUtility conditions: - !type:StoreWhitelistCondition whitelist: @@ -128,6 +131,9 @@ whitelist: tags: - PirateUplink + - !type:BuyerJobCondition + whitelist: + - PirateCaptain - type: listing id: UplinkPirateBlunderbuss @@ -176,6 +182,10 @@ whitelist: tags: - PirateUplink + - !type:BuyerJobCondition + whitelist: + - PirateCaptain + - type: listing id: UplinkPirateCannonball diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index 05589e4a027..bbea01296ae 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -84,7 +84,7 @@ - type: Store preset: StorePresetPirateUplink balance: - FrontierUplinkCoin: 99999 + Doubloon: 99999 - type: entity parent: BasePirateUplink @@ -94,7 +94,7 @@ - type: Store preset: StorePresetPirateUplink balance: - FrontierUplinkCoin: 20 + Doubloon: 20 - type: entity parent: BasePirateUplink @@ -104,4 +104,4 @@ - type: Store preset: StorePresetPirateUplink balance: - FrontierUplinkCoin: 15 \ No newline at end of file + Doubloon: 15 \ No newline at end of file From 29ee79967e8eefbf4ee185bdbba8e499f822bb56 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:48:16 -0400 Subject: [PATCH 05/28] aaaaaaaaaaaaaaaaaa --- Resources/Prototypes/_NF/currency.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/currency.yml b/Resources/Prototypes/_NF/currency.yml index 6acf0679e1b..164ee3b618e 100644 --- a/Resources/Prototypes/_NF/currency.yml +++ b/Resources/Prototypes/_NF/currency.yml @@ -17,5 +17,4 @@ displayName: store-currency-display-pirate-telecrystal cash: 1: Doubloon1 - canWithdraw: true - + canWithdraw: true \ No newline at end of file From 8ac8b6388658f857c5d1d2bd244e790b1905a71d Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:53:39 -0400 Subject: [PATCH 06/28] Test Test --- Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index bbea01296ae..57548c6ae43 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -1,7 +1,7 @@ - type: entity name: doubloon parent: BaseItem - id: Doubloon + id: Doubloons suffix: 20 DB description: A dirty gold coin used for nefarious pirate exchanges. components: From 2d6b72d6ee021bbc2d1bb5f112a68d402cf70749 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:54:13 -0400 Subject: [PATCH 07/28] test test --- .../Prototypes/_NF/Entities/Objects/Specific/pirate.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index 57548c6ae43..d158cb0e16b 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -23,7 +23,7 @@ Doubloon: 1 - type: entity - parent: Doubloon + parent: Doubloons id: Doubloon1 suffix: 1 DB components: @@ -31,7 +31,7 @@ count: 1 - type: entity - parent: Doubloon + parent: Doubloons id: Doubloon5 suffix: 5 DB components: @@ -39,7 +39,7 @@ count: 5 - type: entity - parent: Doubloon + parent: Doubloons id: Doubloon10 suffix: 10 DB components: From ba9499cd964317a3953bd02e914596e2a70dfaeb Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 14:58:13 -0400 Subject: [PATCH 08/28] Fix? Fix? --- Resources/Prototypes/_NF/currency.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/currency.yml b/Resources/Prototypes/_NF/currency.yml index 164ee3b618e..58df94b8b92 100644 --- a/Resources/Prototypes/_NF/currency.yml +++ b/Resources/Prototypes/_NF/currency.yml @@ -13,7 +13,7 @@ canWithdraw: true - type: currency - id: Doubloon + id: Doubloons displayName: store-currency-display-pirate-telecrystal cash: 1: Doubloon1 From c9cfce78ecb03f6d436e2ab86299a0d04b134ebe Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Sun, 9 Jun 2024 15:02:29 -0400 Subject: [PATCH 09/28] AAAAAA AAAAAA fixed --- .../Prototypes/_NF/Entities/Objects/Specific/pirate.yml | 8 ++++---- Resources/Prototypes/_NF/Stacks/Materials/crystals.yml | 7 +++++++ Resources/Prototypes/_NF/currency.yml | 2 +- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index d158cb0e16b..bbea01296ae 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -1,7 +1,7 @@ - type: entity name: doubloon parent: BaseItem - id: Doubloons + id: Doubloon suffix: 20 DB description: A dirty gold coin used for nefarious pirate exchanges. components: @@ -23,7 +23,7 @@ Doubloon: 1 - type: entity - parent: Doubloons + parent: Doubloon id: Doubloon1 suffix: 1 DB components: @@ -31,7 +31,7 @@ count: 1 - type: entity - parent: Doubloons + parent: Doubloon id: Doubloon5 suffix: 5 DB components: @@ -39,7 +39,7 @@ count: 5 - type: entity - parent: Doubloons + parent: Doubloon id: Doubloon10 suffix: 10 DB components: diff --git a/Resources/Prototypes/_NF/Stacks/Materials/crystals.yml b/Resources/Prototypes/_NF/Stacks/Materials/crystals.yml index 24c113cdbba..6a7d356e46f 100644 --- a/Resources/Prototypes/_NF/Stacks/Materials/crystals.yml +++ b/Resources/Prototypes/_NF/Stacks/Materials/crystals.yml @@ -4,3 +4,10 @@ icon: _NF/Objects/Specific/Security/frontieruplinkcoin.rsi spawn: FrontierUplinkCoin1 itemSize: 1 + +- type: stack + id: Doubloon + name: doubloon + icon: _NF/Objects/Specific/Pirate/pirate_doubloon.rsi + spawn: Doubloon1 + itemSize: 1 diff --git a/Resources/Prototypes/_NF/currency.yml b/Resources/Prototypes/_NF/currency.yml index 58df94b8b92..164ee3b618e 100644 --- a/Resources/Prototypes/_NF/currency.yml +++ b/Resources/Prototypes/_NF/currency.yml @@ -13,7 +13,7 @@ canWithdraw: true - type: currency - id: Doubloons + id: Doubloon displayName: store-currency-display-pirate-telecrystal cash: 1: Doubloon1 From 84511e7323f1f5057952d4fa307ad7dda0fc1688 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:01:25 -0400 Subject: [PATCH 10/28] Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Locale/en-US/_NF/store/uplink-catalog.ftl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 0ee9a05411f..6d0ecfe6a3a 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -153,10 +153,10 @@ uplink-pirate-hardsuit-name = Pirate HardSuit uplink-pirate-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. uplink-pirate-hardsuit-captain-name = Pirate Captain's Hardsuit uplink-pirate-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. -uplink-pirate-crate-captain-name = Pirate Captain's Crate -uplink-pirate-crate-captain-desc = A crate filled with the necessary goodies for a pirate captain. -uplink-pirate-crate-name = Pirate Crate -uplink-pirate-crate-desc = A crate filled with the necessary goodies for a pirate. +uplink-pirate-crate-captain-name = Pirate Captain's Chest +uplink-pirate-crate-captain-desc = A chest filled with the necessary goodies for a pirate captain. +uplink-pirate-crate-name = Pirate Chest +uplink-pirate-crate-desc = A chest filled with the necessary goodies for a pirate. uplink-pirate-magboots-name = Pirate Magboots uplink-pirate-magboots-desc = Pirate magnetic boots, often used during extravehicular activity to ensure the user remains safely attached to the vehicle. uplink-pirate-hoverbike-name = Pirate Hoverbike From d4761b8c4329d7250574d1a4df4b09c8d9168971 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:01:37 -0400 Subject: [PATCH 11/28] Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Locale/en-US/_NF/store/uplink-catalog.ftl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 6d0ecfe6a3a..afa4648110b 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -173,7 +173,7 @@ uplink-pirate-grapeshot-name = Grapeshot uplink-pirate-grapeshot-desc = A cluster ball made to shoot a wide range of small projectiles. uplink-pirate-glassshot-name = Glassshot uplink-pirate-glassshot-desc = A brittle glass ball that will fire multiple projectiles in a tight spread. -uplink-pirate-crateammo-name = Cannonball Crate -uplink-pirate-crateammo-desc = A crate filled with cannonballs. +uplink-pirate-crateammo-name = Cannonball Chest +uplink-pirate-crateammo-desc = A chest filled with cannonballs. uplink-pirate-satchel-name = Pirate Satchel uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. \ No newline at end of file From 92ed11f0402482af3f27ae4b7208f7bda4989518 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:01:45 -0400 Subject: [PATCH 12/28] Update Resources/Prototypes/Catalog/Fills/Crates/antag.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/Catalog/Fills/Crates/antag.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml index 101c86b2330..8dd69a8baaf 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml @@ -35,7 +35,7 @@ - type: entity id: CratePirateChestAmmo - name: crews ammo chest + name: cannonball chest suffix: Filled parent: CratePirate components: From 43c9a517bbdc6b7bffe49a2437456d9ab1c17ec1 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:05:28 -0400 Subject: [PATCH 13/28] Update meta.json --- .../_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json index ad89d35bc6c..1795e58c57e 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, - "license": "CC-BY-SA-3.0", - "copyright": "Made by GentleButter for use on Frontier Station 14.", + "license": "CC-BY-SA-4.0", + "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, "y": 32 From ef0169c3fd5a45d26ed60e7a7929d90d8983953a Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:08:01 -0400 Subject: [PATCH 14/28] Update meta.json --- .../_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json index d54984433da..de0bdfe5c1d 100644 --- a/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-3.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, From 4ae131781e0de34139710fbdda0880516df87950 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:08:32 -0400 Subject: [PATCH 15/28] Update meta.json --- .../_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json index 62d07416703..4aa590794c0 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, From 3c505a4851139e483566b71d1f34446dd7d025b2 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:09:04 -0400 Subject: [PATCH 16/28] Update pirate_uplink_catalog.yml --- Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index eae4cc10d8d..8b7dfa38041 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -142,7 +142,7 @@ productEntity: WeaponShotgunBlunderbuss icon: { sprite: Objects/Weapons/Guns/Shotguns/blunderbuss.rsi, state: icon } cost: - Doubloon: 4 + Doubloon: 2 categories: - UplinkPirateWeapons conditions: @@ -158,7 +158,7 @@ productEntity: WeaponRevolverPirate icon: { sprite: Objects/Weapons/Guns/Revolvers/pirate_revolver.rsi, state: icon } cost: - Doubloon: 3 + Doubloon: 1 categories: - UplinkPirateWeapons conditions: @@ -233,4 +233,4 @@ - !type:StoreWhitelistCondition whitelist: tags: - - PirateUplink \ No newline at end of file + - PirateUplink From 92958a76c0d86b0b9f8e45b7013fdb21d1b2392e Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:09:39 -0400 Subject: [PATCH 17/28] Update Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- .../Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml index 41c36d06f6e..848beefb8c8 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml @@ -248,7 +248,7 @@ parent: ClothingUniformBase id: ClothingUniformJumpsuitPirateLuffy name: suspicious pirate uniform - description: A rather suspicious looking set of pirate underclothes. + description: A rather suspicious looking set of pirate clothes. components: - type: Sprite sprite: _NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi From 105902da7d61ce2a8710af61f85fd2c4541dd938 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:11:04 -0400 Subject: [PATCH 18/28] Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com> --- Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml index 6e88c180d93..b64a4e486f5 100644 --- a/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml +++ b/Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml @@ -21,8 +21,8 @@ - type: entity parent: ClothingNeckBase id: ClothingNeckCloakPirateParrot - name: polly the pirate parrot - description: A mute parrot named polly, that enjoys crackers and cannons. + name: Polly the pirate parrot + description: A mute parrot named Polly. Loves sitting on shoulders, crackers, and cannons. components: - type: Sprite sprite: _NF/Clothing/Neck/Cloaks/pirate_parrot.rsi \ No newline at end of file From 8df4116dcc9785db27e732690fdf8ffd5e7aa379 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:13:18 -0400 Subject: [PATCH 19/28] Update meta.json --- .../_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json index 62d07416703..4aa590794c0 100644 --- a/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json +++ b/Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, From f0592a98804e2519ec926623917dba76e6f71a9a Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:14:41 -0400 Subject: [PATCH 20/28] Update meta.json --- .../Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json index c50d327eb31..856e3b7ebb3 100644 --- a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, From b6288e15f261aac2d5c2e3cd53705d4a7c2e5ad9 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:21:39 -0400 Subject: [PATCH 21/28] Update meta.json --- .../_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json b/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json index 42f27b5c6b6..5380caa3c82 100644 --- a/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi/meta.json @@ -4,7 +4,7 @@ "x": 32, "y": 32 }, - "license": "CC-BY-SA-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Made by GentleButter for Frontier Station 14", "states": [ { From 979d1fa6ff8a54f44d7e835e7d716b44825a9d7b Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 09:22:50 -0400 Subject: [PATCH 22/28] Update meta.json --- .../_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json index 1795e58c57e..974e9b22839 100644 --- a/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi/meta.json @@ -1,6 +1,6 @@ { "version": 1, - "license": "CC-BY-SA-4.0", + "license": "CC-BY-NC-SA-4.0", "copyright": "Created by GentleButter for Frontier Station", "size": { "x": 32, From 98dbe5ce745c18bc3d4771f4e81c570fa28a445c Mon Sep 17 00:00:00 2001 From: Whatstone Date: Wed, 12 Jun 2024 11:18:54 -0400 Subject: [PATCH 23/28] Blinky pirate uplink --- .../_NF/Entities/Objects/Specific/pirate.yml | 4 ++++ .../Devices/pirate_uplink.rsi/icon-overlay.png | Bin 0 -> 231 bytes .../Objects/Devices/pirate_uplink.rsi/icon.png | Bin 849 -> 772 bytes .../Objects/Devices/pirate_uplink.rsi/meta.json | 12 +++++++++++- 4 files changed, 15 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon-overlay.png diff --git a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml index bbea01296ae..f8ef9531fae 100644 --- a/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml +++ b/Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml @@ -59,6 +59,10 @@ sprite: _NF/Objects/Devices/pirate_uplink.rsi layers: - state: icon + scale: 0.7, 0.7 + - state: icon-overlay + scale: 0.7, 0.7 + shader: unshaded - type: Item sprite: _NF/Objects/Devices/pirate_uplink.rsi heldPrefix: icon diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon-overlay.png b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon-overlay.png new file mode 100644 index 0000000000000000000000000000000000000000..f73d8198c90ec9989912e9f161039177c3ca9eb7 GIT binary patch literal 231 zcmeAS@N?(olHy`uVBq!ia0vp^4Is?H1|$#LC7uRS>pWc?Ln`LHy|a<`fB^@K!xW|8 z{%=wmr)cEQ+|7DV&!>4I*S}4#>YluR>Lm|U4hFN{+?d|(7?v8pphi>xBGmWkEB~Q7 zs64|ipZVwg@7vEkU-9y1$xkh)@YzeX89%=mdKI;Vst0HuIRtpET3 literal 0 HcmV?d00001 diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon.png b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/icon.png index da1356f3be1bf4743b42f0e9a22421d4960b7386..a5ee33dd75973940f4dccd98597322f0b351f37a 100644 GIT binary patch delta 749 zcmVA!}OCgc9&_;|_nqW*cghFC^s&mBTA2+;`@G7f3WvJLOd;c*VtV1>hdQrDur$lKz#}1 z#A=VMeFfdVea;3k2;kzZ3xMZ&G@H#hK-erpIl1B5SL3k@!e*VXpH!#QVQXtEwhQzU zOd0>bwM-`=K<(i;3y&Yz-$`rE-QC^e<>he_G6RGVX@A{soAXv00JK^yb$xv;OaN>8 z{a_qTSZ_1x(7!O}2J%)KR4Nq!s?{o`Qb_>U|RLv`)EAz=Xi>P zW~%o~r4pX!F+V@g?arHY0CN#Ny$f@rc|S<{Z8op~Z5OuF0YV5JWMR%OqWh=K*3Rut zG%kdcMSsUJ8a85@O(Wdv^-wC=>p1`cVi4HVl_p?j$u!q`-EKD;7a+a|UD?RmjJo*m z);`dn-|usBazd?EOPm9Vk6k6nA{^RK!uhv-02ZIU67BYQP5`{DM9;AzWrc91d?;Zi z2e%TTfbSOuKnNifz)c=KqNpiShTiF+zDU- f$qJDgwQhd_d@&l!=LU%B00000NkvXXu0mjfY++); delta 827 zcmV-B1H}A<2GItPBYyw^b5ch_0Itp)=>Px%@kvBMR9J<*l}~FEK^Vq=lk}h1m^RS{ z8yl!dE467sa_l+Zrx)qjQz?ii!IOCCM+p_gi&W55F{O=^wDwOTq3$NT<6)c4>|}P6 zsN{iV-^|X=^LyWSGAkI7TqgWDhONY-mDC4D25?w-8n}-f;D2B}&)YYzIatpJ#>a+P zq;S7?%#k3aci%q^fA{n13eLp^_0^T(01T#qKE?%DE&w7w*B#ekuCK3gU6)iUMX6L` zV`Bs8(*ng@Dp!~Sb5t0BR;vZT+S=NJI&Q3hmUWaV0F!aBoSt|5itL|)<2cy1-Sciw z1q@j;88=@#gny<$H7v^lU~g~lSe+E8fMy=HaKKc{+$0Hzvmb{f@6BUbmfwFc?|~lk zsO-aHea*(zPrz%1Djy&}2X5bPdpc@Bt!aK{g0LO9JgWhaNF*qgNizR;yKt#bV%JptfMZ{Qs|pItc-Cce+)`+)JY(MAg`aw8=zR1i} zFz&QLAAdK=HUMos+u}?9i3bpN_~^Z!nKGNGvg2;X1nxp34oX*L4dFwbGf1n^eX8JTd!8D(QdZ^7%QK{ays~usT#v>M%DaRw;b#qrDVgkzN!RJE#@hAnZ>;jByr^H0OzhQ)gZVuYl z@a9Yq+_a)Y-_fAvYR>`U!pq)Br4Kxu^}|3b^lA)Zta_+@j|9*ldO(Jdzjl~;D1ZTE zSTu;ptX2I1W@9i&R=A~Z0000EWmrjOO-%qQ00008000000002eQwJ^ diff --git a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json index 856e3b7ebb3..7a97353ba2c 100644 --- a/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json +++ b/Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-NC-SA-4.0", - "copyright": "Created by GentleButter for Frontier Station", + "copyright": "Created by GentleButter for Frontier Station, icon-overlay by Whatstone (Discord)", "size": { "x": 32, "y": 32 @@ -17,6 +17,16 @@ }, { "name": "icon" + }, + { + "name": "icon-overlay", + "delays": + [ + [0.1, 0.2, 0.1, 0.1, + 0.1, 0.1, 0.1, 0.05, + 0.1, 0.05, 0.075, 0.075, + 0.05, 0.2, 0.1, 0.1] + ] } ] } From 8a159726534223053b6febea79f2de96f18997a7 Mon Sep 17 00:00:00 2001 From: Whatstone Date: Thu, 13 Jun 2024 10:32:46 -0400 Subject: [PATCH 24/28] Pirate HardSuit->Pirate Hardsuit --- Resources/Locale/en-US/_NF/store/uplink-catalog.ftl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index afa4648110b..5ed518db476 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -149,7 +149,7 @@ store-category-pirateutility = Utility store-category-pirateammo = Ammunition store-category-pirateexplosives = Explosives -uplink-pirate-hardsuit-name = Pirate HardSuit +uplink-pirate-hardsuit-name = Pirate Hardsuit uplink-pirate-hardsuit-desc = A heavy space suit that provides some basic protection from the cold harsh realities of deep space. uplink-pirate-hardsuit-captain-name = Pirate Captain's Hardsuit uplink-pirate-hardsuit-captain-desc = An ancient armored hardsuit, perfect for defending against space scurvy and toolbox-wielding scallywags. From d14fddfd668802595685c7de867fd2fb7672cc97 Mon Sep 17 00:00:00 2001 From: Salvantrix <149609610+Salvantrix@users.noreply.github.com> Date: Thu, 13 Jun 2024 13:00:04 -0400 Subject: [PATCH 25/28] Mofuckin Yeet This ish is done. GG no RE --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 26 +++-- .../Prototypes/Catalog/Fills/Crates/antag.yml | 48 -------- .../_NF/Catalog/Fills/Crates/pirate.yml | 67 +++++++++++ .../_NF/Catalog/pirate_uplink_catalog.yml | 110 ++++++++++++++---- 4 files changed, 172 insertions(+), 79 deletions(-) create mode 100644 Resources/Prototypes/_NF/Catalog/Fills/Crates/pirate.yml diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 5ed518db476..56e02881a6e 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -167,13 +167,21 @@ uplink-pirate-revolver-name = Pirate Revolver uplink-pirate-revolver-desc = An odd, illegal, old-looking revolver, favoured by pirate crews. Uses .45 magnum ammo. uplink-pirate-cannon-name = Pirate Cannon uplink-pirate-cannon-desc = Kaboom! -uplink-pirate-cannonball-name = Cannonball -uplink-pirate-cannonball-desc = A ball made to be shot from a cannon. -uplink-pirate-grapeshot-name = Grapeshot -uplink-pirate-grapeshot-desc = A cluster ball made to shoot a wide range of small projectiles. -uplink-pirate-glassshot-name = Glassshot -uplink-pirate-glassshot-desc = A brittle glass ball that will fire multiple projectiles in a tight spread. -uplink-pirate-crateammo-name = Cannonball Chest -uplink-pirate-crateammo-desc = A chest filled with cannonballs. +uplink-pirate-cannonball-name = Cannonball Chest +uplink-pirate-cannonball-desc = A chest full of balls made to be shot from a cannon. +uplink-pirate-grapeshot-name = Grapeshot Chest +uplink-pirate-grapeshot-desc = A chest full of cluster ball made to shoot a wide range of small projectiles. +uplink-pirate-glassshot-name = Glassshot Chest +uplink-pirate-glassshot-desc = A chest full of brittle glass ball that will fire multiple projectiles in a tight spread. uplink-pirate-satchel-name = Pirate Satchel -uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. \ No newline at end of file +uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. +uplink-pirate-flintlock-name = Flintlock Pistol. +uplink-pirate-flintlock-desc = A pirate captain's companion. Yarrr! Uses .60 anti-materiel ammo. +uplink-pirate-shotgunammo-name = .50 Slug Box +uplink-pirate-shotgunammo-desc = A box of .50 slugs. +uplink-pirate-revolverammo-name = .45 Magnum Box +uplink-pirate-revolverammo-desc = A box of .45 magnum rounds. +uplink-pirate-flintlockammo-name = .60 Anti-Material Box +uplink-pirate-flintlockammo-desc = A box of .60 anti-material rounds. +uplink-pirate-ecutlass-name = Energy Cutlass +uplink-pirate-ecutlass-desc = An energy cutlass! \ No newline at end of file diff --git a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml index 8dd69a8baaf..8b137891791 100644 --- a/Resources/Prototypes/Catalog/Fills/Crates/antag.yml +++ b/Resources/Prototypes/Catalog/Fills/Crates/antag.yml @@ -1,49 +1 @@ -- type: entity - id: CratePirateChestCaptain - name: captains pirate chest - suffix: Filled - parent: CratePirate - components: - - type: StorageFill - contents: - - id: ClothingNeckCloakPirateCap - - id: Cutlass # Frontier EnergyCutlass Date: Thu, 13 Jun 2024 14:10:41 -0400 Subject: [PATCH 26/28] pirate cleanup (spelling, slugs, and s-grammar) --- Resources/Locale/en-US/_NF/store/uplink-catalog.ftl | 10 +++++----- .../Entities/Structures/Storage/Crates/crates.yml | 4 ++-- .../Prototypes/_NF/Catalog/Fills/Crates/pirate.yml | 8 ++++---- .../Prototypes/_NF/Catalog/pirate_uplink_catalog.yml | 2 +- .../Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml | 4 ++-- .../Prototypes/_NF/Entities/Clothing/Shoes/boots.yml | 2 +- .../_NF/Entities/Objects/Specific/pirate.yml | 2 +- 7 files changed, 16 insertions(+), 16 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 56e02881a6e..23933b95fef 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -170,18 +170,18 @@ uplink-pirate-cannon-desc = Kaboom! uplink-pirate-cannonball-name = Cannonball Chest uplink-pirate-cannonball-desc = A chest full of balls made to be shot from a cannon. uplink-pirate-grapeshot-name = Grapeshot Chest -uplink-pirate-grapeshot-desc = A chest full of cluster ball made to shoot a wide range of small projectiles. +uplink-pirate-grapeshot-desc = A chest full of cluster balls made to shoot a wide spread of small projectiles. uplink-pirate-glassshot-name = Glassshot Chest -uplink-pirate-glassshot-desc = A chest full of brittle glass ball that will fire multiple projectiles in a tight spread. +uplink-pirate-glassshot-desc = A chest full of brittle glass balls that will fire multiple projectiles in a tight spread. uplink-pirate-satchel-name = Pirate Satchel uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. uplink-pirate-flintlock-name = Flintlock Pistol. uplink-pirate-flintlock-desc = A pirate captain's companion. Yarrr! Uses .60 anti-materiel ammo. uplink-pirate-shotgunammo-name = .50 Slug Box -uplink-pirate-shotgunammo-desc = A box of .50 slugs. +uplink-pirate-shotgunammo-desc = A box of .50 shotgun slugs. uplink-pirate-revolverammo-name = .45 Magnum Box uplink-pirate-revolverammo-desc = A box of .45 magnum rounds. -uplink-pirate-flintlockammo-name = .60 Anti-Material Box -uplink-pirate-flintlockammo-desc = A box of .60 anti-material rounds. +uplink-pirate-flintlockammo-name = .60 Anti-Materiel Box +uplink-pirate-flintlockammo-desc = A box of .60 anti-materiel rounds. uplink-pirate-ecutlass-name = Energy Cutlass uplink-pirate-ecutlass-desc = An energy cutlass! \ No newline at end of file diff --git a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml index cf20f579472..f5276ca25bb 100644 --- a/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml +++ b/Resources/Prototypes/Entities/Structures/Storage/Crates/crates.yml @@ -426,7 +426,7 @@ description: A space pirate chest, not for station lubbers. components: - type: Sprite - sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi + sprite: _NF/Structures/Storage/Crates/piratechestgrey.rsi # Frontier: add _NF, piratechest.rsi Date: Thu, 13 Jun 2024 14:35:14 -0400 Subject: [PATCH 27/28] Pirate uplink: rework text, use lethal shells --- .../Locale/en-US/_NF/store/uplink-catalog.ftl | 14 +++++++------- .../_NF/Catalog/pirate_uplink_catalog.yml | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl index 23933b95fef..5da9e08bc86 100644 --- a/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl +++ b/Resources/Locale/en-US/_NF/store/uplink-catalog.ftl @@ -175,13 +175,13 @@ uplink-pirate-glassshot-name = Glassshot Chest uplink-pirate-glassshot-desc = A chest full of brittle glass balls that will fire multiple projectiles in a tight spread. uplink-pirate-satchel-name = Pirate Satchel uplink-pirate-satchel-desc = An inconspicuous satchel filled with pirate goodies. -uplink-pirate-flintlock-name = Flintlock Pistol. +uplink-pirate-flintlock-name = Flintlock Pistol uplink-pirate-flintlock-desc = A pirate captain's companion. Yarrr! Uses .60 anti-materiel ammo. -uplink-pirate-shotgunammo-name = .50 Slug Box -uplink-pirate-shotgunammo-desc = A box of .50 shotgun slugs. -uplink-pirate-revolverammo-name = .45 Magnum Box -uplink-pirate-revolverammo-desc = A box of .45 magnum rounds. -uplink-pirate-flintlockammo-name = .60 Anti-Materiel Box -uplink-pirate-flintlockammo-desc = A box of .60 anti-materiel rounds. +uplink-pirate-shotgunammo-name = Blunderbuss Shell Box +uplink-pirate-shotgunammo-desc = A box of .50 shotgun shells, used in the blunderbuss. +uplink-pirate-revolverammo-name = Pirate Revolver Ammo Box +uplink-pirate-revolverammo-desc = A box of .45 magnum rounds, used in the pirate revolver. +uplink-pirate-flintlockammo-name = Flintlock Pistol Ammo Box +uplink-pirate-flintlockammo-desc = A box of .60 anti-materiel rounds, used in the flintlock pistol. uplink-pirate-ecutlass-name = Energy Cutlass uplink-pirate-ecutlass-desc = An energy cutlass! \ No newline at end of file diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index c973a5cf608..2d7457fe206 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -209,8 +209,8 @@ id: UplinkPirateShotgunAmmo name: uplink-pirate-shotgunammo-name description: uplink-pirate-shotgunammo-desc - productEntity: BoxShotgunSlug - icon: { sprite: Objects/Storage/boxes.rsi, state: shellslug } + productEntity: BoxShotgunLethal + icon: { sprite: Objects/Storage/boxes.rsi, state: shelllethal } cost: Doubloon: 2 categories: From 62c5d781bba5812a0e8b789159d7c11492e193ee Mon Sep 17 00:00:00 2001 From: Whatstone Date: Thu, 13 Jun 2024 14:49:06 -0400 Subject: [PATCH 28/28] Fix lethal shotgun entity ID --- Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml index 2d7457fe206..11f476d750d 100644 --- a/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml +++ b/Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml @@ -209,7 +209,7 @@ id: UplinkPirateShotgunAmmo name: uplink-pirate-shotgunammo-name description: uplink-pirate-shotgunammo-desc - productEntity: BoxShotgunLethal + productEntity: BoxLethalshot icon: { sprite: Objects/Storage/boxes.rsi, state: shelllethal } cost: Doubloon: 2