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

Pilot Job #865

Merged
merged 11 commits into from
Jan 15, 2024
Merged

Pilot Job #865

merged 11 commits into from
Jan 15, 2024

Conversation

ErhardSteinhauer
Copy link
Contributor

@ErhardSteinhauer ErhardSteinhauer commented Jan 11, 2024

About the PR

Added a bunch of items for pilot job:

  • Clothes: helmet, glasses (works as handheld GPS), headset (comes with Traffic Key), Jumpsuit, Scarf, Boots, Gloves, Duffel/Satchel/Backpack.
  • Hardsuit: resprited base one, added flashlight to the toggleable helmet, stat wise the only difference between pilots and basic hardsuit is slightly higher explosion resistance (20% instead of 10%). Monkey version included.
  • Other items: PDA, Access Card, Job Icon.
  • Storage: Pilot's Locker (no filled version right now), filled Pilot Suit Storage Normal and Wall-Mount.
  • Added pilot drip to AstroVend.

Other stuff:

  • Added pilot job specific access, pilot access can be issued to someone by SR.
  • Added starting loadout.
  • Made Pilot Job Spawn Marker. I think it works, but haven't tested it yet.
  • Added job description and name to locale.

Why / Balance

RP: makes sense to have a dedicated Pilot Job on a server built around spacefaring.

Media

image
pilot-drip pilot-hardsuit
image

  • I have added screenshots/videos to this PR showcasing its changes ingame.

Changelog
🆑 erhardsteinhauer

  • add: Pilot Job with some job related drip. Check AstroVend for new looks.

Copy link
Contributor

github-actions bot commented Jan 11, 2024

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

Resources/Textures/_NF/Clothing/Back/Backpacks/pilot_backpack.rsi

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

Resources/Textures/_NF/Clothing/Back/Duffels/pilot_duffel.rsi

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

Resources/Textures/_NF/Clothing/Back/Satchels/pilot_satchel.rsi

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

Resources/Textures/_NF/Clothing/Ears/Headsets/pilot_headset.rsi

State Old New Status
alt-equipped-EARS Added
icon_alt Added

Resources/Textures/_NF/Clothing/Eyes/Glasses/pilot_glasses.rsi

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

Resources/Textures/_NF/Clothing/Hands/Gloves/pilot_gloves.rsi

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

Resources/Textures/_NF/Clothing/Head/Hardsuits/pilot_helmet.rsi

State Old New Status
icon-flash Added
icon Added
off-equipped-HELMET-vulpkanin Added
off-equipped-HELMET Added
off-inhand-left Added
off-inhand-right Added
on-equipped-HELMET-vulpkanin Added
on-equipped-HELMET Added
on-inhand-left Added
on-inhand-right Added

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

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

Resources/Textures/_NF/Clothing/Neck/Scarfs/pilot_scarf.rsi

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

Resources/Textures/_NF/Clothing/OuterClothing/Hardsuits/pilot_hardsuit.rsi

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

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

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

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

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

Resources/Textures/_NF/Interface/Misc/job_icons.rsi

State Old New Status
Pilot Added

Resources/Textures/_NF/Markers/jobs.rsi

State Old New Status
pilot Added

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

State Old New Status
pda-pilot Added

Resources/Textures/_NF/Objects/Misc/id_cards.rsi

State Old New Status
idpilot Added

Resources/Textures/_NF/Structures/Storage/closet.rsi

State Old New Status
pilot Added
pilot_door Added
pilot_open Added

Edit: diff updated after d37cc41

…smokes and extended capacity tank), tainted myself with my first cs edit. only downhill from now on.
@github-actions github-actions bot added C# and removed No C# labels Jan 11, 2024
@dvir001 dvir001 self-requested a review January 13, 2024 21:13
@github-actions github-actions bot added the S: Needs Review This PR is awaiting reviews label Jan 13, 2024
Copy link
Contributor

@dvir001 dvir001 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

All issues resolved

@dvir001 dvir001 merged commit 0df97de into new-frontiers-14:master Jan 15, 2024
12 of 13 checks passed
FrontierATC added a commit that referenced this pull request Jan 15, 2024
dvir001 pushed a commit to dvir001/frontier-station-14 that referenced this pull request Apr 29, 2024
It has bothered me and today felt like fixin it.
Cheackraze pushed a commit that referenced this pull request May 2, 2024
* Felinid changes. (#666)

* Felinid changes.

A plan

* Just slappin it together

for a friend to see and help

* Somethin somethin

Cos I could be at yours on friday
Tonight's at the place we started
It's a long way back from sorry
But here I go ....
How does it feel, how does it feel
Just tell me something

I don't know what to tell you
I don't know what to say
I got into my head, i'm sorry i threw it away
But i'm so glad you came back, even through all the pain
Let me try and mend it, i can promise that i have changed
Oh, let me give you all of me
Can we just sort it out for real

* just makin this less messy.... I guess

* Just tell me somethin.

How does it feel, how does it feel.

* .

* cleaning....

* Makes it work. Yey.

* just a small change tbh.

* okay maybe just a bit.

* Hm, maybe....

* This feels bit better.

* hopefully fixes yaml linter

* Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

Co-authored-by: Debug <[email protected]>
Signed-off-by: Adrian16199 <[email protected]>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>

* Fixes the 2 pixels in the fluffy tail. (#865)

It has bothered me and today felt like fixin it.

* Make felinids scream in agony when sprayed with water. (#556)

* Make felinids scream in agony when sprayed with water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.

* Giving probability as the best possible implementation as of now

---------

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

* "Fix felinid sprite shit"

This PR
DeltaV-Station/Delta-v@89383ab

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
Vonsant pushed a commit to Corvax-Frontier/corvax-frontier-14 that referenced this pull request May 2, 2024
* Felinid changes. (new-frontiers-14#666)

* Felinid changes.

A plan

* Just slappin it together

for a friend to see and help

* Somethin somethin

Cos I could be at yours on friday
Tonight's at the place we started
It's a long way back from sorry
But here I go ....
How does it feel, how does it feel
Just tell me something

I don't know what to tell you
I don't know what to say
I got into my head, i'm sorry i threw it away
But i'm so glad you came back, even through all the pain
Let me try and mend it, i can promise that i have changed
Oh, let me give you all of me
Can we just sort it out for real

* just makin this less messy.... I guess

* Just tell me somethin.

How does it feel, how does it feel.

* .

* cleaning....

* Makes it work. Yey.

* just a small change tbh.

* okay maybe just a bit.

* Hm, maybe....

* This feels bit better.

* hopefully fixes yaml linter

* Update Resources/Prototypes/Nyanotrasen/Entities/Mobs/Species/felinid.yml

Co-authored-by: Debug <[email protected]>
Signed-off-by: Adrian16199 <[email protected]>

* Doin the changes.

* Renaming.

* Renaming notes.

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>

* Fixes the 2 pixels in the fluffy tail. (new-frontiers-14#865)

It has bothered me and today felt like fixin it.

* Make felinids scream in agony when sprayed with water. (new-frontiers-14#556)

* Make felinids scream in agony when sprayed with water.

Their screams will be heard thro walls and halls. You will hear a felinid scream in a shift atleast once. Their sheer agony.

* Giving probability as the best possible implementation as of now

---------

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

* "Fix felinid sprite shit"

This PR
DeltaV-Station/Delta-v@89383ab

---------

Signed-off-by: Adrian16199 <[email protected]>
Co-authored-by: Adrian16199 <[email protected]>
Co-authored-by: Debug <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants