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 1 commit
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
Prev Previous commit
Next Next commit
Merge to overwrite merge conflicts in maps.
  • Loading branch information
CerberusWolfie committed Jan 15, 2025
commit 881f974c0313b3627a327191b34ae674ea40e4ee
101 changes: 1 addition & 100 deletions Resources/Maps/gaxstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -113824,105 +113824,6 @@ entities:
- type: Transform
pos: 17.5,58.5
parent: 2
- proto: SpawnPointLocationMidRoundAntag
entities:
- uid: 20307
components:
- type: Transform
pos: 15.5,1.5
parent: 2
- uid: 20308
components:
- type: Transform
pos: 27.5,6.5
parent: 2
- uid: 20309
components:
- type: Transform
pos: 29.5,13.5
parent: 2
- uid: 20310
components:
- type: Transform
pos: 18.5,14.5
parent: 2
- uid: 20311
components:
- type: Transform
pos: 59.5,25.5
parent: 2
- uid: 20313
components:
- type: Transform
pos: 80.5,51.5
parent: 2
- uid: 20314
components:
- type: Transform
pos: 74.5,57.5
parent: 2
- uid: 20315
components:
- type: Transform
pos: 74.5,61.5
parent: 2
- uid: 20316
components:
- type: Transform
pos: 68.5,59.5
parent: 2
- uid: 20317
components:
- type: Transform
pos: 61.5,54.5
parent: 2
- uid: 20318
components:
- type: Transform
pos: 47.5,60.5
parent: 2
- uid: 20320
components:
- type: Transform
pos: 44.5,65.5
parent: 2
- uid: 20321
components:
- type: Transform
pos: 45.5,63.5
parent: 2
- uid: 20322
components:
- type: Transform
pos: 38.5,66.5
parent: 2
- uid: 20324
components:
- type: Transform
pos: 40.5,64.5
parent: 2
- uid: 20325
components:
- type: Transform
pos: 27.5,64.5
parent: 2
- uid: 20326
components:
- type: Transform
pos: 7.5,79.5
parent: 2
- uid: 20327
components:
- type: Transform
pos: 10.5,77.5
parent: 2
- proto: SpawnPointMagistrate
entities:
- uid: 20424
components:
- type: Transform
pos: 86.5,35.5
parent: 2
- proto: SpawnPointMailCarrier
entities:
- uid: 20865
Expand Down Expand Up @@ -134542,7 +134443,7 @@ entities:
lastSignals:
DoorStatus: True
- type: Door
secondsUntilStateChange: -87406.4
secondsUntilStateChange: -120432.64
state: Opening
- uid: 18112
components:
Expand Down
2 changes: 1 addition & 1 deletion Resources/Maps/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -75704,7 +75704,7 @@ entities:
pos: -3.5,-52.5
parent: 2
- type: Door
secondsUntilStateChange: -22025.918
secondsUntilStateChange: -40871.477
state: Closing
- uid: 11944
components:
Expand Down
3 changes: 1 addition & 2 deletions Resources/Prototypes/Maps/gaxstation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,7 @@
#service
Captain: [ 1, 1 ]
NanotrasenRepresentative: [ 1, 1 ]
Magistrate: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ]
BlueshieldOfficer: [ 1, 1 ]
HeadOfPersonnel: [ 1, 1 ]
AdministrativeAssistant: [ 1, 1 ]
Bartender: [ 1, 1 ]
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.