Merge pull request #109 from Merrokitsune/Give-blueshield-security-ac…

…cess-while-fixing-blueshield-uniform-names- Give blueshield brig access while fixing blueshield uniform names, as well as adding blueshield as a ghost role.
RonRonstation · Oct 17, 2024 · 782a218 · 782a218
2 parents b83b531 + 03ea840
commit 782a218
Show file tree

Hide file tree

Showing 11 changed files with 104 additions and 2 deletions.
diff --git a/Resources/Locale/en-US/ronstation/ghost/roles/ghost-role-component.ftl b/Resources/Locale/en-US/ronstation/ghost/roles/ghost-role-component.ftl
@@ -3,3 +3,6 @@ ghost-role-information-Heccdiver-description = One of Terragov's top elite agent
 ghost-role-information-Heccdiver-rules = You are required to obey orders given by your superior, you are effectively their [color=#6495ed][bold]Familiar[/bold][/color].
 
 ghost-role-information-closet-skeleton-nonantagonist-description = You are arguably one of the oldest members of the station! Get your own job, or live far away from the crew and become an isolated loner. Remember, you're still a member of this station.
+
+ghost-role-information-centcom-blueshield-officer-name = Blueshield Officer
+ghost-role-information-centcom-blueshield-officer-description = Become bodyguard for visiting officers or other VIP. Blueshield officers employed by Central Command enjoy higher access than on the station.
diff --git a/Resources/Locale/en-US/ronstation/job/job-description.ftl b/Resources/Locale/en-US/ronstation/job/job-description.ftl
@@ -1 +1,2 @@
 job-description-blueshield-officer = Protect the heads-of-staff and other VIPs, ensure that they're kept alive, obey CentComm orders.
+job-description-centcom-blueshield-officer = Protect the heads-of-staff and other VIPs, ensure that they're kept alive, obey CentComm orders.
diff --git a/Resources/Locale/en-US/ronstation/job/job-names.ftl b/Resources/Locale/en-US/ronstation/job/job-names.ftl
@@ -1 +1,2 @@
 job-name-blueshield-officer = Blueshield Officer
+job-name-centcom-blueshield-officer = Centcom Blueshield Officer
diff --git a/Resources/Prototypes/Ronstation/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Ronstation/Entities/Clothing/Uniforms/jumpskirts.yml
@@ -1,7 +1,7 @@
 - type: entity
   parent: [ClothingUniformBase, BaseCommandContraband]
   id: ClothingUniformJumpskirtBlueshieldGrey
-  name: grey security jumpsuit
+  name: grey blueshield jumpsuit
   description: The main suit of the protector.
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Ronstation/Entities/Clothing/Uniforms/jumpsuits.yml b/Resources/Prototypes/Ronstation/Entities/Clothing/Uniforms/jumpsuits.yml
@@ -12,7 +12,7 @@
 - type: entity
   parent: [ClothingUniformBase, BaseCommandContraband]
   id: ClothingUniformJumpsuitBlueshieldGrey
-  name: grey security jumpsuit
+  name: grey blueshield jumpsuit
   description: The main suit of the protector.
   components:
   - type: Sprite

diff --git a/Resources/Prototypes/Ronstation/Entities/Mobs/Player/humanoid.yml b/Resources/Prototypes/Ronstation/Entities/Mobs/Player/humanoid.yml
@@ -34,3 +34,29 @@
         - NamesFirstMilitaryLeader
         - NamesLastMilitary
 
+## Central Command
+
+- type: entity
+  name: CentCom blueshield officer
+  suffix: CentCom
+  id: RandomHumanoidSpawnerCentcomBlueshieldOfficer
+  components:
+    - type: Sprite
+      sprite: Ronstation/Markers/jobs.rsi
+      state: blueshield_officer
+    - type: RandomHumanoidSpawner
+      settings: CentcomBlueshieldOfficer
+
+- type: randomHumanoidSettings
+  id: CentcomBlueshieldOfficer
+  parent: EventHumanoidMindShielded
+  components:
+    - type: GhostRole
+      name: ghost-role-information-centcom-blueshield-officer-name
+      description: ghost-role-information-centcom-blueshield-officer-description
+      rules: ghost-role-information-nonantagonist-rules
+      raffle:
+        settings: default
+    - type: Loadout
+      prototypes: [ CentcomBlueshieldOfficerGear ]
+      roleLoadout: [ RoleSurvivalStandard ]
diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Devices/pda.yml
@@ -44,3 +44,22 @@
   - type: Icon
     sprite: Ronstation/Objects/Devices/pda.rsi
     state: pda-blueshield
+
+- type: entity
+  parent: [ BasePDA, BaseCommandContraband ]
+  id: CentcomBlueshieldPDA
+  name: Blueshield PDA
+  suffix: Central Command
+  description: Might allow you to see who to protect through the crew manifest.
+  components:
+  - type: Sprite
+    sprite: Ronstation/Objects/Devices/pda.rsi
+  - type: Pda
+    id: CentcomBlueshieldIDCard
+    state: pda-blueshield
+  - type: PdaBorderColor
+    borderColor: "#0071B7"
+    accentHColor: "#E2E2E2"
+  - type: Icon
+    sprite: Ronstation/Objects/Devices/pda.rsi
+    state: pda-blueshield
diff --git a/Resources/Prototypes/Ronstation/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Ronstation/Entities/Objects/Misc/identification_cards.yml
@@ -27,3 +27,17 @@
     - state: idnanotrasen
   - type: PresetIdCard
     job: BlueshieldOfficer
+
+- type: entity
+  parent: [ IDCardStandard, BaseCommandContraband ]
+  id: CentcomBlueshieldIDCard
+  name: blueshield ID card
+  suffix: Central Command
+  components:
+  - type: Sprite
+    sprite: Ronstation/Objects/Misc/id_cards.rsi
+    layers:
+    - state: default
+    - state: idnanotrasen
+  - type: PresetIdCard
+    job: CentralCommandBlueshieldOfficer
diff --git a/Resources/Prototypes/Ronstation/Roles/Jobs/CentCom/centcomblueshield.yml b/Resources/Prototypes/Ronstation/Roles/Jobs/CentCom/centcomblueshield.yml
@@ -0,0 +1,34 @@
+- type: job
+  id: CentralCommandBlueshieldOfficer
+  name: job-name-centcom-blueshield-officer
+  description: job-description-centcom-blueshield-officer
+  playTimeTracker: JobCentralCommandBlueshieldOfficer
+  setPreference: false
+  startingGear: CentcomBlueshieldOfficerGear
+  icon: "JobIconNanotrasen"
+  supervisors: job-supervisors-centcom
+  canBeAntag: false
+  accessGroups:
+  - AllAccess
+  access:
+  - CentralCommand
+
+- type: startingGear
+  id: CentcomBlueshieldOfficerGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitBlueshieldGrey
+    shoes: ClothingShoesBootsCombatFilled
+    head: ClothingHeadHelmetBasic
+    eyes: ClothingEyesGlassesSunglasses
+    gloves: ClothingHandsGlovesCombat
+    outerClothing: ClothingOuterArmorBasic
+    back: ClothingBackpack
+    id: CentcomBlueshieldPDA
+    ears: ClothingHeadsetAltCentCom
+    belt: ClothingBeltSecurityFilled
+    pocket1: Flash
+    pocket2: WeaponPistolMk58
+  storage:
+    back:
+    - MagazinePistol
+    - MagazinePistol
diff --git a/Resources/Prototypes/Ronstation/Roles/Jobs/Command/blueshield_officer.yml b/Resources/Prototypes/Ronstation/Roles/Jobs/Command/blueshield_officer.yml
@@ -18,6 +18,7 @@
   canBeAntag: false
   access:
   - Command
+  - Brig
   - Maintenance
   - External
   - Cryogenics

diff --git a/Resources/Prototypes/Ronstation/Roles/play_time_trackers.yml b/Resources/Prototypes/Ronstation/Roles/play_time_trackers.yml
@@ -1,3 +1,6 @@
 # Jobs
 - type: playTimeTracker
   id: JobBlueshieldOfficer
+
+- type: playTimeTracker
+  id: JobCentralCommandBlueshieldOfficer