Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pirate Uplink and New Drip. #1476

Merged
merged 29 commits into from
Jun 14, 2024
Merged
Show file tree
Hide file tree
Changes from 24 commits
Commits
Show all changes
29 commits
Select commit Hold shift + click to select a range
fdc7e2e
Pirate Uplink and New Drip.
Salvantrix Jun 5, 2024
c5bc18a
Added fixed textures.
Salvantrix Jun 9, 2024
74f2636
Fix?
Salvantrix Jun 9, 2024
84c771c
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Salvantrix Jun 9, 2024
29ee799
aaaaaaaaaaaaaaaaaa
Salvantrix Jun 9, 2024
8ac8b63
Test
Salvantrix Jun 9, 2024
2d6b72d
test
Salvantrix Jun 9, 2024
ba9499c
Fix?
Salvantrix Jun 9, 2024
c9cfce7
AAAAAA
Salvantrix Jun 9, 2024
84511e7
Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
Salvantrix Jun 13, 2024
d4761b8
Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
Salvantrix Jun 13, 2024
92ed11f
Update Resources/Prototypes/Catalog/Fills/Crates/antag.yml
Salvantrix Jun 13, 2024
43c9a51
Update meta.json
Salvantrix Jun 13, 2024
ef0169c
Update meta.json
Salvantrix Jun 13, 2024
4ae1317
Update meta.json
Salvantrix Jun 13, 2024
3c505a4
Update pirate_uplink_catalog.yml
Salvantrix Jun 13, 2024
92958a7
Update Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
Salvantrix Jun 13, 2024
105902d
Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
Salvantrix Jun 13, 2024
8df4116
Update meta.json
Salvantrix Jun 13, 2024
f0592a9
Update meta.json
Salvantrix Jun 13, 2024
b6288e1
Update meta.json
Salvantrix Jun 13, 2024
979d1fa
Update meta.json
Salvantrix Jun 13, 2024
98dbe5c
Blinky pirate uplink
whatston3 Jun 12, 2024
8a15972
Pirate HardSuit->Pirate Hardsuit
Jun 13, 2024
d14fddf
Mofuckin Yeet
Salvantrix Jun 13, 2024
8f7f1ac
pirate cleanup (spelling, slugs, and s-grammar)
Jun 13, 2024
ced5c3b
Pirate uplink: rework text, use lethal shells
Jun 13, 2024
62c5d78
Fix lethal shotgun entity ID
Jun 13, 2024
47dd705
Merge branch 'master' of https://github.com/new-frontiers-14/frontier…
Jun 13, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/store/currency.ftl
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
store-currency-display-security-telecrystal = FUC
store-currency-display-pirate-telecrystal = DB
37 changes: 36 additions & 1 deletion Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -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.
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-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 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
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 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.
15 changes: 15 additions & 0 deletions Resources/Prototypes/Catalog/Fills/Crates/antag.yml
Original file line number Diff line number Diff line change
Expand Up @@ -32,3 +32,18 @@
amount: 2
- id: ClothingHeadsetFreelance # Frontier
amount: 3 # Frontier

- type: entity
id: CratePirateChestAmmo
name: cannonball chest
suffix: Filled
parent: CratePirate
components:
- type: StorageFill
contents:
- id: CannonBall
amount: 6
- id: CannonBallGrapeshot
amount: 6
- id: CannonBallGlassshot
amount: 6
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
Expand All @@ -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
Expand Down
236 changes: 236 additions & 0 deletions Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,236 @@
- 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: UplinkPirateHardsuitCaptain
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:BuyerJobCondition
whitelist:
- PirateCaptain

- 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:
- UplinkPirateUtility
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:
- UplinkPirateUtility
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:
- UplinkPirateUtility
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: icon }
cost:
Doubloon: 6
categories:
- UplinkPirateUtility
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:BuyerJobCondition
whitelist:
- PirateCaptain

- 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: 2
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: 1
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:BuyerJobCondition
whitelist:
- PirateCaptain


- 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
30 changes: 30 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,36 @@
- ClothMade
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatPirates
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
Expand Down
11 changes: 10 additions & 1 deletion Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
sprite: _NF/Clothing/Neck/Cloaks/sr.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckCloakPirateParrot
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
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/OuterClothing/coats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Loading
Loading