Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nanotrasen Interns #8006

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 34 additions & 2 deletions Resources/Prototypes/Entities/Markers/Spawners/jobs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -258,7 +290,7 @@
layers:
- state: green
- state: engineer

- type: entity
id: SpawnPointAtmos
parent: SpawnPointJobBase
Expand All @@ -270,7 +302,7 @@
layers:
- state: green
- state: atmospherics

# Medical

- type: entity
Expand Down
66 changes: 63 additions & 3 deletions Resources/Prototypes/Entities/Objects/Devices/pda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -535,7 +595,7 @@
- type: PDAVisualizer
state: pda-clear
- type: Icon
state: pda-clear
state: pda-clear

- type: entity
parent: BasePDA
Expand All @@ -551,4 +611,4 @@
state: pda-syndi
- type: Icon
state: pda-syndi

Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -390,7 +438,7 @@
interfaces:
- key: enum.AgentIDCardUiKey.Key
type: AgentIDCardBoundUserInterface

- type: entity
parent: IDCardStandard
id: AtmosIDCard
Expand Down
26 changes: 26 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Civilian/service_worker.yml
Original file line number Diff line number Diff line change
@@ -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
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Medical/medical_intern.yml
Original file line number Diff line number Diff line change
@@ -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
26 changes: 26 additions & 0 deletions Resources/Prototypes/Roles/Jobs/Security/security_cadet.yml
Original file line number Diff line number Diff line change
@@ -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
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Bartender.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Botanist.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified Resources/Textures/Interface/Misc/job_icons.rsi/Chef.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,18 @@
},
{
"name": "Musician"
},
{
"name": "MedicalIntern"
},
{
"name": "TechnicalAssistant"
},
{
"name": "ServiceWorker"
},
{
"name": "SecurityCadet"
}
]
}
12 changes: 12 additions & 0 deletions Resources/Textures/Objects/Devices/pda.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -144,6 +144,18 @@
},
{
"name": "pda-musician"
},
{
"name": "pda-interncadet"
},
{
"name": "pda-internmed"
},
{
"name": "pda-internservice"
},
{
"name": "pda-interntech"
}
]
}
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 12 additions & 0 deletions Resources/Textures/Objects/Misc/id_cards.rsi/meta.json
Original file line number Diff line number Diff line change
Expand Up @@ -139,6 +139,18 @@
{
"name": "idmusician"
},
{
"name": "idintern-cadet"
},
{
"name": "idintern-med"
},
{
"name": "idintern-service"
},
{
"name": "idintern-tech"
},
{
"name": "orange"
},
Expand Down