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.

Sign up for GitHub

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

Tourist #1037

Closed
wants to merge 12 commits into from
Closed

Tourist #1037

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
f691377
do the chnage
DangerRevolution Mar 17, 2024
1d8d57a
Revert "do the chnage"
DangerRevolution Mar 17, 2024
a3824d3
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 17, 2024
f2fdf5d
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 19, 2024
f779908
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 22, 2024
3c1f314
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 24, 2024
ff7a07e
Merge branch 'DeltaV-Station:master' into master
DangerRevolution Mar 29, 2024
0d5fc16
make the role & the locale
DangerRevolution Mar 30, 2024
1cd4ab2
fix playtime tracker error
DangerRevolution Mar 30, 2024
8d2f7ae
fix tourist jumpsuit error
DangerRevolution Mar 30, 2024
611848e
fix the other linter error
DangerRevolution Mar 31, 2024
bd600fc
fix wrong tourist PDA
DangerRevolution Mar 31, 2024
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
2 changes: 2 additions & 0 deletions Resources/Locale/en-US/deltav/entities/pda.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
ent-TouristPDA = tourist pda
.desc = Sight Seeing
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-description.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
job-description-medical-borg = Half-human, Half-machine. Follow your laws, serve the crew, and assist the medical department.
job-description-tourist = Something interesting.
1 change: 1 addition & 0 deletions Resources/Locale/en-US/deltav/job/job-names.ftl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
job-name-medical-borg = Medical Cyborg
job-name-tourist = Tourist
15 changes: 15 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,3 +13,18 @@
state: medical
- sprite: Mobs/Silicon/chassis.rsi
state: medical_e

- type: entity
parent: SpawnPointJobBase
id: SpawnPointTourist
name: Tourist
components:
- type: SpawnPoint
job_id: Tourist
- type: Sprite
layers:
- type: Sprite
layers:
- state: green
- state: passenger

10 changes: 10 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Devices/pda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,3 +52,13 @@
whitelist:
tags:
- Write

- type: entity
parent: PassengerPDA
id: TouristPDA
name: tourist PDA
description: sight seeing
components:
- type: Pda
id: TouristIDCard
state: pda
11 changes: 11 additions & 0 deletions Resources/Prototypes/DeltaV/Entities/Objects/Misc/identification_cards.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
- type: entity
parent: IDCardStandard
id: TouristIDCard
name: tourist ID card
components:
- type: Sprite
layers:
- state: default
- state: idpassenger
- type: PresetIdCard
job: Tourist
20 changes: 20 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/Jobs/Civilian/tourist.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
- type: job
id: Tourist
name: job-name-tourist
description: job-description-tourist
playTimeTracker: JobTourist
startingGear: TouristGear
icon: "JobIconPassenger"
supervisors: job-supervisors-everyone

- type: startingGear
id: TouristGear
equipment:
jumpsuit: ClothingUniformJumpsuitLostTourist
back: ClothingBackpackFilled
shoes: ClothingShoesTourist
id: TouristPDA
ears: ClothingHeadsetGrey
innerClothingSkirt: ClothingUniformJumpsuitLostTourist # TODO: Check this works with Harpies.
satchel: ClothingBackpackSatchelFilled
duffelbag: ClothingBackpackDuffelFilled
3 changes: 3 additions & 0 deletions Resources/Prototypes/DeltaV/Roles/play_time_trackers.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@

- type: playTimeTracker
id: JobMedicalBorg

- type: playTimeTracker
id: JobTourist
1 change: 1 addition & 0 deletions Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
- Tourist # DeltaV - Tourist, see resources/prototypes/deltav/roles/jobs/civilian/tourist.yml

- type: department
id: Command
Expand Down
Loading