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

Justice asterisk #1315

Merged
merged 2 commits into from
Jun 7, 2024
Merged

Justice asterisk #1315

merged 2 commits into from
Jun 7, 2024

Conversation

Colin-Tel
Copy link
Contributor

About the PR

🧑‍⚖️

Why / Balance

We love laws! We love laws!

Media

image

Changelog

Justice PR probably has this covered.

@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 7, 2024
@github-actions GitHub Actions
Copy link
Contributor

github-actions bot commented Jun 7, 2024

RSI Diff Bot; head commit 64db878 merging into 46c4a13
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

@deltanedas
Copy link
Member

pro multiple prs add justice department prototypes they could get trolled

@NullWanderer
Copy link
Contributor

pro multiple prs add justice department prototypes they could get trolled

When justice is merged, that won't matter anymore. I'll clean up these branches manually before merging them. I told people to do this so the maps could be prepared, and having them reset history back to normal would've made it more confusing

@Colin-Tel Colin-Tel marked this pull request as ready for review June 7, 2024 13:35
@Colin-Tel Colin-Tel requested a review from IamVelcroboy as a code owner June 7, 2024 13:35
@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • asterisk.yml

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

NullWanderer
NullWanderer previously approved these changes Jun 7, 2024
View reviewed changes
@Colin-Tel
Update asterisk.yml
5705b8c 
Added trial timer and gavel block, moved the judge equipment over to a closet
@deltav-mapserver
Copy link

This PR contains new or changed maps:

  • asterisk.yml

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

@IamVelcroboy IamVelcroboy merged commit 3a891bf into DeltaV-Station:master Jun 7, 2024
11 checks passed
@Colin-Tel Colin-Tel deleted the JusticeAsterisk branch July 9, 2024 05:24
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@VMSolidus
Port N14 Mapper Assets (DeltaV-Station#1315)
3e93876 
# Description

By request from Old Dance Jacket, who wanted to be able to use N14
Mapping Assets in SS14. We should probably trim this list down for what
assets aren't actually needed (Any asset that is 100% unique to Fallout
for instance)


# Changelog

:cl:
- add: Added a large number of mapping assets from Nuclear14
LaryNevesPR pushed a commit to LaryNevesPR/Estacao-Andromeda that referenced this pull request Jan 3, 2025
@SimpleStation14
Automatic Changelog Update (DeltaV-Station#1315)
b4e9e44
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.
4 participants
@Colin-Tel @deltanedas @NullWanderer @IamVelcroboy