ss14-ganimed · Yuoko · Jul 23, 2023
diff --git a/Resources/Locale/ru-RU/Ganimed/instructor.ftl b/Resources/Locale/ru-RU/Ganimed/instructor.ftl
@@ -0,0 +1,11 @@
+job-name-instructor = инструктор СБ
+job-description-instructor = Обучайте кадетов и помогайте только что ставшим на должность офицерам. Ставьте двойки в дневник кадетам!
+ent-InstructorPDA = КПК инструктора
+    .desc = Этот КПК специально создан что-бы ставить кадетам двойки!
+ent-InstructorIDCard = ID карта инструктора
+    .desc = ID карта, специально для Джона Уика, а вернее для его учителя!
+ent-LockerInstructor = шкаф инструктора
+    .desc = Шкафчик самого умного офицера
+ent-LockerInstructorFilled = шкаф инструктора
+    .desc = Шкафчик самого умного офицера
+ent-SpawnPointSecurityInstructor = инструктор
diff --git a/Resources/Prototypes/Access/misc.yml b/Resources/Prototypes/Access/misc.yml
@@ -30,3 +30,4 @@
   - Chapel
   - Hydroponics
   - Atmospherics
+  - Instructor
diff --git a/Resources/Prototypes/Access/security.yml b/Resources/Prototypes/Access/security.yml
@@ -18,6 +18,10 @@
   id: Detective
   name: id-card-access-level-detective
 
+- type: accessLevel
+  id: Instructor
+  name: id-card-access-level-instructor
+
 - type: accessGroup
   id: Security
   tags:
@@ -26,6 +30,7 @@
   - Armory
   - Brig
   - Detective
+  - Instructor
 
 - type: accessGroup
   id: Armory

diff --git a/Resources/Prototypes/Catalog/Fills/Lockers/security.yml b/Resources/Prototypes/Catalog/Fills/Lockers/security.yml
@@ -72,6 +72,27 @@
       - id: ClothingOuterCoatSecurityOvercoat # Corvax-SecFashion
         prob: 0.2
 
+- type: entity
+  id: LockerInstructorFilled
+  suffix: Filled
+  parent: LockerInstructor
+  components:
+  - type: StorageFill
+    contents:
+      - id: FlashlightSeclite
+      - id: ClothingUniformJumpsuitSecBlue
+      - id: ClothingHeadHelmetHelmet
+      - id: ClothingOuterVestWeb
+      - id: ClothingBeltSecurityFilled
+      - id: Flash
+      - id: ClothingEyesGlassesSecurity
+      - id: ClothingHeadsetAltSecurity
+      - id: ClothingHandsGlovesColorBlack
+      - id: ClothingShoesBootsJackSec
+      - id: ClothingOuterCoatSecurityOvercoat
+      - id: ClothingNeckTieDet
+      - id: ClothingHeadHatBeret
+
 - type: entity
   id: LockerBrigmedicFilled
   suffix: Brigmedic, Filled

diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
@@ -466,6 +466,18 @@
       - state: green
       - state: detective
 
+- type: entity
+  id: SpawnPointSecurityInstructor
+  parent: SpawnPointJobBase
+  name: instructor
+  components:
+  - type: SpawnPoint
+    job_id: Instructor
+  - type: Sprite
+    layers:
+      - state: green
+      - state: security_officer
+
 - type: entity
   id: SpawnPointBrigmedic
   parent: SpawnPointJobBase

diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml
@@ -661,7 +661,25 @@
         - Write
   - type: Icon
     state: pda-security
-
+
+- type: entity
+  parent: BasePDA
+  id: InstructorPDA
+  name: instructor PDA
+  description: This PDA is specially created to give cadets deuces!.
+  components:
+  - type: PDA
+    id: InstructorIDCard
+    state: pda-security
+    penSlot:
+      startingItem: SecPen
+      priority: -1
+      whitelist:
+        tags:
+        - Write
+  - type: Icon
+    state: pda-security
+
 - type: entity
   parent: BasePDA
   id: BlueShieldPDA

diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml
@@ -600,6 +600,19 @@
   - type: PresetIdCard
     job: Detective
 
+- type: entity
+  parent: IDCardStandard
+  id: InstructorIDCard
+  name: instructor ID card
+  description: ID Card, definitely for Jonah Wicki, and most importantly for your teacher!
+  components:
+  - type: Sprite
+    layers:
+    - state: default
+    - state: idinstructor
+  - type: PresetIdCard
+    job: Instructor
+
 - type: entity
   parent: CentcomIDCard
   id: CBURNIDcard

diff --git a/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml b/Resources/Prototypes/Entities/Structures/Storage/Closets/Lockers/lockers.yml
@@ -301,6 +301,21 @@
   - type: AccessReader
     access: [["Armory"]]
 
+# Instructor
+- type: entity
+  id: LockerInstructor
+  parent: LockerBaseSecure
+  name:  Instructor's locker
+  description: The locker of the smartest officer
+  components:
+  - type: Appearance
+  - type: EntityStorageVisuals
+    stateBaseClosed: warden
+    stateDoorOpen: warden_open
+    stateDoorClosed: warden_door
+  - type: AccessReader
+    access: [["Instructor"]]
+
 # Brigmedic
 - type: entity
   id: LockerBrigmedic

diff --git a/Resources/Prototypes/Ganimed/Roles/security_trainer.yml b/Resources/Prototypes/Ganimed/Roles/security_trainer.yml
@@ -0,0 +1,40 @@
+- type: job
+  id: Instructor
+  name: job-name-instructor
+  description: job-description-instructor
+  playTimeTracker: JobInstructor
+  requirements:
+    - !type:DepartmentTimeRequirement
+      department: Security
+      time: 25200 # Ganimed-RoleTime (420m)
+  startingGear: InstructorGear
+  icon: "SecurityInstructor"
+  requireAdminNotify: true
+  supervisors: job-supervisors-hos
+  canBeAntag: false
+  access:
+  - Security
+  - Armory
+  - Maintenance
+  - Service
+  - Brig
+  - External
+  - Instructor
+
+- type: startingGear
+  id: InstructorGear
+  equipment:
+    head: ClothingHeadHatBeret
+    neck: ClothingNeckTieDet
+    jumpsuit: ClothingUniformJumpsuitSecBlue
+    back: ClothingBackpackSecurityFilled
+    shoes: ClothingShoesBootsJackSec
+    eyes: ClothingEyesGlassesSecurity
+    outerClothing: ClothingOuterVestWeb
+    id: InstructorPDA
+    ears: ClothingHeadsetAltSecurity
+    belt: ClothingBeltSecurityFilled
+    gloves: ClothingHandsGlovesBlack
+  innerclothingskirt: ClothingUniformJumpsuitSecBlue
+  satchel: ClothingBackpackSatchelSecurityFilled
+  duffelbag: ClothingBackpackDuffelSecurityFilled
diff --git a/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml b/Resources/Prototypes/Roles/Jobs/Security/head_of_security.yml
@@ -26,6 +26,7 @@
   - Service
   - External
   - Detective
+  - Instructor
 
 - type: startingGear
   id: HoSGear

diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml
@@ -80,6 +80,7 @@
   - SecurityOfficer
   - Detective
   - Warden
+  - Instructor
 
 - type: department
   id: Science

diff --git a/Resources/Prototypes/Roles/play_time_trackers.yml b/Resources/Prototypes/Roles/play_time_trackers.yml
@@ -138,3 +138,6 @@
 
 - type: playTimeTracker
   id: JobBlueShield
+
+- type: playTimeTracker
+  id: JobInstructor
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityInstructor.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityInstructor.png
diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
@@ -150,6 +150,9 @@
         },
         {
             "name": "Zookeeper"
+        },
+        {
+            "name": "SecurityInstructor"
         }
     ]
 }
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idinstructor.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idinstructor.png
diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
@@ -175,6 +175,9 @@
     {
       "name": "idblueshield"
     },
+    {
+      "name": "idinstructor"
+    },
     {
       "name": "orange"
     },