Skip to content

Commit

Permalink
Pilot Job (#865)
Browse files Browse the repository at this point in the history
* Pilot Job Base Parts

* Added pilot's locker and added pilot's drip to AstroVend

* minor fixes

* added more info in meta files

* fixed cigs

* applied suggested edits

* fixed some typos

* removed stats from hardsuit, removed lighter from starting gear

* replaced cool kid cigs and oxy tank with lame ones (it's spess man's smokes and extended capacity tank), tainted myself with my first cs edit. only downhill from now on.

* Missing Perms

* Mini

---------

Co-authored-by: Dvir <[email protected]>
  • Loading branch information
ErhardSteinhauer and dvir001 authored Jan 15, 2024
1 parent 9b89cf4 commit 0df97de
Show file tree
Hide file tree
Showing 113 changed files with 752 additions and 5 deletions.
1 change: 1 addition & 0 deletions Content.Shared/Access/Components/IdCardConsoleComponent.cs
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ public sealed partial class IdCardConsoleComponent : Component
"Maintenance",
"Medical",
"Mercenary", // Frontier
"Pilot", // Frontier
"Quartermaster",
"Research",
"ResearchDirector",
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/_NF/job/job-description.ftl
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
job-description-mercenary = Execute the bidding of anyone- for the right price. Enjoy being unbound from the confines of the law.
job-description-stc = Expertly de-conflict the space around the station and help the NFSD issue fines for overdocked ships.
job-description-pilot = Pilot spaceships from point A to B, outmaneuver pirates and dodge asteroids. You are a leaf on the solar wind, let others marvel at how you soar.
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_NF/job/job-names.ftl
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
job-name-mercenary = Mercenary
job-name-stc = Station Traffic Controller
job-name-pilot = Pilot
# Role timers - Make these alphabetical or I cut you
JobMercenary = Mercenary
JobSTC = Station Traffic Controller
JobPilot = Pilot
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/_NF/prototypes/access/accesses.ftl
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
id-card-access-level-frontier = Station Traffic Controller
id-card-access-level-mercenary = Mercenary
id-card-access-level-pilot = Pilot
1 change: 1 addition & 0 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Engineering
- Medical
- Mercenary # Frontier
- Pilot # Frontier
- Quartermaster
- Salvage
- Cargo
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
- Maintenance
- Medical
- Mercenary # Frontier
- Pilot # Frontier
- Quartermaster
- Research
- ResearchDirector
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@
- ResearchDirector # Frontier
- Armory # Frontier
- Mercenary # Frontier
- Pilot # Frontier
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant, TrackingImplant ] # Frontier - Added TrackingImplant
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
- ChiefEngineer # Frontier
- ChiefMedicalOfficer # Frontier
- ResearchDirector # Frontier
- Pilot # Frontier
special:
- !type:AddImplantSpecial
implants: [ MindShieldImplant, TrackingImplant ]
Expand Down
3 changes: 3 additions & 0 deletions Resources/Prototypes/_NF/Access/pilot.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
- type: accessLevel
id: Pilot
name: id-card-access-level-pilot
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@
contents:
- id: BoxSurvival
- id: RubberStampStc

- type: entity
noSpawn: true
parent: ClothingBackpackPilot
id: ClothingBackpackPilotFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: Lighter
- id: CigPackGreen
- id: ExtendedEmergencyOxygenTank
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@
contents:
- id: BoxSurvival
- id: RubberStampStc

- type: entity
noSpawn: true
parent: ClothingBackpackDuffelPilot
id: ClothingBackpackDuffelPilotFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: Lighter
- id: CigPackGreen
- id: ExtendedEmergencyOxygenTank
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,15 @@
contents:
- id: BoxSurvival
- id: RubberStampStc

- type: entity
noSpawn: true
parent: ClothingBackpackSatchelPilot
id: ClothingBackpackSatchelPilotFilled
components:
- type: StorageFill
contents:
- id: BoxSurvival
- id: Lighter
- id: CigPackGreen
- id: ExtendedEmergencyOxygenTank
19 changes: 19 additions & 0 deletions Resources/Prototypes/_NF/Catalog/Fills/Lockers/suit_storage.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75,3 +75,22 @@
# - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
- type: AccessReader
access: [["Captain"], ["Mercenary"]]

