Skip to content

Commit

Permalink
Pirate Uplink and New Drip. (#1476)
Browse files Browse the repository at this point in the history
* 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.

* Added fixed textures.

Drip is good, uplink is FUBAR.

* Fix?

Added tags and currency yml? FIX

* AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

Uplink is working now.

* aaaaaaaaaaaaaaaaaa

* Test

Test

* test

test

* Fix?

Fix?

* AAAAAA

AAAAAA fixed

* Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Locale/en-US/_NF/store/uplink-catalog.ftl

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/Catalog/Fills/Crates/antag.yml

Co-authored-by: Whatstone <[email protected]>

* Update meta.json

* Update meta.json

* Update meta.json

* Update pirate_uplink_catalog.yml

* Update Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml

Co-authored-by: Whatstone <[email protected]>

* Update Resources/Prototypes/_NF/Entities/Clothing/Neck/cloaks.yml

Co-authored-by: Whatstone <[email protected]>

* Update meta.json

* Update meta.json

* Update meta.json

* Update meta.json

* Blinky pirate uplink

* Pirate HardSuit->Pirate Hardsuit

* Mofuckin Yeet

This ish is done. GG no RE

* pirate cleanup (spelling, slugs, and s-grammar)

* Pirate uplink: rework text, use lethal shells

* Fix lethal shotgun entity ID

---------

Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
Co-authored-by: Whatstone <[email protected]>
  • Loading branch information
4 people authored Jun 14, 2024
1 parent de8386a commit 4586a34
Show file tree
Hide file tree
Showing 71 changed files with 975 additions and 37 deletions.
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
42 changes: 42 additions & 0 deletions Resources/Locale/en-US/_NF/store/uplink-catalog.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -152,3 +152,45 @@ uplink-security-emp-ammo-desc = A a box containing 4 EMP projectile grenades.
uplink-security-trackingdart-ammo-name = Tracking Darts Ammo
uplink-security-trackingdart-ammo-desc = A a box containing 4 tracking darts.
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 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 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 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 = 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!
33 changes: 0 additions & 33 deletions Resources/Prototypes/Catalog/Fills/Crates/antag.yml
Original file line number Diff line number Diff line change
@@ -1,34 +1 @@
- type: entity
id: CratePirateChestCaptain
name: captains pirate chest
suffix: Filled
parent: CratePirate
components:
- type: StorageFill
contents:
- id: ClothingNeckCloakPirateCap
- id: Cutlass # Frontier EnergyCutlass<Cutlass
- id: DeathAcidifierImplanter # Frontier MicroBombImplanter<DeathAcidifierImplanter
- id: ClothingHeadsetAltFreelancer # Frontier

- type: entity
id: CratePirateChest
name: crews pirate chest
suffix: Filled
parent: CratePirate
components:
- type: StorageFill
contents:
- id: WeaponLauncherPirateCannon
amount: 2
- id: ClothingOuterCoatGentle
- id: Cutlass
amount: 2
- id: CannonBall
amount: 2
- id: WeaponPistolFlintlock
amount: 4
- id: WeaponShotgunBlunderbuss
amount: 2
- id: ClothingHeadsetFreelance # Frontier
amount: 3 # Frontier
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 # Frontier: add _NF, piratechest.rsi<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 # Frontier: add _NF, piratechest.rsi<piratechestgrey.rsi
state: crate_icon
- type: Appearance
- type: EntityStorageVisuals
Expand Down
67 changes: 67 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Crates/pirate.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,67 @@
- type: entity
id: CratePirateChestCaptain
name: captain's pirate chest
suffix: Filled
parent: CratePirate
components:
- type: StorageFill
contents:
- id: ClothingNeckCloakPirateCap
- id: Cutlass # Frontier EnergyCutlass<Cutlass
- id: DeathAcidifierImplanter # Frontier MicroBombImplanter<DeathAcidifierImplanter
- id: ClothingHeadsetAltFreelancer # Frontier

- type: entity
id: CratePirateChest
name: crew's pirate chest
suffix: Filled
parent: CratePirate
components:
- type: StorageFill
contents:
- id: WeaponLauncherPirateCannon
amount: 2
- id: ClothingOuterCoatGentle
- id: Cutlass
amount: 2
- id: CannonBall
amount: 2
- id: WeaponPistolFlintlock
amount: 4
- id: WeaponShotgunBlunderbuss
amount: 2
- id: ClothingHeadsetFreelance # Frontier
amount: 3 # Frontier

- type: entity
id: CratePirateChestCannonBall
name: cannonball chest
suffix: Filled
parent: CratePirateGrey
components:
- type: StorageFill
contents:
- id: CannonBall
amount: 6

- type: entity
id: CratePirateChestGrapeShot
name: grapeshot chest
suffix: Filled
parent: CratePirateGrey
components:
- type: StorageFill
contents:
- id: CannonBallGrapeshot
amount: 6

- type: entity
id: CratePirateChestGlassShot
name: glassshot chest
suffix: Filled
parent: CratePirateGrey
components:
- type: StorageFill
contents:
- id: CannonBallGlassshot
amount: 6
Loading

0 comments on commit 4586a34

Please sign in to comment.