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.

Sign up for GitHub

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

Jump to bottom

Bring justice to Pebble #1309

Merged
merged 7 commits into from
Jun 7, 2024
Merged

Bring justice to Pebble #1309

merged 7 commits into from
Jun 7, 2024

Conversation

therealDLondon
Copy link
Member

@therealDLondon therealDLondon commented Jun 5, 2024 •
edited
Loading

About the PR

Maps the justice department into pebble
Also remodels the court, a minor tweak here and there across the station.

Why / Balance

I dont want pebble to be de-rotated and nobody else was gonna do it, so Pebble was made JD compliant

Technical details

This PR will be ready-to-go once Justice is merged!

Media

image
image
image

  • I have added screenshots/videos to this PR showcasing its changes ingame, or this PR does not require an ingame showcase

Breaking changes

Changelog

nothin

@github-actions github-actions bot added Changes: YML Changes any yml files Changes: Map Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Sprite Changes any png or json in an rsi labels Jun 5, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 5, 2024

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

Resources/Textures/DeltaV/Clothing/Ears/Headsets/justice.rsi

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

Resources/Textures/DeltaV/Clothing/Head/Hats/cj_toque.rsi

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

Resources/Textures/DeltaV/Clothing/Neck/Cloaks/cjcloak.rsi

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

Resources/Textures/DeltaV/Clothing/Neck/Misc/prosecutorbadge.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/DeltaV/Clothing/Neck/mantles/cjmantle.rsi

State Old New Status
equipped-NECK Added
icon Added

Resources/Textures/DeltaV/Clothing/OuterClothing/Coats/cjrobe.rsi

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

Resources/Textures/DeltaV/Clothing/OuterClothing/Vests/clerkvest.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/cj.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/clerk.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpskirt/prosecutorred.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cj_white.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/cjformal.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/clerk.rsi

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

Resources/Textures/DeltaV/Clothing/Uniforms/Jumpsuit/prosecutorred.rsi

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

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

State Old New Status
ChiefJustice Added
Clerk Added
Lawyer Added
Prosecutor Added

Resources/Textures/DeltaV/Markers/jobs.rsi

State Old New Status
chiefjustice Added
clerk Added
prosecutor Added

Resources/Textures/DeltaV/Objects/Devices/encryption_keys.rsi

State Old New Status
justice_label Added

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

State Old New Status
pda-chiefjustice Added
pda-clerk Added
pda-prosecutor Added

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

State Old New Status
idchiefjustice Added
idclerk Added
idlawyer Added
idprosecutor Added

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

State Old New Status
stamp-cj Added
stamp-notary Added

Resources/Textures/DeltaV/Objects/Specific/Justice/gavel.rsi

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

Resources/Textures/DeltaV/Objects/Specific/Justice/gavelblock.rsi

State Old New Status
icon Added

Resources/Textures/DeltaV/Objects/Specific/Justice/trialtimer.rsi

State Old New Status
trialtimer Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Glass/justice.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/DeltaV/Structures/Doors/Airlocks/Standard/justice.rsi

State Old New Status
assembly Added
bolted_unlit Added
closed Added
closed_unlit Added
closing Added
closing_unlit Added
deny_unlit Added
emergency_unlit Added
open Added
opening Added
opening_unlit Added
panel_closing Added
panel_open Added
panel_opening Added
sparks Added
sparks_broken Added
sparks_damaged Added
sparks_open Added
welded Added

Resources/Textures/DeltaV/Structures/Wallmounts/signs.rsi

State Old New Status
direction_court Added
direction_justice Added

Resources/Textures/Objects/Misc/bureaucracy.rsi

State Old New Status
paper_stamp-notary Added

Resources/Textures/Structures/Storage/closet.rsi

State Old New Status
cj Added
cj_door Added
cj_open Added
clerk Added
clerk_door Added
clerk_open Added

@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • pebble.yml

Maps are being rendered. This comment will be updated if rendering them is done.
06/07/24 13:31

@NullWanderer NullWanderer marked this pull request as ready for review June 7, 2024 13:32
NullWanderer
NullWanderer previously approved these changes Jun 7, 2024
View reviewed changes
@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • pebble.yml

Maps are being rendered. This comment will be updated if rendering them is done.
06/07/24 13:47

@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • pebble.yml

Maps are being rendered. This comment will be updated if rendering them is done.
06/07/24 17:28

IamVelcroboy
IamVelcroboy previously approved these changes Jun 7, 2024
View reviewed changes
@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • pebble.yml

Maps are being rendered. This comment will be updated if rendering them is done.
06/07/24 18:17

@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • pebble.yml

Maps are being rendered. This comment will be updated if rendering them is done.
06/07/24 21:05

@IamVelcroboy IamVelcroboy merged commit cdec0aa into DeltaV-Station:master Jun 7, 2024
11 checks passed
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@sleepyyapril @fenndragon
Uplink: Remove Deception Category (DeltaV-Station#1309)
ec650c4 
<!--
This is a semi-strict format, you can add/remove sections as needed but
the order/format should be kept the same
Remove these comments before submitting
-->

# Description

<!--
Explain this PR in as much detail as applicable

Some example prompts to consider:
How might this affect the game? The codebase?
What might be some alternatives to this?
How/Who does this benefit/hurt [the game/codebase]?
-->

[Ports this downstream
PR.](Fansana/floofstation1#315)

---

# Changelog

<!--
You can add an author after the `:cl:` to change the name that appears
in the changelog (ex: `:cl: Death`)
Leaving it blank will default to your GitHub display name
This includes all available types for the changelog
-->

:cl: fenndragon
- tweak: Moved the uplink deception category into utility.

---------

Co-authored-by: fenndragon <[email protected]>
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@SimpleStation14
Automatic Changelog Update (DeltaV-Station#1309)
5d64873
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@IamVelcroboy IamVelcroboy IamVelcroboy approved these changes

@NullWanderer NullWanderer NullWanderer left review comments

Assignees
No one assigned
Labels
Changes: C# Changes any cs files Changes: Localization Changes any ftl files Changes: Map Changes: Sprite Changes any png or json in an rsi Changes: YML Changes any yml files S: Needs Review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@therealDLondon @NullWanderer @IamVelcroboy