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

new pens for various departments #2735

Open
wants to merge 6 commits into
base: master
Choose a base branch
from

Conversation

mishka420
Copy link

@mishka420 mishka420 commented Jan 15, 2025

check out these cool and marketable pens! collect them all! sprites by kushbreth

About the PR

New pens have been added for:
Captain, HoP, HoS, Mystagogue, Logistics Officer, Chief Medical Officer, Chief Justice, Warden, and Psychologist.

Why / Balance

adds variety to standardized pens. fun little "rare" item. maybe someday they can be thief objectives but today is not that day.

Technical details

yaml changes.

Media

newpens

Requirements

  • [X ] I have tested all added content and changes.
  • [X ] I have added media to this PR or it does not require an ingame showcase.

Breaking changes

Changelog

🆑

  • add: Added fancy new pens for (most) command roles, warden and psychologist. Look for them in your PDA!
  • tweak: Changed graphics for Captain and Head of Personnel's pens.

@mishka420 mishka420 requested review from a team as code owners January 15, 2025 07:39
@github-actions github-actions bot added S: Needs Review size/M 64-255 lines Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an rsi labels Jan 15, 2025
Copy link
Contributor

github-actions bot commented Jan 15, 2025

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

Resources/Textures/_DV/Objects/Misc/pens.rsi

State Old New Status
pen_cap2 Added
pen_ce Added
pen_cj Added
pen_cmo Added
pen_hop2 Added
pen_hos Added
pen_lo Added
pen_mystagogue Added
pen_psych2 Added
pen_warden Added

Edit: diff updated after d627eba

Copy link
Contributor

@Radezolid Radezolid left a comment

Choose a reason for hiding this comment

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

Key points:

  • Minor issues with the comments.
  • Create a new pen.yml in it's respective folder in the _DV namespace creating the pens you made there.
  • Create a new pens.rsi in it's respective folder in the _DV namespace, creating a new meta.json and adding the files you created there.
  • Minor convention issues on the pens.

Resources/Prototypes/Entities/Objects/Devices/pda.yml Outdated Show resolved Hide resolved
Comment on lines 45 to 51
- type: Tending # Shitmed
speed: 0.55
- type: SurgeryTool # Shitmed
startSound:
path: /Audio/_Shitmed/Medical/Surgery/retractor1.ogg
endSound:
path: /Audio/_Shitmed/Medical/Surgery/hemostat1.ogg
Copy link
Contributor

Choose a reason for hiding this comment

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

Restore this or explain why do you plan on removing this.
If you are trying to remove it you need to comment it out instead of deleting it,

Resources/Textures/Objects/Misc/pens.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Devices/pda.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Misc/pen.yml Outdated Show resolved Hide resolved
@mishka420
Copy link
Author

ah- this code was made pre-shitmed and i ported old pen code back in, sorry about that lmao. i'll start working on fixing these. thanks for the review!

@Radezolid
Copy link
Contributor

ah- this code was made pre-shitmed and i ported old pen code back in, sorry about that lmao. i'll start working on fixing these. thanks for the review!

No worries, i was just confused why it was nuked

@mishka420
Copy link
Author

mishka420 commented Jan 15, 2025

should be better now. do let me know if i've missed anything. thank you!
edit: hold up i forgot to push the changes. sorry gimme a second. we're back!

whitelist:
tags:
- Write
#end delta v content
Copy link
Contributor

Choose a reason for hiding this comment

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

Forgor to change to # End DeltaV changes

Resources/Prototypes/Entities/Objects/Devices/pda.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Entities/Objects/Devices/pda.yml Outdated Show resolved Hide resolved
@@ -125,4 +125,4 @@
description: A luxurious fountain pen for the hop of the station.
components:
- type: Sprite
state: pen_hop
state: pen_hop
Copy link
Contributor

Choose a reason for hiding this comment

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

Add a end of file newline

Resources/Textures/Objects/Misc/pens.rsi/meta.json Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml Outdated Show resolved Hide resolved
Resources/Prototypes/_DV/Entities/Objects/Misc/pen.yml Outdated Show resolved Hide resolved
Copy link
Contributor

Choose a reason for hiding this comment

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

The JSON should be indented with 4 spaces instead of two.
Also you're missing an End of File newline.

@mishka420
Copy link
Author

forgot to untouch the json code. i'll do that when i get home 🤪

Copy link
Contributor

Choose a reason for hiding this comment

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

JSON needs to be indented with four spaces. For an example check out the foam sabre meta.json

Comment on lines 1078 to 1085
#new delta v content
penSlot:
startingItem: PenPsych
priority: -1
whitelist:
tags:
- Write
#end delta v content
Copy link
Contributor

Choose a reason for hiding this comment

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

The comments should be on the same indentation and should be formatted as such:

# Begin DeltaV changes
blah
blah
# End DeltaV changes

@github-actions github-actions bot added the S: Merge Conflict Fix your PR! label Jan 16, 2025
Copy link
Contributor

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

Lyndomen
Lyndomen previously approved these changes Jan 16, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Merge Conflict Fix your PR! S: Needs Review size/M 64-255 lines
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants