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

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

Merged
merged 24 commits into from
Jan 17, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
22ae30b
Port over basics from Magistrate from MRP branch.
CerberusWolfie Jan 14, 2025
737a4c9
Add stamp, paper stamp icon, and prototypes for it.
CerberusWolfie Jan 14, 2025
b7e6a0c
Fix the jumpsuit and add the spawner (forgot, lol).
CerberusWolfie Jan 14, 2025
06d5c15
Adds spawner to every map, adds centcomm wintercoat for ntr and magis…
CerberusWolfie Jan 14, 2025
2f75f50
Add the Access to ALL ACCESS and add comments for the GS Jobs.
CerberusWolfie Jan 15, 2025
ab0f41c
Update accesses, make a custom headset, and change default shoes.
CerberusWolfie Jan 15, 2025
63d49bd
Update headset for default to be command and update magistrate to fix…
CerberusWolfie Jan 15, 2025
6eaa9a8
Add loadouts for CJ stuff to Magistrate and setup Magistrate.
CerberusWolfie Jan 15, 2025
40173b7
Fix FTLs for the categories for NTR, BSO, and MAG.
CerberusWolfie Jan 15, 2025
42925b2
Re-Add Magistrate access back (forgot to uncomment it).
CerberusWolfie Jan 15, 2025
d42119d
Fix Chief Justice Access FTL for ID Card Computer.
CerberusWolfie Jan 15, 2025
29a8a26
Add locker and teleporter images.
CerberusWolfie Jan 15, 2025
beb15c5
Add lockers, doors, and finish off Magistrate!
CerberusWolfie Jan 15, 2025
56c4a77
Merge upstream into branch.
CerberusWolfie Jan 15, 2025
9469625
Fix illegal RSI.
CerberusWolfie Jan 15, 2025
881f974
Merge to overwrite merge conflicts in maps.
CerberusWolfie Jan 15, 2025
3b2c850
Fix merge conflicts in branch.
CerberusWolfie Jan 15, 2025
e8a9e88
Merge branch 'master' into AddMagistrate-NOW
sleepyyapril Jan 16, 2025
f3d2826
Fix Suggestions.
CerberusWolfie Jan 17, 2025
1ee4201
Merge branch 'AddMagistrate-NOW' of https://github.com/CerberusWolfie…
CerberusWolfie Jan 17, 2025
f554158
Merge branch 'master' into AddMagistrate-NOW
CerberusWolfie Jan 17, 2025
dd6542e
Merge branch 'master' into AddMagistrate-NOW
CerberusWolfie Jan 17, 2025
4e860de
Merge branch 'master' into AddMagistrate-NOW
CerberusWolfie Jan 17, 2025
a92dd4d
Merge branch 'master' into AddMagistrate-NOW
CerberusWolfie Jan 17, 2025
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -1,2 +1,3 @@
id-card-access-level-ntr = Nanotrasen Representative
id-card-access-level-bso = Blueshield Officer
id-card-access-level-mag = Magistrate
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
id-card-access-level-orders = Orders
id-card-access-level-mantis = Mantis
id-card-access-level-chief-justice = Chief Justice
id-card-access-level-cj = Chief Justice
id-card-access-level-prosecutor = Prosecutor
id-card-access-level-justice = Justice
id-card-access-level-corpsman = Corpsman
1 change: 1 addition & 0 deletions Resources/Locale/en-US/job/department-desc.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ department-Security-description = Keep the peace around the station.
department-Science-description = Research artifacts and anomalies to invent new equipment for the station
department-Silicon-description = Obey your laws and serve the crew.
department-Specific-description = Jobs that not all stations have.
department-Dignitary-description = Assist Heads of Staff and Captain, follow your directives.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/job/department.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,4 @@ department-Security = Security
department-Science = Science
department-Silicon = Silicons
department-Specific = Station specific
department-Dignitary = Dignitary
1 change: 1 addition & 0 deletions Resources/Locale/en-US/loadouts/categories.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ loadout-category-JobsCommandHeadOfPersonnel = Head of Personnel
loadout-category-JobsCommandAdminAssistant = Administrative Assistant
loadout-category-JobsCommandBlueshieldOfficer = Blueshield Officer
loadout-category-JobsCommandNanorep = Nanotrasen Representative
loadout-category-JobsCommandMagistrate = Magistrate

# Engineering
loadout-category-JobsEngineering = Engineering
Expand Down
15 changes: 15 additions & 0 deletions Resources/Locale/en-US/loadouts/itemgroups.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,21 @@ character-item-group-LoadoutHeadOfPersonnelOuter = Head of Personnel Outerwear
character-item-group-LoadoutHeadOfPersonnelShoes = Head of Personnel Shoes
character-item-group-LoadoutHeadOfPersonnelUniforms = Head of Personnel Uniforms

# Dignitary - BlueshieldOfficer
character-item-group-LoadoutBlueshieldOfficerBackpacks = Blueshield Officer Backpacks
character-item-group-LoadoutBlueshieldOfficerVests = Blueshield Officer Vests
character-item-group-LoadoutBlueshieldOfficerUniforms = Blueshield Officer Uniforms