#Pilot hardsuit
- type: entity
id: SuitStoragePilot
parent: SuitStorageBase
suffix: Pilot
components:
- type: StorageFill
contents:
# - id: NitrogenTankFilled
# - id: OxygenTankFilled
- id: AirTankFilled
- id: ClothingOuterHardsuitPilot
- id: ClothingMaskBreath
- id: JetpackMiniFilled
- id: HandheldGPSBasic
# - id: ClothingShoesBootsMagMercenaryFilled # Frontier - Not adding this to the suit storage so it wont be abused, exists only on role spawn.
- type: AccessReader
access: [["Captain"], ["Pilot"]]
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,11 @@
id: SuitStorageWallmountMercenary
parent: [SuitStorageWallmount, SuitStorageMercenary]

#Pilot hardsuit
- type: entity
id: SuitStorageWallmountPilot
parent: [SuitStorageWallmount, SuitStoragePilot]

#SOFTSUITS
#Basic EVA
- type: entity
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,16 @@
JetpackMiniFilled: 10
EncryptionKeyTraffic: 30
HandHeldMassScanner: 10
# Pilot drip
ClothingBackpackPilot: 3
ClothingBackpackDuffelPilot: 3
ClothingBackpackSatchelPilot: 3
ClothingUniformJumpsuitPilot: 3
ClothingOuterCoatBomber: 3
ClothingHeadsetAltPilot: 3
ClothingEyesGlassesPilot: 3
ClothingHandsGlovesPilot: 3
ClothingHeadHatPilot: 3
ClothingNeckScarfPilot: 3
ClothingOuterHardsuitPilot: 3
ClothingShoesBootsPilot: 3
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/backpacks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,3 +6,12 @@
components:
- type: Sprite
sprite: _NF/Clothing/Back/Backpacks/arcadia-backpack.rsi

- type: entity
parent: ClothingBackpack
id: ClothingBackpackPilot
name: pilot backpack
description: A backpack for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Backpacks/pilot_backpack.rsi
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/duffel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/arcadia-dufflebag.rsi

- type: entity
parent: ClothingBackpackDuffel
id: ClothingBackpackDuffelPilot
name: pilot duffel
description: A duffelbag produced for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Duffels/pilot_duffel.rsi
9 changes: 9 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Back/satchel.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,12 @@
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/arcadia-satchel.rsi

- type: entity
parent: ClothingBackpackSatchel
id: ClothingBackpackSatchelPilot
name: pilot satchel
description: A satchel produced for a True Ace.
components:
- type: Sprite
sprite: _NF/Clothing/Back/Satchels/pilot_satchel.rsi
15 changes: 15 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Ears/headsets_alt.yml
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,18 @@
sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi
- type: Clothing
sprite: _NF/Clothing/Ears/Headsets/mercenary.rsi

- type: entity
parent: ClothingHeadsetAlt
id: ClothingHeadsetAltPilot
name: pilot over-ear headset
components:
- type: ContainerFill
containers:
key_slots:
- EncryptionKeyCommon
- EncryptionKeyTraffic
- type: Sprite
sprite: _NF/Clothing/Ears/Headsets/pilot_headset.rsi
- type: Clothing
sprite: _NF/Clothing/Ears/Headsets/pilot_headset.rsi
13 changes: 13 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Eyes/glasses.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,3 +12,16 @@
- type: EyeProtection
- type: VisionCorrection
- type: IdentityBlocker

- type: entity
parent: ClothingEyesBase
id: ClothingEyesGlassesPilot
name: pilot goggles
description: I'm sorry, but you can't pilot a ship without cool glasses. Those are the Rules. Has a GPS built in them too.
components:
- type: Sprite
sprite: _NF/Clothing/Eyes/Glasses/pilot_glasses.rsi
- type: Clothing
sprite: _NF/Clothing/Eyes/Glasses/pilot_glasses.rsi
- type: HandheldGPS
- type: VisionCorrection
17 changes: 17 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Hands/gloves.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,20 @@
fiberMaterial: fibers-synthetic
fiberColor: fibers-black
- type: FingerprintMask

