DeltaV-Station · DangerRevolution · Mar 17, 2024 · Mar 17, 2024 · Mar 17, 2024 · Mar 19, 2024
diff --git a/Resources/Locale/en-US/deltav/entities/pda.ftl b/Resources/Locale/en-US/deltav/entities/pda.ftl
@@ -0,0 +1,2 @@
+ent-BarberPDA = barber PDA
+    .desc = Something interesting
diff --git a/Resources/Locale/en-US/deltav/job/job-description.ftl b/Resources/Locale/en-US/deltav/job/job-description.ftl
@@ -1 +1,2 @@
 job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
+job-description-barber = Something interesting.
diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl
@@ -1 +1,2 @@
 job-name-medical-borg = Medical Cyborg
+job-name-barber = Barber
@@ -13,3 +13,15 @@
       state: medical
     - sprite: Mobs/Silicon/chassis.rsi
       state: medical_e
+
+- type: entity
+  id: SpawnPointBarber
+  parent: SpawnPointJobBase
+  name: barber
+  components:
+  - type: SpawnPoint
+    job_id: Barber
+  - type: Sprite
+    layers:
+      - state: green
+      - state: serviceworker
@@ -52,3 +52,13 @@
       whitelist:
         tags:
         - Write
+
+- type: entity
+  parent: ServiceWorkerPDA
+  id: BarberPDA
+  name: barber PDA
+  description: something funny
+  components:
+  - type: Pda
+    id: BarberIDCard
+    state: pda-internservice
@@ -0,0 +1,13 @@
+- type: entity
+  parent: ServiceWorkerIDCard
+  id: BarberIDCard
+  name: barber ID card
+  description: something funny
+  components:
+  - type: PresetIdCard
+    job: Barber
+  - type: Sprite
+    layers:
+    - state: default
+    - sprite: DeltaV/Objects/Misc/id_cards.rsi
+      state: idbarber
@@ -0,0 +1,28 @@
+- type: job
+  id: Barber
+  name: job-name-barber
+  description: job-description-barber
+  playTimeTracker: JobBarber
+  requirements:    #If you can play service worker, you can play Barber.
+    - !type:OverallPlaytimeRequirement
+      time: 7200
+  startingGear: BarberGear
+  icon: "JobIconBarber"
+  supervisors: job-supervisors-service
+  access:
+  - Service
+  - Maintenance
+
+- type: startingGear
+  id: BarberGear
+  equipment:
+    jumpsuit: ClothingUniformJumpsuitColorDarkGreen
+    back: ClothingBackpackFilled
+    shoes: ClothingShoesColorBlack
+    id: BarberPDA
+    ears: ClothingHeadsetService
+    pocket1: BarberScissors
+    pocket2: SprayBottle
+  innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen
+  satchel: ClothingBackpackSatchelFilled
+  duffelbag: ClothingBackpackDuffelFilled
@@ -3,3 +3,6 @@
 
 - type: playTimeTracker
   id: JobMedicalBorg
+
+- type: playTimeTracker
+  id: JobBarber
@@ -4,3 +4,10 @@
   icon:
     sprite: DeltaV/Interface/Misc/job_icons.rsi
     state: MedicalBorg
+
+- type: statusIcon
+  parent: JobIcon
+  id: JobIconBarber
+  icon:
+    sprite: DeltaV/Interface/Misc/job_icons.rsi
+    state: Barber
@@ -35,6 +35,7 @@
   - MartialArtist # Nyanotrasen - MartialArtist, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/martialartist.yml
   - Prisoner # Nyanotrasen - Prisoner, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
   - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
+  - Barber # Delta-V - Barber, see resources/prototypes/deltav/roles/jobs/civilian/barber.yml
 
 - type: department
   id: Command
@@ -118,4 +119,5 @@
   - Gladiator # Nyanotrasen - Gladiator, see Resources/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/gladiator.yml
   - Prisoner # Nyanotrasen - Prisoner, see Resrouces/Prototypes/Nyanotrasen/Roles/Jobs/Wildcards/prisoner.yml
   - Brigmedic # DeltaV - Corpsman, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml
+  - Barber # Delta-V - Barber, resources/prototypes/deltav/roles/jobs/civilian/barber.yml
   primary: false
@@ -1,7 +1,7 @@
 {
     "version": 1,
     "license": "CC-BY-SA-3.0",
-    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers",
+    "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoPrisonGuard, nyanoMartialArtist, nyanoGladiator made by Floofers | Barber by Glados",
     "size": {
         "x": 8,
         "y": 8
@@ -27,6 +27,9 @@
         },
         {
             "name": "MedicalBorg"
+        },
+        {
+            "name": "Barber"
         }
     ]
 }
@@ -1,7 +1,7 @@
 {
   "version": 1,
   "license": "CC-BY-SA-3.0",
-  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers",
+  "copyright": "Taken from tgstation at commit https://github.com/tgstation/tgstation/commit/d917f4c2a088419d5c3aec7656b7ff8cebd1822e | nyanoprisonguard, nyanogladiator, nyanomartialartist made by Floofers | barber by Glados",
   "size": {
     "x": 32,
     "y": 32
@@ -27,6 +27,9 @@
     },
     {
       "name": "nyanomantis"
+    },
+    {
+      "name": "idbarber"
     }
   ]
 }