From a65d53f5f134b2d03873c20e29089bfa700aaf76 Mon Sep 17 00:00:00 2001 From: Kara D Date: Sat, 7 May 2022 19:35:22 -0700 Subject: [PATCH 1/5] the bear necessities --- .../Entities/Objects/Devices/pda.yml | 42 ++++++++++++++++-- .../Objects/Misc/identification_cards.yml | 35 ++++++++++++++- .../Roles/Jobs/Civilian/service_worker.yml | 25 +++++++++++ .../Jobs/Engineering/technical_assistant.yml | 28 ++++++++++++ .../Roles/Jobs/Medical/medical_intern.yml | 26 +++++++++++ .../Roles/Jobs/Security/security_cadet.yml | 28 ++++++++++++ .../Misc/job_icons.rsi/MedicalIntern.png | Bin 0 -> 189 bytes .../Misc/job_icons.rsi/SecurityCadet.png | Bin 0 -> 181 bytes .../Misc/job_icons.rsi/ServiceWorker.png | Bin 0 -> 183 bytes .../Misc/job_icons.rsi/TechnicalAssistant.png | Bin 0 -> 189 bytes .../Interface/Misc/job_icons.rsi/meta.json | 12 +++++ 11 files changed, 192 insertions(+), 4 deletions(-) create mode 100644 Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml create mode 100644 Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png create mode 100644 Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 26cd85e56b4b..5d9db7663d1c 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -77,6 +77,42 @@ - type: PDA id: AssistantIDCard +- type: entity + parent: BasePDA + id: TechnicalAssistantPDA + name: technical assistant PDA + description: Why isn't it yellow? + components: + - type: PDA + id: TechnicalAssistantIDCard + +- type: entity + parent: BasePDA + id: MedicalInternPDA + name: medical intern PDA + description: Why isn't it white? + components: + - type: PDA + id: MedicalInternIDCard + +- type: entity + parent: BasePDA + id: SecurityCadetPDA + name: security cadet PDA + description: Why isn't it red? + components: + - type: PDA + id: SecurityCadetIDCard + +- type: entity + parent: BasePDA + id: ServiceWorkerPDA + name: service worker PDA + description: Why isn't it gray? + components: + - type: PDA + id: ServiceWorkerIDCard + - type: entity parent: BasePDA id: ChefPDA @@ -526,7 +562,7 @@ parent: BasePDA id: ClearPDA name: clear PDA - description: 99 and 44/100ths percent pure plastic. + description: 99 and 44/100ths percent pure plastic. components: - type: PDA id: AssistantIDCard @@ -535,7 +571,7 @@ - type: PDAVisualizer state: pda-clear - type: Icon - state: pda-clear + state: pda-clear - type: entity parent: BasePDA @@ -551,4 +587,4 @@ state: pda-syndi - type: Icon state: pda-syndi - + diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index a0f7b344a9b3..89cd494b6322 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -32,6 +32,39 @@ - type: PresetIdCard job: Assistant +- type: entity + parent: AssistantIDCard + id: TechnicalAssistantIDCard + name: technical assistant ID card + components: + - type: PresetIdCard + job: TechnicalAssistant + +- type: entity + parent: AssistantIDCard + id: MedicalInternIDCard + name: medical intern ID card + components: + - type: PresetIdCard + job: MedicalIntern + +- type: entity + parent: AssistantIDCard + id: SecurityCadetIDCard + name: security cadet ID card + components: + - type: PresetIdCard + job: SecurityCadet + +- type: entity + parent: AssistantIDCard + id: ServiceWorkerIDCard + name: service worker ID card + components: + - type: PresetIdCard + job: ServiceWorker + + - type: entity parent: IDCardStandard id: CaptainIDCard @@ -390,7 +423,7 @@ interfaces: - key: enum.AgentIDCardUiKey.Key type: AgentIDCardBoundUserInterface - + - type: entity parent: IDCardStandard id: AtmosIDCard diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml new file mode 100644 index 000000000000..fa90c7d4e0ac --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -0,0 +1,25 @@ +- type: job + id: ServiceWorker + name: "service worker" + startingGear: ServiceWorkerGear + departments: + - Civilian + icon: "ServiceWorker" + supervisors: "the bartender, chefs, botanists, and head of personnel" + access: + - Service + - Maintenance + - Bar + - Kitchen + +- type: startingGear + id: ServiceWorkerGear + equipment: + jumpsuit: ClothingUniformJumpsuitBartender + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: AssistantPDA + ears: ClothingHeadsetService + innerclothingskirt: ClothingUniformJumpskirtBartender + satchel: ClothingBackpackSatchelFilled + duffelbag: ClothingBackpackDuffelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml new file mode 100644 index 000000000000..8a60f2ba8101 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -0,0 +1,28 @@ +- type: job + id: TechnicalAssistant + name: "technical assistant" + startingGear: TechnicalAssistantGear + departments: + - Civilian + - Engineering + icon: "TechnicalAssistant" + supervisors: "the station engineers, atmospheric technicians, and chief engineer" + canBeAntag: false + access: + - Maintenance + - Engineering + - External + +- type: startingGear + id: TechnicalAssistantGear + equipment: + head: ClothingHeadHatWelding + jumpsuit: ClothingUniformJumpsuitColorYellow + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsWork + id: AssistantPDA + belt: ClothingBeltUtilityFilled + ears: ClothingHeadsetEngineering + innerclothingskirt: ClothingUniformJumpskirtColorYellow + satchel: ClothingBackpackSatchelEngineeringFilled + duffelbag: ClothingBackpackDuffelEngineeringFilled diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml new file mode 100644 index 000000000000..662c28d20138 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -0,0 +1,26 @@ +- type: job + id: MedicalIntern + name: "medical intern" + startingGear: MedicalInternGear + departments: + - Civilian + - Medical + icon: "MedicalIntern" + supervisors: "the medical doctors, chemists, and chief medical officer" + canBeAntag: false + access: + - Medical + - Maintenance + +- type: startingGear + id: MedicalInternGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorWhite + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorWhite + id: AssistantPDA + ears: ClothingHeadsetMedical + belt: ClothingBeltMedicalFilled + innerclothingskirt: ClothingUniformJumpskirtColorWhite + satchel: ClothingBackpackSatchelMedicalFilled + duffelbag: ClothingBackpackDuffelMedicalFilled diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml new file mode 100644 index 000000000000..7c0a0cbe56ee --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -0,0 +1,28 @@ +- type: job + id: SecurityCadet + name: "security cadet" + startingGear: SecurityCadetGear + departments: + - Civilian + - Security + icon: "SecurityCadet" + supervisors: "the security officers, and head of security" + canBeAntag: false + access: + - Security + - Brig + - Maintenance + - Service + +- type: startingGear + id: SecurityCadetGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorRed + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsJack + id: AssistantPDA + ears: ClothingHeadsetSecurity + belt: ClothingBeltSecurityFilled + innerclothingskirt: ClothingUniformJumpskirtColorRed + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png new file mode 100644 index 0000000000000000000000000000000000000000..7485976f9537b9f3282ce958a74bacfa513d335c GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}z0%^zEMbXpu{Qv(S$lmwxiw=-tEeY}q28#S=_`QuU7%0G5;1OBO zz`%DHgc*r70vNr6jOS^6@#7z{atlYk{G{Ey+j* YVK0Vu1_J?R;rmyfSFYZF*?y_7 zV$#wJjWL^?6Er!+HFYdh7cuRs{bP0l+XkK^4&S@ literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png new file mode 100644 index 0000000000000000000000000000000000000000..c5532e131b84fe72ecab8d2fcd95bb84ce7fb71d GIT binary patch literal 183 zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqjKx9jP7LeL$-D$|SkfJR9T^xl z_H+M9WCij$3p^r=85sBugD~Uq{1qucK_5>S#}JL+}C{KcyQLV ahhh19TVtm4_dWs5W$<+Mb6Mw<&;$TVG(8mn literal 0 HcmV?d00001 diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png b/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png new file mode 100644 index 0000000000000000000000000000000000000000..7aabb46653873378ae6c69278b62aac602817580 GIT binary patch literal 189 zcmeAS@N?(olHy`uVBq!ia0vp^93afW3?x5a^xFxf7>k44ofy`glX(f`u%tWsIx;Y9 z?C1WI$O`212l#}zg4C8Xe4elV|Nnm=n Date: Sat, 7 May 2022 19:39:00 -0700 Subject: [PATCH 2/5] the actual necessities --- Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml | 3 ++- .../Prototypes/Roles/Jobs/Engineering/technical_assistant.yml | 2 +- Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml | 2 +- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 2 +- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index fa90c7d4e0ac..5025b918e476 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -6,6 +6,7 @@ - Civilian icon: "ServiceWorker" supervisors: "the bartender, chefs, botanists, and head of personnel" + canBeAntag: false access: - Service - Maintenance @@ -18,7 +19,7 @@ jumpsuit: ClothingUniformJumpsuitBartender back: ClothingBackpackFilled shoes: ClothingShoesColorBlack - id: AssistantPDA + id: ServiceWorkerPDA ears: ClothingHeadsetService innerclothingskirt: ClothingUniformJumpskirtBartender satchel: ClothingBackpackSatchelFilled diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index 8a60f2ba8101..d5ab51a36208 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -20,7 +20,7 @@ jumpsuit: ClothingUniformJumpsuitColorYellow back: ClothingBackpackEngineeringFilled shoes: ClothingShoesBootsWork - id: AssistantPDA + id: TechnicalAssistantPDA belt: ClothingBeltUtilityFilled ears: ClothingHeadsetEngineering innerclothingskirt: ClothingUniformJumpskirtColorYellow diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 662c28d20138..98681c46113e 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -18,7 +18,7 @@ jumpsuit: ClothingUniformJumpsuitColorWhite back: ClothingBackpackMedicalFilled shoes: ClothingShoesColorWhite - id: AssistantPDA + id: MedicalInternPDA ears: ClothingHeadsetMedical belt: ClothingBeltMedicalFilled innerclothingskirt: ClothingUniformJumpskirtColorWhite diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index 7c0a0cbe56ee..c96d7079fc78 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -20,7 +20,7 @@ jumpsuit: ClothingUniformJumpsuitColorRed back: ClothingBackpackSecurityFilled shoes: ClothingShoesBootsJack - id: AssistantPDA + id: SecurityCadetPDA ears: ClothingHeadsetSecurity belt: ClothingBeltSecurityFilled innerclothingskirt: ClothingUniformJumpskirtColorRed From ff541d0a64bf36cf5b0359b5f69d0bfdc3509a30 Mon Sep 17 00:00:00 2001 From: Kara D Date: Sat, 7 May 2022 19:46:35 -0700 Subject: [PATCH 3/5] fuck them cadets --- Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index c96d7079fc78..c3eb2b88d1c1 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -22,7 +22,6 @@ shoes: ClothingShoesBootsJack id: SecurityCadetPDA ears: ClothingHeadsetSecurity - belt: ClothingBeltSecurityFilled innerclothingskirt: ClothingUniformJumpskirtColorRed satchel: ClothingBackpackSatchelSecurityFilled duffelbag: ClothingBackpackDuffelSecurityFilled From 239ee5f5ad30322423a2b5fa2e50ae5e6b120d3e Mon Sep 17 00:00:00 2001 From: Kara D Date: Sat, 7 May 2022 20:12:58 -0700 Subject: [PATCH 4/5] final touches + resprite service icons --- .../Entities/Markers/Spawners/jobs.yml | 36 +++++++++++++++++- .../Roles/Jobs/Civilian/service_worker.yml | 2 +- .../Jobs/Engineering/technical_assistant.yml | 2 +- .../Roles/Jobs/Medical/medical_intern.yml | 2 +- .../Roles/Jobs/Security/security_cadet.yml | 3 +- .../Misc/job_icons.rsi/Bartender.png | Bin 118 -> 188 bytes .../Interface/Misc/job_icons.rsi/Botanist.png | Bin 138 -> 194 bytes .../Interface/Misc/job_icons.rsi/Chef.png | Bin 119 -> 185 bytes .../Misc/job_icons.rsi/ServiceWorker.png | Bin 183 -> 189 bytes 9 files changed, 38 insertions(+), 7 deletions(-) diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 46792ab0f8bc..18f8dbd3e515 100644 --- a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml +++ b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml @@ -87,6 +87,38 @@ - state: green - state: assistant +- type: entity + id: SpawnPointTechnicalAssistant + parent: SpawnPointAssistant + name: technical assistant + components: + - type: SpawnPoint + job_id: TechnicalAssistant + +- type: entity + id: SpawnPointMedicalIntern + parent: SpawnPointAssistant + name: medical intern + components: + - type: SpawnPoint + job_id: MedicalIntern + +- type: entity + id: SpawnPointSecurityCadet + parent: SpawnPointAssistant + name: security cadet + components: + - type: SpawnPoint + job_id: SecurityCadet + +- type: entity + id: SpawnPointServiceWorker + parent: SpawnPointAssistant + name: service worker + components: + - type: SpawnPoint + job_id: ServiceWorker + - type: entity id: SpawnPointBartender parent: SpawnPointJobBase @@ -258,7 +290,7 @@ layers: - state: green - state: engineer - + - type: entity id: SpawnPointAtmos parent: SpawnPointJobBase @@ -270,7 +302,7 @@ layers: - state: green - state: atmospherics - + # Medical - type: entity diff --git a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml index 5025b918e476..af40a3f437fd 100644 --- a/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -5,7 +5,7 @@ departments: - Civilian icon: "ServiceWorker" - supervisors: "the bartender, chefs, botanists, and head of personnel" + supervisors: "chefs, botanists, the bartender, and the head of personnel" canBeAntag: false access: - Service diff --git a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml index d5ab51a36208..0ab43c51548b 100644 --- a/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml +++ b/Resources/Prototypes/Roles/Jobs/Engineering/technical_assistant.yml @@ -6,7 +6,7 @@ - Civilian - Engineering icon: "TechnicalAssistant" - supervisors: "the station engineers, atmospheric technicians, and chief engineer" + supervisors: "station engineers, atmospheric technicians, and the chief engineer" canBeAntag: false access: - Maintenance diff --git a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml index 98681c46113e..f83640173a9f 100644 --- a/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml +++ b/Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml @@ -6,7 +6,7 @@ - Civilian - Medical icon: "MedicalIntern" - supervisors: "the medical doctors, chemists, and chief medical officer" + supervisors: "medical doctors, chemists, and the chief medical officer" canBeAntag: false access: - Medical diff --git a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml index c3eb2b88d1c1..19b1e7a667f0 100644 --- a/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -6,13 +6,12 @@ - Civilian - Security icon: "SecurityCadet" - supervisors: "the security officers, and head of security" + supervisors: "security officers, the warden, and the head of security" canBeAntag: false access: - Security - Brig - Maintenance - - Service - type: startingGear id: SecurityCadetGear diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png index 35cfeb5b9730f72e35ebfc994c6b7a07f24bc875..d6e59ad74b820597e9de0f309c6dee424ab41fdb 100644 GIT binary patch delta 171 zcmXTh!#F{ro`a2nf#C@MzHT7JSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@3Vz$3Dl zfr0NZ2s0kfUy%Y74D@ty4ABTq{`3F8z4KeX?f-cq95x@Qf$U!HKT1G~wIs+d7%1|e;rBMaV4whJfk$L90|Vb-5N14{zaj-F zsO{0~QnJ=! delta 121 zcmX@a*u^+OqKJi=fq}tHaq$iy#UJ1k;`;yp|KQ-@yu7@1>(&9;Nskw40Hqj9g8YIR z9G=}s19CJyT^vI=WRp`w5`LW5U{ULN_cvYSVQ|HHjie9%S1u Vk9-K9W)@HrgQu&X%Q~loCIEy+E3p6o diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png index 2520e7c4589bd46c951f8806a51369392a6f4a73..82eb9514e77b01598e2fa825b9e71b689c55a33d 100644 GIT binary patch delta 168 zcmXTl$v8oxo`a2nf#C@MzHT7JSRCZ;#IWw1%u67LCEd~2k%3`jKlh(RRv@3Vz$3Dl zfr0NZ2s0kfUy%Y7^z(Fa4ABTq{`3F8z4KeX?f-cq95x@E#W92aYfwefW6Zd`J1jaO~~M2h`GzYzr&k-2T&1%r>mdKI;Vst0QQC> A5C8xG diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png index c5532e131b84fe72ecab8d2fcd95bb84ce7fb71d..6dece6fb58c39b84f9eee4c37980855fcd9dcc3c 100644 GIT binary patch delta 123 zcmdnaxR-H)BnLAC1HdXYKg~G=ss@)z4*}Q$iB}HDf7G delta 137 zcmdnXxSer=BnKM<1H%#iecclk70NgZJR*x382Ao@Fyrz36)8YTA5Ry@5RKsEKmY&R zJ9~JXsAtnjI6KRJ^{^T@O1TaS?83{1OT{IHP`?E From f3c98e00dca59138c1c5705ac0cde387cb325458 Mon Sep 17 00:00:00 2001 From: Kara D Date: Sun, 8 May 2022 00:17:23 -0700 Subject: [PATCH 5/5] ID/PDA icons, thanks emisse --- .../Entities/Objects/Devices/pda.yml | 24 ++++++++++++++++++ .../Objects/Misc/identification_cards.yml | 17 ++++++++++++- .../Objects/Devices/pda.rsi/meta.json | 12 +++++++++ .../Devices/pda.rsi/pda-interncadet.png | Bin 0 -> 499 bytes .../Objects/Devices/pda.rsi/pda-internmed.png | Bin 0 -> 496 bytes .../Devices/pda.rsi/pda-internservice.png | Bin 0 -> 505 bytes .../Devices/pda.rsi/pda-interntech.png | Bin 0 -> 498 bytes .../Misc/id_cards.rsi/idintern-cadet.png | Bin 0 -> 187 bytes .../Misc/id_cards.rsi/idintern-med.png | Bin 0 -> 214 bytes .../Misc/id_cards.rsi/idintern-service.png | Bin 0 -> 199 bytes .../Misc/id_cards.rsi/idintern-tech.png | Bin 0 -> 210 bytes .../Objects/Misc/id_cards.rsi/meta.json | 12 +++++++++ 12 files changed, 64 insertions(+), 1 deletion(-) create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png create mode 100644 Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png create mode 100644 Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png diff --git a/Resources/Prototypes/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 5d9db7663d1c..777aa6e13870 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -85,6 +85,12 @@ components: - type: PDA id: TechnicalAssistantIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-interntech + - type: Icon + state: pda-interntech - type: entity parent: BasePDA @@ -94,6 +100,12 @@ components: - type: PDA id: MedicalInternIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-internmed + - type: Icon + state: pda-internmed - type: entity parent: BasePDA @@ -103,6 +115,12 @@ components: - type: PDA id: SecurityCadetIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-interncadet + - type: Icon + state: pda-interncadet - type: entity parent: BasePDA @@ -112,6 +130,12 @@ components: - type: PDA id: ServiceWorkerIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-internservice + - type: Icon + state: pda-internservice - type: entity parent: BasePDA diff --git a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml index 89cd494b6322..6d8b433623ba 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -39,6 +39,10 @@ components: - type: PresetIdCard job: TechnicalAssistant + - type: Sprite + layers: + - state: default + - state: idintern-tech - type: entity parent: AssistantIDCard @@ -47,6 +51,10 @@ components: - type: PresetIdCard job: MedicalIntern + - type: Sprite + layers: + - state: default + - state: idintern-med - type: entity parent: AssistantIDCard @@ -55,6 +63,10 @@ components: - type: PresetIdCard job: SecurityCadet + - type: Sprite + layers: + - state: default + - state: idintern-cadet - type: entity parent: AssistantIDCard @@ -63,7 +75,10 @@ components: - type: PresetIdCard job: ServiceWorker - + - type: Sprite + layers: + - state: default + - state: idintern-service - type: entity parent: IDCardStandard diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index c2fa2a093635..f92f0672ed26 100644 --- a/Resources/Textures/Objects/Devices/pda.rsi/meta.json +++ b/Resources/Textures/Objects/Devices/pda.rsi/meta.json @@ -144,6 +144,18 @@ }, { "name": "pda-musician" + }, + { + "name": "pda-interncadet" + }, + { + "name": "pda-internmed" + }, + { + "name": "pda-internservice" + }, + { + "name": "pda-interntech" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png new file mode 100644 index 0000000000000000000000000000000000000000..5a54b5f797c9194717fc99176d8e96728ca2bbde GIT binary patch literal 499 zcmVPx$tw}^dR9J=Wm9bC4KorJ5R8UeeN(h64Om=E8fs`0nm>6|4Fl!qB06Q_`QvLu# zbR-Z*C&R=d3t`YW;bb+KGz}(_hB(y$@30WstHNY|$tCT3ukXHo*WLjh9v+PBr&8u3 z`YtV^sT+I@HKr)?jz#Tu_gDRG3q+AOPmT}iee$|v$#;&D003R@V=x$EZ8ZRYU>T7} z7`1u>&E~!194k%=0iafIz%YimoJ?H30suHJh(bPRNoCRk5nv0G0K*tUE}fzK{4kZ{ zV{s_OGE}vP+gKHnDbt)N^0Su4od5u6wVU)h5)A_Ybgd6v8^_TBkYMfTQozPm$T21* zP~F+#J4TA%nk(nemW*&1hNE$d=8nkz|@!70fMge z={5Nn2^F6L$&?r403VA37}*}$T&MQ;UbJ!1_dYdu2RJSWrC7Gj1LGxd;{cO@LOuso z?P2%Ey0bkU?Ag|r&a3kgAe}0xT*wfjZPx$s!2paR9J=WRXtC_P!v6&prqmlAr2moMB?NMvqt#=GBLvfKLFfK zyE>V4>L4tHLE~VEi#1^&4JML?%{tUqX_fX>%VbaT()Qlddr$7Y?>)eW4so-P6(B9(1(8|+bp^tqkg=>b0@8wFA&+b(>8$_)eem>U z1!(~-2UcNL(T0fvd7UTN6+fv*<0nE@&R#X=sk zJU}~WIqlwmPDJ?C+Lbo~&PsJ$Hp`F$+a~*twl(t~+8J=Vt+ZTj4}gBQ(^P;Yp1KEY mb5LE!6r8`r_u<3GKgS0a$cb6GLX(aF0000Px$vq?ljR9J=Wl`%^KVHn4MSz2L6g)~G^7~CWU(Mi-I4N_C9(pXd;qKP z7`iqUPA;`rL(vdHqy`Rh7$oAR4f39y)!loQQ}=@x?w;ql=lS!0@9qT$2M0-JL!o** z`nuZD)D9gIHFZ^0EQ>Ok#~<}KEl^dZzP7ro-*3#M4f(_CFaVlXqFk=h)9u0S>BR3J zB9TmyPTyM2=(17>kVvMeRH~>a#`rO30C>H<#G(;HZhkH(1ehWvpi-%_y}QL@?(S1g z8Ji@&vrj%>U}Ln(xobktsjBkb*4PsOaFt2x*Z$!l0JLHWt=Nn|XLAskzz)&^`UicM zv4_Bdt>IwfGkkk3>#H>;SgJkQ7VxJIh%HDYQ_=#Y9q_o_`f7~{#1_P&5$5NDQhlWz z5NO4cel1=`!BXvsb61-jP{t;KhV8zAKHdJpOHr?R&gOtNIN^LAL zAQp{~&lk8DKQ+V`vn!_cyL+c!=4}gD-;8r~u+7c1YK+%LzJ2EM>RzU`Px$tVu*cR9J=WRXs=oVHke;(UQ|Jk)js2o5Vmk32kt4XbGHjE~33|a<=81BcjI8 z7NMoV$)O}T5Q-)j=>ntUFiDQ1=^EraJHxy0N~i9D559Zf_n!CRdGEdtaN)uQB{mZY zeHy&8(;#(%8HyU6<5=4wQEdH+-?D(?SbcAIXZReyF*j{)0{|4Ii+*3j;(`|*?;OJ6 z5XzMr>h%ZP9`kkz0iax|K~*)JUyNq10RRl+Lq3-=Wm3r~5nu@_0jjEjFCL-w{P-is zMq&^OB}h^Sv8#LZ_^grRICk7nm; z4jl`i{tZ9g`^FlL5d?**V*wL&fQ+DAsZk4{cEIcL7;7{}Kt_N`VIR#FS1cXMlf*)7{&*oP_oPe!x1=ffJ#6XS=JYiFDD~l|3JXmDGx60H^s%~`q+2w8c#ITwzrj@PHzAhob5CYkjCHc o0m~j#*D*!SU-(_PaPiOa1(QIGLzU?!k^lez07*qoM6N<$f{jqu4*&oF literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png new file mode 100644 index 0000000000000000000000000000000000000000..cebf46fade28a1842a8131310351bc1baa28d87a GIT binary patch literal 187 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}rJgR1ArY-_ zFCXM>P~c&`5dYYN?_toqh%VWJOu`uid;Q{Xp-*o-Nx07)#l!X6#Cl+}U8b@8R;DQ8O6U9Xukr kPd#f^qxmd;LBaLR$0w-mS5!Xi4|D*7r>mdKI;Vst07F|w-T(jq literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png new file mode 100644 index 0000000000000000000000000000000000000000..15c7cde5e8668a92b3d0f64ba22c7ef2df803884 GIT binary patch literal 214 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}6FglULn2y} z6C_v{Cy4YkP2`j441E!?`-T0k8~>hJEczPEB9krtw}0Ng=k`V&AkxfzB3DF5=nj>` zGZoX0#fj_-zMJIrR{b8Mf%i&Yk0ORDjsRwZz@t+ZzG+xEk+xYa1Kq~p>FVdQ&MBb@ E0E;+JAOHXW literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png new file mode 100644 index 0000000000000000000000000000000000000000..5fc1f43c05b745a8005c63e4da5c4d8f3da32340 GIT binary patch literal 199 zcmeAS@N?(olHy`uVBq!ia0vp^3LwnE1|*BCs=fdz#^NA%Cx&(BWL^R}jh-%!ArY;~ z2@zopr00a0< Au>b%7 literal 0 HcmV?d00001 diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index ceef1ec5f61b..383e0b8584ac 100644 --- a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json +++ b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json @@ -139,6 +139,18 @@ { "name": "idmusician" }, + { + "name": "idintern-cadet" + }, + { + "name": "idintern-med" + }, + { + "name": "idintern-service" + }, + { + "name": "idintern-tech" + }, { "name": "orange" },