diff --git a/Resources/Locale/en-US/deltav/entities/pda.ftl b/Resources/Locale/en-US/deltav/entities/pda.ftl new file mode 100644 index 00000000000..e01adee0e9c --- /dev/null +++ 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 index 5bc7be83118..83cf69d6df5 100644 --- 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 index dc7940ba983..075783e8b7d 100644 --- 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 diff --git a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml index e662ecca743..527f3d810c6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 6ee3a7543f7..f4c2535972c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml new file mode 100644 index 00000000000..bfb70beee02 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml new file mode 100644 index 00000000000..a2eee095540 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml @@ -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 diff --git a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml index d3b983f01cd..5d86219a190 100644 --- a/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml +++ b/Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml @@ -3,3 +3,6 @@ - type: playTimeTracker id: JobMedicalBorg + +- type: playTimeTracker + id: JobBarber diff --git a/Resources/Prototypes/DeltaV/StatusEffects/job.yml b/Resources/Prototypes/DeltaV/StatusEffects/job.yml index 4b61fd46d7d..4b9a517efb4 100644 --- a/Resources/Prototypes/DeltaV/StatusEffects/job.yml +++ b/Resources/Prototypes/DeltaV/StatusEffects/job.yml @@ -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 diff --git a/Resources/Prototypes/Roles/Jobs/departments.yml b/Resources/Prototypes/Roles/Jobs/departments.yml index 83534425097..ab63060b5ca 100644 --- a/Resources/Prototypes/Roles/Jobs/departments.yml +++ b/Resources/Prototypes/Roles/Jobs/departments.yml @@ -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 diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Barber.png b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Barber.png new file mode 100644 index 00000000000..d6affae7a23 Binary files /dev/null and b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Barber.png differ diff --git a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json index 3f3c6b04e25..8b408120175 100644 --- a/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/meta.json @@ -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" } ] } diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idbarber.png b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idbarber.png new file mode 100644 index 00000000000..45ca0acbb63 Binary files /dev/null and b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idbarber.png differ diff --git a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json index 521c6e58fa7..d557a71a7f6 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -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" } ] }