Pirate Uplink and New Drip. #1476

Salvantrix · 2024-06-05T18:26:52Z

Adds in a fully operational pirate coconut uplink, as well as new drippy drip.

Listed as draft as awaiting updated icon sprites.

About the PR

Why / Balance

How to test

Media

I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

add: New Pirate Drip and Coconut uplink!

Adds in a fully operational pirate coconut uplink, as well as new drippy drip. Listed as draft as awaiting updated icon sprites.

github-actions · 2024-06-05T18:27:29Z

RSI Diff Bot; head commit 47dd705 merging into 1cc4bb2
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat_luffy.rsi

State	Old	New	Status
equipped-HELMET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Neck/Cloaks/pirate_parrot.rsi

State	Old	New	Status
equipped-NECK			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/OuterClothing/Misc/pirate_captain.rsi

State	Old	New	Status
equipped-OUTERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Shoes/Boots/pirate.rsi

State	Old	New	Status
equipped-FEET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Shoes/Boots/pirate_luffy.rsi

State	Old	New	Status
equipped-FEET			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_luffy.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Clothing/Uniforms/Jumpsuit/pirate_slops.rsi

State	Old	New	Status
equipped-INNERCLOTHING			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Objects/Devices/pirate_uplink.rsi

State	Old	New	Status
icon-overlay			Added
icon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Objects/Specific/Pirate/pirate_doubloon.rsi

State	Old	New	Status
doubloon			Added
inhand-left			Added
inhand-right			Added

Resources/Textures/_NF/Objects/Weapons/Melee/pirate_hook.rsi

State	Old	New	Status
icon			Added
inhand-left			Added
inhand-right			Added

Edit: diff updated after 47dd705

Leander-0 · 2024-06-05T19:15:50Z

I do think the prices should be all around lower, the pirate revolver is much worse than the regular one for example and there is no way for pirates to gain more doubloons.

Drip is good, uplink is FUBAR.

Added tags and currency yml? FIX

Uplink is working now.

Test

test

Fix?

AAAAAA fixed

Leander-0 · 2024-06-11T13:02:56Z

Note that the pirate hardsuits are in a good price range but they are really weak right now, the hardsuit should be buffed to the gold-silver regular NFSD suits and on a different PR add a new more powerful pirate hardsuit.

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml

Leander-0 · 2024-06-11T13:12:15Z

The individual cannon ammo should be in bundles of 5 for 2 DB, instead of individual ones for 1 DB, since the all cannon bundles. but that can be done on a different PR to add a box or small crate for those to come in.

whatston3

I like this feature a lot. Everything looks good. Left a few suggestions for your consideration (mostly text), and I have a branch with a blinky pirate uplink. The balance changes recommended by Leander seem reasonable to me.

Sorry for dragging my heels on this.

Resources/Prototypes/_NF/Store/presets.yml

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

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

Resources/Prototypes/_NF/Entities/Objects/Specific/pirate.yml

Resources/Textures/_NF/Clothing/Head/Hats/pirate_hat.rsi/meta.json

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

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

Salvantrix · 2024-06-12T15:48:51Z

I like this feature a lot. Everything looks good. Left a few suggestions for your consideration (mostly text), and I have a branch with a blinky pirate uplink. The balance changes recommended by Leander seem reasonable to me.

Sorry for dragging my heels on this.

Oops to a couple of those, I needed to do a pass as some of that is just laziness on my part. I'll get that updated tonight.

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

whatston3 · 2024-06-13T14:36:07Z

Pushed changes for blinking uplink and some consistency in "Hardsuit" capitalization. Works well on my end, double check on your side. Giving this another readthrough.

whatston3

Looking good, pardon the nitpicks - let me know when your final changes are up and I'll give it another read.

Resources/Prototypes/_NF/Store/presets.yml

This ish is done. GG no RE

whatston3 · 2024-06-13T17:59:01Z

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml

+  id: UplinkPirateShotgunAmmo
+  name:  uplink-pirate-shotgunammo-name
+  description: uplink-pirate-shotgunammo-desc
+  productEntity: BoxMagazineShotgun


Is this supposed to be the shotgun slug dispenser? This is not the shotgun slug dispenser. I can change it on my end, but seems odd to get a bunch of bulldog mags.

whatston3 · 2024-06-13T18:01:19Z

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml

+  name:  uplink-pirate-shotgunammo-name
+  description: uplink-pirate-shotgunammo-desc
+  productEntity: BoxMagazineShotgun
+  icon: { sprite: Objects/Storage/boxes.rsi, state: shellslug }


#1426 fixes this.

whatston3

Happy with the head of the branch as it is. Requesting another sanity check, but my testing looked good.

Salvantrix · 2024-06-13T20:51:59Z

Fixes make this work as intended on my end, ready for a triple check if needed.

github-actions · 2024-06-13T23:26:57Z

