Add Magistrate, Dignitary Department, and Minor FTL Fixes #1536

CerberusWolfie · 2025-01-14T03:56:21Z

Description

This adds the Magistrate to the role list of Central Command VIPs. This also splits up the Central Command VIPs into their own department named "Dignitary" for the purpose of making it clear that Central Command VIPs are above Command and should be responding to orders from Central Command.

TODO

Lots of stuff to do here, mostly just transferring Chief Justice's loadout to also work for Magistrate (most of it). I'll also list the basics I've done as well.

Magistrate-Specific

Add Magistrate-only Access (for locker).
Add Magistrate Job, Job Icon, and PlayTimeTracker
Add Magistrate clothes (ported from PS13)
Add Magistrate job spawner.
Add Magistrate Locker Teleporter and Locker.
Add Magistrate Contents to Locker.
Add Magistrate loadout (Chief Justice included).
Add Magistrate stamp and stamped icon.

Dignitary Department

Add Dignitary Department.
Put Magistrate, Blueshield Officer, and Nanotrasen Representative in Dignitary.
Add FTL for Dignitary.
Put Dignitary above Command.

Map Stuff

Add Magistrate job spawners to maps.
Add a Centcom Wintercoat to NTR and Magistrate on the Glacier map.\

Extras/Fixes

Add winter coats for Magistrate and NanoRep on Glacier.
Fix the category grouping FTL for NTR and BSO.

Media

Lobby/Customization Screenshots

Jobs Listing

Category Grouping

Items/Clothes/Entities

Stamps (Stamp shows the same in the spawn menu)

Magistrate Robes

Spawner & Magistrate Robes

Access List

PDA Crew Manifest

Lockers with Teleporter

Locker with Contents (from Teleported Locker)

Map Spawners

Arena

Asterisk

Core

Edge

Europa

Gaxstation

Glacier (Winter Coats for NTR and Magistrate as well.)

Hammurabi

Hive

Lighthouse

Meta

Pebble

Radstation

Saltern

Shoukou

Submarine

Tortuga

Misc. Minor Fixes

Chief Justice Access

Category Groupings (BSO AND NTR)

Changelog

🆑

add: Added Magistrate role.
add: Added Dignitary Department.
add: Added winter coats for NTR and Magistrate on Glacier Spawn.
tweak: Moved Blueshield Officer and Nanotrasen Representative to Dignitary Department.
fix: Fixed the category groups identifier for BSO and NTR in Loadouts.
fix: Fixed Chief Justice tag in ID Card Computer.

github-actions · 2025-01-14T03:56:59Z

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

Resources/Textures/Objects/Misc/bureaucracy.rsi

State	Old	New	Status
paper_stamp-magistrate			Added

Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi

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

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

State	Old	New	Status
magistrate			Added

Resources/Textures/_Goobstation/Objects/Devices/unique_teleporters.rsi

State	Old	New	Status
mag			Added

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

State	Old	New	Status
stamp-magistrate			Added

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

State	Old	New	Status
mag			Added
mag_door			Added

Edit: diff updated after e8a9e88

…trate in glacier, and adds the information to the prototypes as well.

CerberusWolfie · 2025-01-14T06:22:28Z