# Dignitary - Magistrate
character-item-group-LoadoutMagistrateHead = Magistrate Headgear
character-item-group-LoadoutMagistrateNeck = Magistrate Neckwear
character-item-group-LoadoutMagistrateOuter = Magistrate Outerwear
character-item-group-LoadoutMagistrateUniforms = Magistrate Uniforms

# Dignitary - Nanotrasen Representative
character-item-group-LoadoutNanorepBackpacks = Nanotrasen Representative Backpacks
character-tiem-group-LoadoutNanorepUniforms = Nanotrasen Representative Uniforms

# Engineering
character-item-group-LoadoutEngineeringBackpacks = Engineering Backpacks
character-item-group-LoadoutEngineeringBelt = Engineering Belt
Expand Down
1 change: 1 addition & 0 deletions Resources/Locale/en-US/paper/stamp-component.ftl
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,4 @@ stamp-component-stamped-name-trader = Trader
stamp-component-stamped-name-syndicate = Syndicate
stamp-component-stamped-name-ce = Chief Engineer
stamp-component-stamped-name-nanorep = Nanotrasen Representative
stamp-component-stamped-name-magistrate = Magistrate
7 changes: 7 additions & 0 deletions Resources/Maps/arena.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151146,6 +151146,13 @@ entities:
- type: Transform
pos: -31.5,17.5
parent: 6747
- proto: SpawnPointMagistrate
entities:
- uid: 27823
components:
- type: Transform
pos: -23.5,-51.5
parent: 6747
- proto: SpawnPointMailCarrier
entities:
- uid: 27031
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/asterisk.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57641,6 +57641,13 @@ entities:
- type: Transform
pos: -12.5,14.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 11187
components:
- type: Transform
pos: 46.5,-9.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 9983
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/core.yml
Original file line number Diff line number Diff line change
Expand Up @@ -121830,6 +121830,13 @@ entities:
- type: Transform
pos: -18.5,-9.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 22545
components:
- type: Transform
pos: 45.5,-36.5
parent: 2
- proto: SpawnPointMedicalDoctor
entities:
- uid: 6720
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/edge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -91074,6 +91074,13 @@ entities:
- type: Transform
pos: -20.5,20.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 17481
components:
- type: Transform
pos: -8.5,35.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 13998
Expand Down
9 changes: 8 additions & 1 deletion Resources/Maps/europa.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65764,7 +65764,7 @@ entities:
pos: -11.5,11.5
parent: 1
- type: Door
secondsUntilStateChange: -26472.29
secondsUntilStateChange: -26515.367
state: Opening
- type: Occluder
enabled: True
Expand Down Expand Up @@ -78679,6 +78679,13 @@ entities:
- type: Transform
pos: -28.5,-0.5
parent: 1
- proto: SpawnPointMagistrate
entities:
- uid: 16620
components:
- type: Transform
pos: -8.5,6.5
parent: 1
- proto: SpawnPointMailCarrier
entities:
- uid: 1223
Expand Down
9 changes: 8 additions & 1 deletion Resources/Maps/gaxstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113824,6 +113824,13 @@ entities:
- type: Transform
pos: 17.5,58.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 20871
components:
- type: Transform
pos: 71.5,26.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 20865
Expand Down Expand Up @@ -134443,7 +134450,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -120432.64
secondsUntilStateChange: -120542.65
state: Opening
- uid: 18112
components:
Expand Down
19 changes: 19 additions & 0 deletions Resources/Maps/glacier.yml
Original file line number Diff line number Diff line change
Expand Up @@ -45936,6 +45936,18 @@ entities:
- type: Transform
pos: 36.74322,44.429073
parent: 2
- proto: ClothingOuterWinterCentcom
entities:
- uid: 17499
components:
- type: Transform
pos: 32.888283,41.295105
parent: 2
- uid: 17500
components:
- type: Transform
pos: 36.825783,45.31073
parent: 2
- proto: ClothingOuterWinterChem
entities:
- uid: 6216
Expand Down Expand Up @@ -96430,6 +96442,13 @@ entities:
- type: Transform
pos: -57.5,2.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 17498
components:
- type: Transform
pos: 32.5,41.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 13932
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/hammurabi.yml
Original file line number Diff line number Diff line change
Expand Up @@ -236485,6 +236485,13 @@ entities:
- type: Transform
pos: -64.5,3.5
parent: 1
- proto: SpawnPointMagistrate
entities:
- uid: 42454
components:
- type: Transform
pos: -97.5,1.5
parent: 1
- proto: SpawnPointMailCarrier
entities:
- uid: 17152
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/hive.yml
Original file line number Diff line number Diff line change
Expand Up @@ -149517,6 +149517,13 @@ entities:
- type: Transform
pos: -53.5,-24.5
parent: 1
- proto: SpawnPointMagistrate
entities:
- uid: 27791
components:
- type: Transform
pos: 105.5,6.5
parent: 1
- proto: SpawnPointMailCarrier
entities:
- uid: 7387
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/lighthouse.yml
Original file line number Diff line number Diff line change
Expand Up @@ -110260,6 +110260,13 @@ entities:
- type: Transform
pos: 18.5,-9.5
parent: 100
- proto: SpawnPointMagistrate
entities:
- uid: 20900
components:
- type: Transform
pos: -8.5,58.5
parent: 100
- proto: SpawnPointMailCarrier
entities:
- uid: 16733
Expand Down
11 changes: 9 additions & 2 deletions Resources/Maps/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10339,7 +10339,7 @@ entities:
pos: -53.5,-12.5
parent: 2
- type: Door
secondsUntilStateChange: -12845.943
secondsUntilStateChange: -12876.496
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -75704,7 +75704,7 @@ entities:
pos: -3.5,-52.5
parent: 2
- type: Door
secondsUntilStateChange: -40871.477
secondsUntilStateChange: -40902.03
state: Closing
- uid: 11944
components:
Expand Down Expand Up @@ -142409,6 +142409,13 @@ entities:
- type: Transform
pos: -25.5,-16.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 27707
components:
- type: Transform
pos: -2.5,-3.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 21681
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/pebble.yml
Original file line number Diff line number Diff line change
Expand Up @@ -59195,6 +59195,13 @@ entities:
- type: Transform
pos: -29.5,-4.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 10228
components:
- type: Transform
pos: -0.5,-24.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 8928
Expand Down
11 changes: 9 additions & 2 deletions Resources/Maps/radstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15129,7 +15129,7 @@ entities:
pos: 34.5,-35.5
parent: 2
- type: Door
secondsUntilStateChange: -55516.35
secondsUntilStateChange: -55586.55
state: Opening
- uid: 383
components:
Expand Down Expand Up @@ -131127,6 +131127,13 @@ entities:
- type: Transform
pos: 43.5,-0.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 22317
components:
- type: Transform
pos: 5.5,53.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 18892
Expand Down Expand Up @@ -157775,7 +157782,7 @@ entities:
links:
- 19976
- type: Door
secondsUntilStateChange: -191808.66
secondsUntilStateChange: -191878.86
state: Opening
- uid: 23356
components:
Expand Down
9 changes: 8 additions & 1 deletion Resources/Maps/saltern.yml
Original file line number Diff line number Diff line change
Expand Up @@ -4332,7 +4332,7 @@ entities:
pos: 3.5,22.5
parent: 31
- type: Door
secondsUntilStateChange: -32552.574
secondsUntilStateChange: -32634.607
state: Opening
- type: DeviceLinkSource
lastSignals:
Expand Down Expand Up @@ -66886,6 +66886,13 @@ entities:
- type: Transform
pos: 12.5,-29.5
parent: 31
- proto: SpawnPointMagistrate
entities:
- uid: 11411
components:
- type: Transform
pos: -1.5,23.5
parent: 31
- proto: SpawnPointMailCarrier
entities:
- uid: 11397
Expand Down
9 changes: 8 additions & 1 deletion Resources/Maps/shoukou.yml
Original file line number Diff line number Diff line change
Expand Up @@ -36708,7 +36708,7 @@ entities:
pos: -36.5,-22.5
parent: 34
- type: Door
secondsUntilStateChange: -67318.92
secondsUntilStateChange: -67401.266
state: Closing
- uid: 1274
components:
Expand Down Expand Up @@ -72765,6 +72765,13 @@ entities:
- type: Transform
pos: -7.5,-17.5
parent: 34
- proto: SpawnPointMagistrate
entities:
- uid: 13762
components:
- type: Transform
pos: 52.5,-36.5
parent: 34
- proto: SpawnPointMailCarrier
entities:
- uid: 857
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/submarine.yml
Original file line number Diff line number Diff line change
Expand Up @@ -209675,6 +209675,13 @@ entities:
- type: Transform
pos: 9.5,-27.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 39307
components:
- type: Transform
pos: 14.5,49.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 983
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/tortuga.yml
Original file line number Diff line number Diff line change
Expand Up @@ -167883,6 +167883,13 @@ entities:
- type: Transform
pos: 44.5,14.5
parent: 33
- proto: SpawnPointMagistrate
entities:
- uid: 27376
components:
- type: Transform
pos: -68.5,22.5
parent: 33
- proto: SpawnPointMailCarrier
entities:
- uid: 3585
Expand Down
5 changes: 3 additions & 2 deletions Resources/Prototypes/Access/misc.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,5 +48,6 @@
- ChiefJustice # DeltaV - Add Chief Justice access
- Prosecutor # DeltaV - Add Prosecutor access
- Corpsman # DeltaV - Add Corpsman access
- BlueshieldOfficer
- NanotrasenRepresentative
- BlueshieldOfficer # Goobstation - Add BSO Access
- NanotrasenRepresentative # Goobstation - Add NTR Access
- Magistrate # Goobstation - Add Magistrate Access
Loading
Loading