This pull request has conflicts, please resolve those before we can evaluate the pull request.

…-station-14 into Pirate-Stuff

whatston3 · 2024-06-13T23:55:46Z

Merge conflicts should be resolved.

Pirate Uplink and New Drip.

fdc7e2e

Adds in a fully operational pirate coconut uplink, as well as new drippy drip. Listed as draft as awaiting updated icon sprites.

github-actions bot added No C# Sprites YML FTL labels Jun 5, 2024

Added fixed textures.

c5bc18a

Drip is good, uplink is FUBAR.

Salvantrix marked this pull request as ready for review June 9, 2024 13:56

Salvantrix added 7 commits June 9, 2024 11:14

Fix?

74f2636

Added tags and currency yml? FIX

AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

84c771c

Uplink is working now.

aaaaaaaaaaaaaaaaaa

29ee799

Test

8ac8b63

Test

test

2d6b72d

test

Fix?

ba9499c

Fix?

AAAAAA

c9cfce7

AAAAAA fixed

Leander-0 reviewed Jun 11, 2024

View reviewed changes

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml Outdated Show resolved Hide resolved

Leander-0 reviewed Jun 11, 2024

View reviewed changes

Resources/Prototypes/_NF/Catalog/pirate_uplink_catalog.yml Outdated Show resolved Hide resolved

whatston3 requested changes Jun 12, 2024

View reviewed changes

Salvantrix and others added 8 commits June 13, 2024 09:01

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

84511e7

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

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

d4761b8

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

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

92ed11f

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

Update meta.json

43c9a51

Update meta.json

ef0169c

Update meta.json

4ae1317

Update pirate_uplink_catalog.yml

3c505a4

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

92958a7

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

Salvantrix and others added 7 commits June 13, 2024 09:11

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

105902d

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

Update meta.json

8df4116

Update meta.json

f0592a9

Update meta.json

b6288e1

Update meta.json

979d1fa

Blinky pirate uplink

98dbe5c

Pirate HardSuit->Pirate Hardsuit

8a15972

whatston3 reviewed Jun 13, 2024

View reviewed changes

Resources/Prototypes/_NF/Store/presets.yml Show resolved Hide resolved

Mofuckin Yeet

d14fddf

This ish is done. GG no RE

whatston3 reviewed Jun 13, 2024

View reviewed changes

Whatstone added 3 commits June 13, 2024 14:10

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

8f7f1ac

Pirate uplink: rework text, use lethal shells

ced5c3b

Fix lethal shotgun entity ID

62c5d78

whatston3 approved these changes Jun 13, 2024

View reviewed changes

github-actions bot added the S: Merge Conflict This PR has conflicts that prevent merging label Jun 13, 2024

Merge branch 'master' of https://github.com/new-frontiers-14/frontier…

47dd705

…-station-14 into Pirate-Stuff

github-actions bot removed the S: Merge Conflict This PR has conflicts that prevent merging label Jun 13, 2024

Cheackraze merged commit 4586a34 into new-frontiers-14:master Jun 14, 2024
14 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Pirate Uplink and New Drip. #1476

Pirate Uplink and New Drip. #1476

Salvantrix commented Jun 5, 2024 •

edited

Loading

github-actions bot commented Jun 5, 2024 •

edited

Loading

Leander-0 commented Jun 5, 2024

Leander-0 commented Jun 11, 2024

Leander-0 commented Jun 11, 2024

whatston3 left a comment

Salvantrix commented Jun 12, 2024

whatston3 commented Jun 13, 2024

whatston3 left a comment

whatston3 Jun 13, 2024

whatston3 Jun 13, 2024

whatston3 left a comment

Salvantrix commented Jun 13, 2024

github-actions bot commented Jun 13, 2024

whatston3 commented Jun 13, 2024

Pirate Uplink and New Drip. #1476

Pirate Uplink and New Drip. #1476

Conversation

Salvantrix commented Jun 5, 2024 • edited Loading

About the PR

Why / Balance

How to test

Media

Breaking changes

github-actions bot commented Jun 5, 2024 • edited Loading

Leander-0 commented Jun 5, 2024

Leander-0 commented Jun 11, 2024

Leander-0 commented Jun 11, 2024

whatston3 left a comment

Choose a reason for hiding this comment

Salvantrix commented Jun 12, 2024

whatston3 commented Jun 13, 2024

whatston3 left a comment

Choose a reason for hiding this comment

whatston3 Jun 13, 2024

Choose a reason for hiding this comment

whatston3 Jun 13, 2024

Choose a reason for hiding this comment

whatston3 left a comment

Choose a reason for hiding this comment

Salvantrix commented Jun 13, 2024

github-actions bot commented Jun 13, 2024

whatston3 commented Jun 13, 2024

Salvantrix commented Jun 5, 2024 •

edited

Loading

github-actions bot commented Jun 5, 2024 •

edited

Loading