From 5b747281eda99f58913f7b1db303e10f10e52c24 Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 00:08:37 -0300 Subject: [PATCH 1/4] Add the hygiene tech PDA + ID + locale --- Resources/Locale/en-US/deltav/job/job-names.ftl | 2 ++ .../DeltaV/Entities/Objects/Devices/pda.yml | 12 ++++++++++++ .../Objects/Misc/identification_cards.yml | 10 ++++++++++ .../DeltaV/Objects/Devices/pda.rsi/meta.json | 5 ++++- .../Devices/pda.rsi/pda-hygienetechnician.png | Bin 0 -> 503 bytes 5 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-hygienetechnician.png diff --git a/Resources/Locale/en-US/deltav/job/job-names.ftl b/Resources/Locale/en-US/deltav/job/job-names.ftl index c5c4c9da684..e08645c5ea6 100644 --- a/Resources/Locale/en-US/deltav/job/job-names.ftl +++ b/Resources/Locale/en-US/deltav/job/job-names.ftl @@ -53,6 +53,8 @@ job-alt-title-senior-officer = Senior Officer job-alt-title-jester = Jester job-alt-title-fool = Fool +job-alt-title-hygiene-technician = Hygiene Technician + # Role timers JobMedicalBorg = Medical Cyborg JobCourier = Courier diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml index 99b9fd5ed8c..8b4478d804c 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml @@ -445,3 +445,15 @@ - type: Pda id: FoolIDCard state: pda-fool # - aPDA Sprite Rework + +# Janitor + +- type: entity + parent: JanitorPDA + id: HygieneTechnicianPDA + name: hygiene technician PDA + description: It sounded better than it is or so Jeffrey said. + components: + - type: Pda + id: HygieneTechnicianIDCard + state: pda-hygienetechnician diff --git a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml index 2a8b0661773..8c93b96d4e6 100644 --- a/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml @@ -269,3 +269,13 @@ components: - type: IdCard jobTitle: job-alt-title-fool + +# Janitor + +- type: entity + parent: JanitorIDCard + id: HygieneTechnicianIDCard + name: hygiene technician ID card + components: + - type: IdCard + jobTitle: job-alt-title-hygiene-technician diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json index 78b6170b56f..d0ac0bee150 100644 --- a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/meta.json @@ -1,7 +1,7 @@ { "version": 1, "license": "CC-BY-SA-3.0", - "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net", + "copyright": "aPDA retexture by ZweiHawke @ zweihawke.net, added Hygiene Technician version by Radezolid", "size": { "x": 32, "y": 32 @@ -86,6 +86,9 @@ { "name": "pda-hydro" }, + { + "name": "pda-hygienetechnician" + }, { "name": "pda-janitor" }, diff --git a/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-hygienetechnician.png b/Resources/Textures/DeltaV/Objects/Devices/pda.rsi/pda-hygienetechnician.png new file mode 100644 index 0000000000000000000000000000000000000000..8b55956b171768b57467b0bbb1f0dab1e9870b5d GIT binary patch literal 503 zcmV Date: Sun, 15 Dec 2024 00:51:17 -0300 Subject: [PATCH 2/4] Add loadout --- .../Locale/en-US/deltav/preferences/loadout-groups.ftl | 1 + .../DeltaV/Loadouts/Jobs/Civilian/janitor.yml | 10 ++++++++++ .../Prototypes/DeltaV/Loadouts/loadout_groups.yml | 7 +++++++ Resources/Prototypes/Loadouts/role_loadouts.yml | 3 ++- Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml | 2 +- 5 files changed, 21 insertions(+), 2 deletions(-) create mode 100644 Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/janitor.yml diff --git a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl index 3628eb88dc0..9d0b06d8804 100644 --- a/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl +++ b/Resources/Locale/en-US/deltav/preferences/loadout-groups.ftl @@ -27,6 +27,7 @@ loadout-group-passenger-id-delta = Passenger PDA loadout-group-bartender-id-delta = Bartender PDA loadout-group-chef-id-delta = Chef PDA loadout-group-clown-id-delta = Clown PDA +loadout-group-janitor-id-delta = Janitor PDA loadout-group-serviceworker-head = Service Worker head loadout-group-serviceworker-jumpsuit = Service Worker jumpsuit diff --git a/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/janitor.yml b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/janitor.yml new file mode 100644 index 00000000000..119898fd1a3 --- /dev/null +++ b/Resources/Prototypes/DeltaV/Loadouts/Jobs/Civilian/janitor.yml @@ -0,0 +1,10 @@ +# PDA +- type: loadout + id: JanitorPDA + equipment: + id: JanitorPDA + +- type: loadout + id: HygieneTechnicianPDA + equipment: + id: HygieneTechnicianPDA diff --git a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml index b32e676d095..8b5b827e09a 100644 --- a/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml +++ b/Resources/Prototypes/DeltaV/Loadouts/loadout_groups.yml @@ -439,6 +439,13 @@ loadouts: - RoboticistPDA +- type: loadoutGroup + id: JanitorPDADelta + name: loadout-group-janitor-id-delta + loadouts: + - JanitorPDA + - HygieneTechnicianPDA + # Misc - type: loadoutGroup id: Scarfs diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 9eb026947e2..321ac4e9196 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -143,6 +143,7 @@ - JanitorNeck # DeltaV - JanitorJumpsuit - JanitorGloves + - JanitorPDADelta # DeltaV - CommonBackpack - JanitorOuterClothing - Glasses @@ -385,7 +386,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar + - SecurityStar - GroupSpeciesBreathToolSecurity - SecurityAllFirearm # DeltaV - loadouts - SecurityAllAmmo # DeltaV - loadouts diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml index 05abd97ac46..60348ca4ce4 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/janitor.yml @@ -19,7 +19,7 @@ id: JanitorGear equipment: shoes: ClothingShoesGaloshes - id: JanitorPDA + #id: JanitorPDA # DeltaV - Choose a PDA from the loadouts ears: ClothingHeadsetService belt: ClothingBeltJanitorFilled #storage: From 459ba721153b89f1a19897052a3a3c75224fe37e Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 01:02:32 -0300 Subject: [PATCH 3/4] Untouch --- Resources/Prototypes/Loadouts/role_loadouts.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 321ac4e9196..00224b11855 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -369,7 +369,7 @@ - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets - - SecurityStar + - SecurityStar - GroupSpeciesBreathToolSecurity - SecurityAllFirearm # DeltaV - loadouts - SecurityAllAmmo # DeltaV - loadouts From dc967538047c8f6a2b92d1d4666ebecc5e83017d Mon Sep 17 00:00:00 2001 From: Radezolid Date: Sun, 15 Dec 2024 01:04:15 -0300 Subject: [PATCH 4/4] Wrong star --- Resources/Prototypes/Loadouts/role_loadouts.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Resources/Prototypes/Loadouts/role_loadouts.yml b/Resources/Prototypes/Loadouts/role_loadouts.yml index 00224b11855..f13cf468547 100644 --- a/Resources/Prototypes/Loadouts/role_loadouts.yml +++ b/Resources/Prototypes/Loadouts/role_loadouts.yml @@ -369,7 +369,7 @@ - HeadofSecurityShoes # DeltaV - winter boots - SurvivalSecurity - Trinkets - - SecurityStar + - SecurityStar - GroupSpeciesBreathToolSecurity - SecurityAllFirearm # DeltaV - loadouts - SecurityAllAmmo # DeltaV - loadouts @@ -386,7 +386,7 @@ - SecurityShoes - SurvivalSecurity - Trinkets - - SecurityStar + - SecurityStar - GroupSpeciesBreathToolSecurity - SecurityAllFirearm # DeltaV - loadouts - SecurityAllAmmo # DeltaV - loadouts