diff --git a/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml b/Resources/Prototypes/Entities/Markers/Spawners/jobs.yml index 46792ab0f8..18f8dbd3e5 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/Entities/Objects/Devices/pda.yml b/Resources/Prototypes/Entities/Objects/Devices/pda.yml index 26cd85e56b..777aa6e138 100644 --- a/Resources/Prototypes/Entities/Objects/Devices/pda.yml +++ b/Resources/Prototypes/Entities/Objects/Devices/pda.yml @@ -77,6 +77,66 @@ - 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: Appearance + visuals: + - type: PDAVisualizer + state: pda-interntech + - type: Icon + state: pda-interntech + +- type: entity + parent: BasePDA + id: MedicalInternPDA + name: medical intern PDA + description: Why isn't it white? + components: + - type: PDA + id: MedicalInternIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-internmed + - type: Icon + state: pda-internmed + +- type: entity + parent: BasePDA + id: SecurityCadetPDA + name: security cadet PDA + description: Why isn't it red? + components: + - type: PDA + id: SecurityCadetIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-interncadet + - type: Icon + state: pda-interncadet + +- type: entity + parent: BasePDA + id: ServiceWorkerPDA + name: service worker PDA + description: Why isn't it gray? + components: + - type: PDA + id: ServiceWorkerIDCard + - type: Appearance + visuals: + - type: PDAVisualizer + state: pda-internservice + - type: Icon + state: pda-internservice + - type: entity parent: BasePDA id: ChefPDA @@ -526,7 +586,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 +595,7 @@ - type: PDAVisualizer state: pda-clear - type: Icon - state: pda-clear + state: pda-clear - type: entity parent: BasePDA @@ -551,4 +611,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 a0f7b344a9..6d8b433623 100644 --- a/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml +++ b/Resources/Prototypes/Entities/Objects/Misc/identification_cards.yml @@ -32,6 +32,54 @@ - type: PresetIdCard job: Assistant +- type: entity + parent: AssistantIDCard + id: TechnicalAssistantIDCard + name: technical assistant ID card + components: + - type: PresetIdCard + job: TechnicalAssistant + - type: Sprite + layers: + - state: default + - state: idintern-tech + +- type: entity + parent: AssistantIDCard + id: MedicalInternIDCard + name: medical intern ID card + components: + - type: PresetIdCard + job: MedicalIntern + - type: Sprite + layers: + - state: default + - state: idintern-med + +- type: entity + parent: AssistantIDCard + id: SecurityCadetIDCard + name: security cadet ID card + components: + - type: PresetIdCard + job: SecurityCadet + - type: Sprite + layers: + - state: default + - state: idintern-cadet + +- type: entity + parent: AssistantIDCard + id: ServiceWorkerIDCard + name: service worker ID card + components: + - type: PresetIdCard + job: ServiceWorker + - type: Sprite + layers: + - state: default + - state: idintern-service + - type: entity parent: IDCardStandard id: CaptainIDCard @@ -390,7 +438,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 0000000000..af40a3f437 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml @@ -0,0 +1,26 @@ +- type: job + id: ServiceWorker + name: "service worker" + startingGear: ServiceWorkerGear + departments: + - Civilian + icon: "ServiceWorker" + supervisors: "chefs, botanists, the bartender, and the head of personnel" + canBeAntag: false + access: + - Service + - Maintenance + - Bar + - Kitchen + +- type: startingGear + id: ServiceWorkerGear + equipment: + jumpsuit: ClothingUniformJumpsuitBartender + back: ClothingBackpackFilled + shoes: ClothingShoesColorBlack + id: ServiceWorkerPDA + 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 0000000000..0ab43c5154 --- /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: "station engineers, atmospheric technicians, and the chief engineer" + canBeAntag: false + access: + - Maintenance + - Engineering + - External + +- type: startingGear + id: TechnicalAssistantGear + equipment: + head: ClothingHeadHatWelding + jumpsuit: ClothingUniformJumpsuitColorYellow + back: ClothingBackpackEngineeringFilled + shoes: ClothingShoesBootsWork + id: TechnicalAssistantPDA + 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 0000000000..f83640173a --- /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: "medical doctors, chemists, and the chief medical officer" + canBeAntag: false + access: + - Medical + - Maintenance + +- type: startingGear + id: MedicalInternGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorWhite + back: ClothingBackpackMedicalFilled + shoes: ClothingShoesColorWhite + id: MedicalInternPDA + 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 0000000000..19b1e7a667 --- /dev/null +++ b/Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml @@ -0,0 +1,26 @@ +- type: job + id: SecurityCadet + name: "security cadet" + startingGear: SecurityCadetGear + departments: + - Civilian + - Security + icon: "SecurityCadet" + supervisors: "security officers, the warden, and the head of security" + canBeAntag: false + access: + - Security + - Brig + - Maintenance + +- type: startingGear + id: SecurityCadetGear + equipment: + jumpsuit: ClothingUniformJumpsuitColorRed + back: ClothingBackpackSecurityFilled + shoes: ClothingShoesBootsJack + id: SecurityCadetPDA + ears: ClothingHeadsetSecurity + innerclothingskirt: ClothingUniformJumpskirtColorRed + satchel: ClothingBackpackSatchelSecurityFilled + duffelbag: ClothingBackpackDuffelSecurityFilled diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png index 35cfeb5b97..d6e59ad74b 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png index b5545f11d5..49e17f9b44 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png b/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png index 2520e7c458..82eb9514e7 100644 Binary files a/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png and b/Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png differ 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 0000000000..7485976f95 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/MedicalIntern.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png new file mode 100644 index 0000000000..fbd9007eb1 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/SecurityCadet.png differ 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 0000000000..6dece6fb58 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/ServiceWorker.png differ 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 0000000000..7aabb46653 Binary files /dev/null and b/Resources/Textures/Interface/Misc/job_icons.rsi/TechnicalAssistant.png differ diff --git a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json index 0e362aad25..d07a834eb2 100644 --- a/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json +++ b/Resources/Textures/Interface/Misc/job_icons.rsi/meta.json @@ -111,6 +111,18 @@ }, { "name": "Musician" + }, + { + "name": "MedicalIntern" + }, + { + "name": "TechnicalAssistant" + }, + { + "name": "ServiceWorker" + }, + { + "name": "SecurityCadet" } ] } diff --git a/Resources/Textures/Objects/Devices/pda.rsi/meta.json b/Resources/Textures/Objects/Devices/pda.rsi/meta.json index c2fa2a0936..f92f0672ed 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 0000000000..5a54b5f797 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-interncadet.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png new file mode 100644 index 0000000000..ffcc4fb151 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-internmed.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png new file mode 100644 index 0000000000..09de4c5fb7 Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-internservice.png differ diff --git a/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png b/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png new file mode 100644 index 0000000000..1da79e471d Binary files /dev/null and b/Resources/Textures/Objects/Devices/pda.rsi/pda-interntech.png differ 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 0000000000..cebf46fade Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-cadet.png differ 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 0000000000..15c7cde5e8 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-med.png differ 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 0000000000..5fc1f43c05 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-service.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png new file mode 100644 index 0000000000..f7ed302b23 Binary files /dev/null and b/Resources/Textures/Objects/Misc/id_cards.rsi/idintern-tech.png differ diff --git a/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json b/Resources/Textures/Objects/Misc/id_cards.rsi/meta.json index ceef1ec5f6..383e0b8584 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" },