Not going to update branch until the last minute to prevent potential merge conflicts with changelogs that get updated into the branch. I intend to finish this tomorrow (today if you're in ET or further).

… accesses.

CerberusWolfie · 2025-01-15T06:16:35Z

Me when I leave gimp file in .rsi without realizing.

Mike32oz · 2025-01-15T06:27:06Z

Right now I'm working on meta I'm adding the holopads. This may override if I push the RP

CerberusWolfie · 2025-01-15T06:44:41Z

Right now I'm working on meta I'm adding the holopads. This may override if I push the RP

Uh, depends. I don't think it would override the spawners? I'd hope not. 👍

If it does, I mean, not a hard thing to fix. All I did was add spawners.

CerberusWolfie · 2025-01-15T06:45:02Z

On a side note, not sure why 4 tests failed, but I'm going to blame it on the tests and not my additions. :3

sleepyyapril · 2025-01-15T07:06:02Z

On a side note, not sure why 4 tests failed, but I'm going to blame it on the tests and not my additions. :3

Correct!

sleepyyapril · 2025-01-15T08:46:37Z

Gonna say this one needs a @VMSolidus approval

github-actions · 2025-01-15T15:48:24Z

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

# Description  Adds Cargo & Lawyer access to NanoTrasen Representative Adds Cargo access for Blueshield Officer NTR is given lawyer to allow them to access the brig. NTR has brig access but is unable to enter brig on most maps due to brig access not being used, so gave them lawyer access. NTR is also given cargo access so they can write reports about logistics. BSO should have basic access to all departments, logistics was missing so added cargo. Should hopefully not interfere with PR #1536 as it only changes BSO & NTR --- # Changelog  :cl: - tweak: Tweaked the access of NTR to include Lawyer & Cargo - tweak: Tweaked the access of BSO to include Cargo --------- Co-authored-by: sleepyyapril <[email protected]>

CerberusWolfie · 2025-01-15T19:23:34Z

I'll fix the meta map when I get back. I'm in lab for another 3.5 hours, haha.

CerberusWolfie · 2025-01-15T21:14:12Z

Merge conflicts solved, but the bot doesn't like me, so it decided not to remove them. :3

Port over basics from Magistrate from MRP branch.

22ae30b

github-actions bot added Changes: Localization Changes any ftl files Changes: YML Changes any yml files Changes: Sprite Changes any png or json in an RSI labels Jan 14, 2025

CerberusWolfie added 3 commits January 13, 2025 23:47

Add stamp, paper stamp icon, and prototypes for it.

737a4c9

Fix the jumpsuit and add the spawner (forgot, lol).

b7e6a0c

Adds spawner to every map, adds centcomm wintercoat for ntr and magis…

06d5c15

…trate in glacier, and adds the information to the prototypes as well.

github-actions bot added the Changes: Map Changes any yml file in the Maps directories label Jan 14, 2025

astriloqua mentioned this pull request Jan 14, 2025

Extend Access for NTR & BSO #1544

Merged

CerberusWolfie added 6 commits January 14, 2025 21:58

Add the Access to ALL ACCESS and add comments for the GS Jobs.

2f75f50

Update accesses, make a custom headset, and change default shoes.

ab0f41c

Update headset for default to be command and update magistrate to fix…

63d49bd

… accesses.

Add loadouts for CJ stuff to Magistrate and setup Magistrate.

6eaa9a8

Fix FTLs for the categories for NTR, BSO, and MAG.

40173b7

Re-Add Magistrate access back (forgot to uncomment it).

42925b2

CerberusWolfie changed the title ~~Add Magistrate and Make Dignitary Department~~ Add Magistrate, Dignitary Department, and Minor FTL Fixes Jan 15, 2025

CerberusWolfie added 4 commits January 15, 2025 00:06

Fix Chief Justice Access FTL for ID Card Computer.

d42119d

Add locker and teleporter images.

29a8a26

Add lockers, doors, and finish off Magistrate!

beb15c5

Merge upstream into branch.

56c4a77

CerberusWolfie marked this pull request as ready for review January 15, 2025 06:13

Fix illegal RSI.

9469625

sleepyyapril approved these changes Jan 15, 2025

View reviewed changes

github-actions bot added the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 15, 2025

VMSolidus approved these changes Jan 15, 2025

View reviewed changes

CerberusWolfie added 2 commits January 15, 2025 15:56

Merge to overwrite merge conflicts in maps.

881f974

Fix merge conflicts in branch.

3b2c850

github-actions bot removed the Status: Merge Conflict FIX YOUR PR AAAGH label Jan 15, 2025

Merge branch 'master' into AddMagistrate-NOW

e8a9e88

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add Magistrate, Dignitary Department, and Minor FTL Fixes #1536

Add Magistrate, Dignitary Department, and Minor FTL Fixes #1536

CerberusWolfie commented Jan 14, 2025 •

edited

Loading

github-actions bot commented Jan 14, 2025 •

edited

Loading

CerberusWolfie commented Jan 14, 2025

CerberusWolfie commented Jan 15, 2025

Mike32oz commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

Add Magistrate, Dignitary Department, and Minor FTL Fixes #1536

Are you sure you want to change the base?

Add Magistrate, Dignitary Department, and Minor FTL Fixes #1536

Conversation

CerberusWolfie commented Jan 14, 2025 • edited Loading

Description

TODO

Magistrate-Specific

Dignitary Department

Map Stuff

Extras/Fixes

Media

Lobby/Customization Screenshots

Items/Clothes/Entities

Map Spawners

Misc. Minor Fixes

Changelog

github-actions bot commented Jan 14, 2025 • edited Loading

CerberusWolfie commented Jan 14, 2025

CerberusWolfie commented Jan 15, 2025

Mike32oz commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

sleepyyapril commented Jan 15, 2025

github-actions bot commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

CerberusWolfie commented Jan 15, 2025

CerberusWolfie commented Jan 14, 2025 •

edited

Loading

github-actions bot commented Jan 14, 2025 •

edited

Loading