From f691377136d028cb09b2ea848987ba283014cdcf Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 17:19:18 +0000 Subject: [PATCH 1/7] do the chnage --- Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 9a8c1c2a5c9..37e7676ffcb 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,6 +281,7 @@ - ClothMade - WhitelistChameleon - PrisonUniform + - Skirt # Delta-V - Skirt Tag for Harpies to wear it. - type: entity parent: ClothingUniformSkirtBase From 1d8d57a5091c1d0e8d37f03a06cde23d67f60ba8 Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 17 Mar 2024 17:19:56 +0000 Subject: [PATCH 2/7] Revert "do the chnage" This reverts commit f691377136d028cb09b2ea848987ba283014cdcf. --- Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml index 37e7676ffcb..9a8c1c2a5c9 100644 --- a/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml +++ b/Resources/Prototypes/Entities/Clothing/Uniforms/jumpskirts.yml @@ -281,7 +281,6 @@ - ClothMade - WhitelistChameleon - PrisonUniform - - Skirt # Delta-V - Skirt Tag for Harpies to wear it. - type: entity parent: ClothingUniformSkirtBase From aab47860dbd88fd1d76cc2b8ec8641aefc23ae0e Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 30 Mar 2024 07:24:31 +0000 Subject: [PATCH 3/7] add the role, locale & entities --- .../Locale/en-US/deltav/entities/pda.ftl | 2 ++ .../en-US/deltav/job/job-description.ftl | 1 + .../Locale/en-US/deltav/job/job-names.ftl | 1 + .../DeltaV/Entities/Objects/Devices/pda.yml | 10 +++++++ .../Objects/Misc/identification_cards.yml | 8 ++++++ .../DeltaV/Roles/Jobs/Civilian/barber.yml | 28 +++++++++++++++++++ .../DeltaV/Roles/play_time_trackers.yml | 3 ++ .../Prototypes/Roles/Jobs/departments.yml | 2 ++ 8 files changed, 55 insertions(+) create mode 100644 Resources/Locale/en-US/deltav/entities/pda.ftl create mode 100644 Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml create mode 100644 Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml 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/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..d54e11ed703 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -0,0 +1,8 @@ +- type: entity + parent: ServiceWorkerIDCard + id: BarberIDCard + name: barber ID card + description: something funny + components: + - type: PresetIdCard + job: Barber 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..21962a028ba --- /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: #TODO: Worth considering if this is worth gate-keeping even slightly. + # - !type:OverallPlaytimeRequirement + # time: 7200 + startingGear: BarberGear + icon: "JobIconServiceWorker" + supervisors: job-supervisors-service + access: + - Service + - Maintenance + +- type: startingGear + id: BarberGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorDarkGreen # DeltaV + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: BarberPDA + ears: ClothingHeadsetService + pocket1: BarberScissor + pocket2: SprayBottle + innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen # DeltaV + 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/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 From 72c1bc902108f79cb95e4be3f28623c3e554b7fa Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 30 Mar 2024 07:28:00 +0000 Subject: [PATCH 4/7] add barber spawnpoint --- .../DeltaV/Entities/Markers/Spawners/jobs.yml | 12 ++++++++++++ 1 file changed, 12 insertions(+) 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 From c692e6ee226c57ba6fdce889f5439046d608450c Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sat, 30 Mar 2024 07:46:59 +0000 Subject: [PATCH 5/7] forgot the S in scissors --- Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml b/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml index 21962a028ba..bbc957171db 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml @@ -16,13 +16,13 @@ - type: startingGear id: BarberGear equipment: - jumpsuit: ClothingUniformJumpsuitColorDarkGreen # DeltaV + jumpsuit: ClothingUniformJumpsuitColorDarkGreen back: ClothingBackpackFilled shoes: ClothingShoesColorBlack id: BarberPDA ears: ClothingHeadsetService - pocket1: BarberScissor + pocket1: BarberScissors pocket2: SprayBottle - innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen # DeltaV + innerClothingSkirt: ClothingUniformJumpskirtColorDarkGreen satchel: ClothingBackpackSatchelFilled duffelbag: ClothingBackpackDuffelFilled From 65d098373fb0438044fd83fd97f5bcbc01ae165e Mon Sep 17 00:00:00 2001 From: DangerRevolution <142105406+DangerRevolution@users.noreply.github.com> Date: Sun, 31 Mar 2024 09:15:06 +0100 Subject: [PATCH 6/7] new barber icon --- .../Objects/Misc/identification_cards.yml | 5 +++++ .../DeltaV/Roles/Jobs/Civilian/barber.yml | 8 ++++---- Resources/Prototypes/DeltaV/StatusEffects/job.yml | 7 +++++++ .../Interface/Misc/job_icons.rsi/Barber.png | Bin 0 -> 196 bytes .../DeltaV/Interface/Misc/job_icons.rsi/meta.json | 5 ++++- .../DeltaV/Objects/Misc/id_cards.rsi/idbarber.png | Bin 0 -> 261 bytes .../DeltaV/Objects/Misc/id_cards.rsi/meta.json | 5 ++++- 7 files changed, 24 insertions(+), 6 deletions(-) create mode 100644 Resources/Textures/DeltaV/Interface/Misc/job_icons.rsi/Barber.png create mode 100644 Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/idbarber.png diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index d54e11ed703..bfb70beee02 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -6,3 +6,8 @@ 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 index bbc957171db..a2eee095540 100644 --- a/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml +++ b/Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/barber.yml @@ -3,11 +3,11 @@ name: job-name-barber description: job-description-barber playTimeTracker: JobBarber - #requirements: #TODO: Worth considering if this is worth gate-keeping even slightly. - # - !type:OverallPlaytimeRequirement - # time: 7200 + requirements: #If you can play service worker, you can play Barber. + - !type:OverallPlaytimeRequirement + time: 7200 startingGear: BarberGear - icon: "JobIconServiceWorker" + icon: "JobIconBarber" supervisors: job-supervisors-service access: - Service 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/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 0000000000000000000000000000000000000000..d6affae7a230b498ddd31172e58488b5c6ee11e6 GIT binary patch literal 196 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqg`O^sArj%qDGW>>cUb;+G_k7K zsnI%7Q01iB!bZi){b!pTtuh&z!&ntgK0iO-ct*(kBOwfvx6Jx8;o|%1d$HKt)%PCW4 l`o316<$S3To@u_m3|b&p0Wk<%3Z4w2JYD@<);T3K0RS~7Jl6mK literal 0 HcmV?d00001 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 0000000000000000000000000000000000000000..45ca0acbb634e906204f6e803816445d6c689e02 GIT binary patch literal 261 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}Ea{HEjtmSN z`?>!lvI6;>1s;*b3=DjSL74G){)!Z!;4DuU$B+p3WC_;A2_ijBg8UK-O&k^E%%9s& z;bhkrUn;OxUR>c6!-S_+L3aY=Shlcg8UFCy>$6dL#sU*hhLp;yzp4Y|QX5j(8+4Yd zDV$`yDmyV@R@6Rr#znFdcC4QLaOOn8!{NonD>zCSF7nNIAI7yTT6zEP`L@Lk zZ<;y;c6@rH9T?~mD0P6{?ecLAutNmcB_tRuBQ^HE33kZ Date: Sun, 31 Mar 2024 09:18:19 +0100 Subject: [PATCH 7/7] fix missing , --- Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 2418f0143f7..d557a71a7f6 100644 --- a/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Misc/id_cards.rsi/meta.json @@ -27,7 +27,7 @@ }, { "name": "nyanomantis" - } + }, { "name": "idbarber" }