Skip to content

Commit

Permalink
Port over basics from Magistrate from MRP branch.
Browse files Browse the repository at this point in the history
  • Loading branch information
CerberusWolfie committed Jan 14, 2025
1 parent 8b74710 commit 22ae30b
Show file tree
Hide file tree
Showing 15 changed files with 107 additions and 1 deletion.
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
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
11 changes: 10 additions & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,10 +58,19 @@
- ERTEngineer
- DeathSquad
- AdministrativeAssistant # Delta V - Administrative Assistant, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Command/admin_assistant.yml
primary: false
weight: 100

- type: department
id: Dignitary
description: department-Dignitary-description
color: "#33FE6D"
roles:
- BlueshieldOfficer # Goobstation
- NanotrasenRepresentative # Goobstation
- Magistrate # Goobstation
primary: false
weight: 100
weight: 101

- type: department
id: Engineering
Expand Down
4 changes: 4 additions & 0 deletions Resources/Prototypes/_Goobstation/Access/centcomm.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,7 @@
- type: accessLevel
id: BlueshieldOfficer
name: id-card-access-level-bso

- type: accessLevel
id: Magistrate
name: id-card-access-level-mag
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)
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

- type: playTimeTracker
id: JobNanotrasenRepresentative

- type: playTimeTracker
id: JobMagistrate
7 changes: 7 additions & 0 deletions Resources/Prototypes/_Goobstation/StatusEffects/job.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,3 +11,10 @@
icon:
sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
state: blueshield

- type: jobIcon
parent: JobIcon
id: JobIconMagistrate
icon:
sprite: /Textures/_Goobstation/Interface/Misc/job_icons.rsi
state: magistrate
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
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
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
},
{
"name": "blueshield"
},
{
"name": "magistrate"
}
]
}

0 comments on commit 22ae30b

Please sign in to comment.