-
Notifications
You must be signed in to change notification settings - Fork 190
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Port over basics from Magistrate from MRP branch.
- Loading branch information
1 parent
8b74710
commit 22ae30b
Showing
15 changed files
with
107 additions
and
1 deletion.
There are no files selected for viewing
1 change: 1 addition & 0 deletions
1
Resources/Locale/en-US/_Goobstation/prototypes/access/accesses.ftl
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
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 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
51 changes: 51 additions & 0 deletions
51
Resources/Prototypes/_Goobstation/Roles/Jobs/Command/magistrate.yml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,51 @@ | ||
- type: job | ||
id: Magistrate | ||
name: Magistrate | ||
description: "Ensure Space Law is being followed, Uphold Justice and Legality, Hold Hearings and Trials, Follow SOP, Ensure Command is Following Space Law." | ||
playTimeTracker: JobMagistrate | ||
requirements: | ||
- !type:DepartmentTimeRequirement | ||
department: Command | ||
min: 54000 # 15 hours | ||
- !type:DepartmentTimeRequirement | ||
department: Security | ||
min: 54000 # 15 hours | ||
weight: 20 | ||
startingGear: MagistrateGear | ||
icon: "JobIconMagistrate" | ||
requireAdminNotify: true | ||
joinNotifyCrew: true | ||
supervisors: job-supervisors-centcom | ||
canBeAntag: false | ||
accessGroups: | ||
- CentralCommand | ||
- Command | ||
- Brig | ||
- Security | ||
- Armory | ||
- Maintenance | ||
- Service | ||
- External | ||
- Detective | ||
- Corpsman | ||
- Cryogenics | ||
- Engineering | ||
- Medical | ||
- Research | ||
- Magistrate | ||
special: | ||
- !type:AddImplantSpecial | ||
implants: [ MindShieldImplant ] | ||
- !type:AddComponentSpecial | ||
components: | ||
- type: CommandStaff | ||
|
||
- type: startingGear | ||
id: MagistrateGear | ||
equipment: | ||
jumpsuit: ClothingUniformJumpsuitMagistrate | ||
shoes: ClothingShoesColorBlack | ||
gloves: ClothingHandsGlovesColorWhite | ||
id: CentcomPDA | ||
ears: ClothingHeadsetCentCom | ||
# pocket1: UniqueMagistrateLockerTeleporter # TODO: ADD BACK (REMOVED FOR TESTING) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -3,3 +3,6 @@ | |
|
||
- type: playTimeTracker | ||
id: JobNanotrasenRepresentative | ||
|
||
- type: playTimeTracker | ||
id: JobMagistrate |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Binary file added
BIN
+5.11 KB
...oobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/equipped-INNERCLOTHING.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.46 KB
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.32 KB
...Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-left.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added
BIN
+4.33 KB
...extures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/inhand-right.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
26 changes: 26 additions & 0 deletions
26
Resources/Textures/_Goobstation/Clothing/Uniforms/Jumpsuit/magistrate.rsi/meta.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,26 @@ | ||
{ | ||
"version": 1, | ||
"license": "CC-BY-SA-3.0", | ||
"copyright": "Taken from paradise @ https://github.com/ParadiseSS13/Paradise/commit/14a7b74c2aad4002bf575687ed01321c8d66e5ff", | ||
"size": { | ||
"x": 32, | ||
"y": 32 | ||
}, | ||
"states": [ | ||
{ | ||
"name": "icon" | ||
}, | ||
{ | ||
"name": "equipped-INNERCLOTHING", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-left", | ||
"directions": 4 | ||
}, | ||
{ | ||
"name": "inhand-right", | ||
"directions": 4 | ||
} | ||
] | ||
} |
Binary file added
BIN
+185 Bytes
Resources/Textures/_Goobstation/Interface/Misc/job_icons.rsi/magistrate.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -12,6 +12,9 @@ | |
}, | ||
{ | ||
"name": "blueshield" | ||
}, | ||
{ | ||
"name": "magistrate" | ||
} | ||
] | ||
} |