- type: entity
parent: ClothingHandsBase
id: ClothingHandsGlovesPilot
name: pilot gloves
description: Driving gloves, but for spaceships!
components:
- type: Sprite
sprite: _NF/Clothing/Hands/Gloves/pilot_gloves.rsi
- type: Clothing
sprite: _NF/Clothing/Hands/Gloves/pilot_gloves.rsi
- type: GloveHeatResistance
heatResistance: 1400
- type: Fiber
fiberMaterial: fibers-leather
fiberColor: fibers-brown
- type: FingerprintMask
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,21 @@
Slash: 0.9
Piercing: 0.9
Heat: 0.9

#Pilot Hardsuit
- type: entity
parent: ClothingHeadHardsuitWithLightBase
id: ClothingHeadHelmetHardsuitPilot
noSpawn: true
name: pilot hardsuit helmet
description: Light hardsuit helmet for pilots.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hardsuits/pilot_helmet.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hardsuits/pilot_helmet.rsi
- type: PointLight
color: "#ffdbad"
- type: PressureProtection
highPressureMultiplier: 0.1
lowPressureMultiplier: 1000
15 changes: 15 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Head/hats.yml
Original file line number Diff line number Diff line change
Expand Up @@ -108,3 +108,18 @@
- type: Tag
tags:
- WhitelistChameleon

- type: entity
parent: ClothingHeadBase
id: ClothingHeadHatPilot
name: pilot's helmet
description: Can't hear voices in my headset when earflaps flaps over my ears. And it feels good.
components:
- type: Sprite
sprite: _NF/Clothing/Head/Hats/pilot_hat.rsi
- type: Clothing
sprite: _NF/Clothing/Head/Hats/pilot_hat.rsi
- type: Tag
tags:
- ClothMade
- WhitelistChameleon
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Neck/scarfs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,14 @@
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Scarfs/chaplain_stole.rsi

- type: entity
parent: ClothingNeckBase
id: ClothingNeckScarfPilot
name: pilot's scarf
description: Have I told you a story how I survived when the end of this scarf got tangled in a spinning propeller? I didn't, they cloned me.
components:
- type: Sprite
sprite: _NF/Clothing/Neck/Scarfs/pilot_scarf.rsi
- type: Clothing
sprite: _NF/Clothing/Neck/Scarfs/pilot_scarf.rsi
Original file line number Diff line number Diff line change
Expand Up @@ -59,3 +59,33 @@
sprintModifier: 0.9
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitMercenary

# Pilot Hardsuit - Spationaut stats
- type: entity
parent: ClothingOuterHardsuitBase
id: ClothingOuterHardsuitPilot
name: pilot hardsuit
description: A hardsuit tailored for someone who spends the majority of their time buckled to a chair.
components:
- type: Sprite
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot_hardsuit.rsi
- type: Clothing
sprite: _NF/Clothing/OuterClothing/Hardsuits/pilot_hardsuit.rsi
- type: PressureProtection
highPressureMultiplier: 0.7
lowPressureMultiplier: 1000
- type: Armor
modifiers:
coefficients:
Blunt: 0.9
Slash: 0.9
Piercing: 0.9
Radiation: 0.3
Caustic: 0.8
- type: ClothingSpeedModifier
walkModifier: 0.9
sprintModifier: 0.8
- type: ToggleableClothing
clothingPrototype: ClothingHeadHelmetHardsuitPilot
- type: StaticPrice
price: 195
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Shoes/boots.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: ClothingShoesBaseButcherable
id: ClothingShoesBootsPilot
name: pilot boots
description: Stylish boots for running in circles on a deck during emergencies.
components:
- type: Sprite
sprite: _NF/Clothing/Shoes/Boots/pilot_boots.rsi
- type: Clothing
sprite: _NF/Clothing/Shoes/Boots/pilot_boots.rsi
- type: Matchbox
11 changes: 11 additions & 0 deletions Resources/Prototypes/_NF/Entities/Clothing/Uniforms/jumpsuits.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,3 +53,14 @@
sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/security_stationguard.rsi

- type: entity
parent: ClothingUniformBase
id: ClothingUniformJumpsuitPilot
name: pilot jumpsuit
description: You too think there should be a pocket for your fav smokes?
components:
- type: Sprite
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot_jumpsuit.rsi
- type: Clothing
sprite: _NF/Clothing/Uniforms/Jumpsuit/pilot_jumpsuit.rsi
Loading

0 comments on commit 0df97de

Please sign in to comment.