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 all 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
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
Loading