Skip to content

New Prosec stamp and minor Justice loadout adjustments#2158

Merged
MilonPL merged 19 commits intoDeltaV-Station:masterfrom
Tomce795:justice-stamps
Nov 12, 2024
Merged

New Prosec stamp and minor Justice loadout adjustments#2158
MilonPL merged 19 commits intoDeltaV-Station:masterfrom
Tomce795:justice-stamps

Conversation

@Tomce795
Copy link
Copy Markdown
Contributor

@Tomce795 Tomce795 commented Nov 9, 2024

About the PR

Added new stamps for Prosecutor. Also adjusted their round-spawn equipment so they start with the stamp and with a Space Law book (also added one for Clerk),

Why / Balance

There are specific documents that can only be approved by certain members of Justice. Prosecutor can approve things like warrants and they typically write out paperwork for prosecuting during a trial, But Prosec only has access to the Lawyer stamp, like Attorney. This should help differentiate who actually stamped what and miiiight encourage more Prosec to do more paperwork.

Technical details

Added a Prosecutor stamp, stamp component and appropriate prototype.
Adjusted Prosecutor round start equipment to spawn with the stamp.
Added a Space Law book to both Prosecutor and Clerk on round start.

Media

Stamp example

Requirements

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

Breaking changes

Probably none?

Changelog
🆑

  • add: Added a new stamp for Prosecutor and added it to their starting loadout. Also added the Space Law book to the starting loadout for both Prosec and Clerk.

@Tomce795 Tomce795 requested a review from a team November 9, 2024 15:22
@github-actions github-actions Bot added S: Needs Review Awaiting review from a Maintainer Changes: YML Changes any yml files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Nov 9, 2024
@github-actions
Copy link
Copy Markdown
Contributor

github-actions Bot commented Nov 9, 2024

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

Resources/Textures/DeltaV/Objects/Misc/stamps.rsi

State Old New Status
stamp-prosec Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-prosec Added

Edit: diff updated after 92c9c60

@Tomce795
Copy link
Copy Markdown
Contributor Author

Tomce795 commented Nov 9, 2024

Unironically unsure if the new sprites are supposed to be in here or the Delta-V folder which has the mantis one. I'm sure one of you's will yell at me thou :blunt:

@Avalon-Proto
Copy link
Copy Markdown
Contributor

I feel like I should mention this. The clerk already has a stamp which is called the Notary Stamp. So the clerk stamp here is irrelevant

@Tomce795
Copy link
Copy Markdown
Contributor Author

Tomce795 commented Nov 9, 2024

Guh. Where does this stamp spawn? In a Clerk locker or something?

@Avalon-Proto
Copy link
Copy Markdown
Contributor

Yep, it does

@Tomce795
Copy link
Copy Markdown
Contributor Author

Tomce795 commented Nov 9, 2024

Okay general idea is to then to remove the Clerk stamp, make the prosec one the only one added. Also probably shift about the stamp to the Delta-V resource folder (but the notary stamped paper sprite isn't there for some reason?). Do Prosec get their own locker? If not, I'll keep the loadout changes so that they spawn with it.

@Radezolid
Copy link
Copy Markdown
Contributor

Prosec doesn't get a locker, gotta add it to their loadout.

@Tomce795 Tomce795 changed the title New justice stamps and minor loadout adjustments New Prosec stamp and minor Justice loadout adjustments Nov 9, 2024
Something something removed the edits to upstream localization, moved to the delta v one.
removed the stamps from Upstream Resource folder
@Tomce795
Copy link
Copy Markdown
Contributor Author

Tomce795 commented Nov 9, 2024

I dunno why the upstream files are still... modified, but that's to figure out later or to webedit away :blunt:

I believe the other stuff is okay, so nap time for me.

@Unkn0wnGh0st333
Copy link
Copy Markdown
Contributor

Uhh change the 🆑 to only be one bullet, don't need two different change logs for the same PR (unless it's a massive PR) :blunt:

Comment thread Resources/Locale/en-US/paper/stamp-component.ftl
Comment thread Resources/Prototypes/Entities/Objects/Misc/rubber_stamp.yml
@Tomce795
Copy link
Copy Markdown
Contributor Author

Untouched upstream files. git checkout upstream/master to the rescue. GitHub is wacky and confuzzling but I think this is now good to merge after tests.

@Tomce795 Tomce795 requested a review from MilonPL November 11, 2024 16:46
@MilonPL MilonPL merged commit 52d63ba into DeltaV-Station:master Nov 12, 2024
@Tomce795 Tomce795 deleted the justice-stamps branch November 12, 2024 17:11
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Apr 7, 2025
# Description

This tweaks glimmer to be properly time differentiated, such that the
linear decay CVar directly corresponds 1:1 with 1 glimmer decayed
linearly per second.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review Awaiting review from a Maintainer

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants