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

Фиксы спавнов стража клинка и ИИ #4

Merged
merged 4 commits into from
Dec 15, 2024
Merged

Фиксы спавнов стража клинка и ИИ #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6979c6b
fix role StationAi on CorvaxPaper
Shegare Dec 3, 2024
522c5be
resprite SpawnPointJediNt
Shegare Dec 8, 2024
26ae11f
add SpawnPointJediNt for maps
Shegare Dec 8, 2024
1e23467
Merge branch 'master' into Bug-Fix
Shegare Dec 13, 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
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/bagel.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -131160,6 +131160,13 @@ entities:
- type: Transform
pos: -9.5,-27.5
parent: 60
- proto: SpawnPointJediNt
entities:
- uid: 23891
components:
- type: Transform
pos: -27.5,-14.5
parent: 60
- proto: SpawnPointLatejoin
entities:
- uid: 4702
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/box.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143682,6 +143682,13 @@ entities:
- type: Transform
pos: 6.5,-34.5
parent: 8364
- proto: SpawnPointJediNt
entities:
- uid: 27922
components:
- type: Transform
pos: 11.5,33.5
parent: 8364
- proto: SpawnPointLatejoin
entities:
- uid: 12515
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/cog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170496,6 +170496,13 @@ entities:
- type: Transform
pos: 45.5,20.5
parent: 12
- proto: SpawnPointJediNt
entities:
- uid: 31047
components:
- type: Transform
pos: -33.5,32.5
parent: 12
- proto: SpawnPointLawyer
entities:
- uid: 30266
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121145,6 +121145,13 @@ entities:
- type: Transform
pos: -18.5,-26.5
parent: 2
- proto: SpawnPointJediNt
entities:
- uid: 21452
components:
- type: Transform
pos: -8.5,29.5
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 5022
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/fland.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189141,6 +189141,13 @@ entities:
- type: Transform
pos: 4.5,12.5
parent: 13329
- proto: SpawnPointJediNt
entities:
- uid: 35822
components:
- type: Transform
pos: 31.5,18.5
parent: 13329
- proto: SpawnPointLatejoin
entities:
- uid: 13242
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/marathon.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117063,6 +117063,13 @@ entities:
- type: Transform
pos: -31.5,9.5
parent: 30
- proto: SpawnPointJediNt
entities:
- uid: 18082
components:
- type: Transform
pos: -33.5,53.5
parent: 30
- proto: SpawnPointLatejoin
entities:
- uid: 3656
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/meta.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137421,6 +137421,13 @@ entities:
- type: Transform
pos: -25.5,27.5
parent: 5350
- proto: SpawnPointJediNt
entities:
- uid: 6164
components:
- type: Transform
pos: 5.5,39.5
parent: 5350
- proto: SpawnPointLatejoin
entities:
- uid: 5046
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/oasis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162003,6 +162003,13 @@ entities:
- type: Transform
pos: 23.5,-3.5
parent: 2
- proto: SpawnPointJediNt
entities:
- uid: 29616
components:
- type: Transform
pos: 35.5,-15.5
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 23201
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/omega.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72489,6 +72489,13 @@ entities:
- type: Transform
pos: -21.5,-8.5
parent: 4812
- proto: SpawnPointJediNt
entities:
- uid: 13709
components:
- type: Transform
pos: -25.5,11.5
parent: 4812
- proto: SpawnPointLatejoin
entities:
- uid: 4707
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/packed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77727,6 +77727,13 @@ entities:
- type: Transform
pos: 5.5,-4.5
parent: 2
- proto: SpawnPointJediNt
entities:
- uid: 15085
components:
- type: Transform
pos: 30.5,25.5
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 15
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/saltern.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57840,6 +57840,13 @@ entities:
- type: Transform
pos: -18.5,-11.5
parent: 31
- proto: SpawnPointJediNt
entities:
- uid: 3424
components:
- type: Transform
pos: -3.5,13.5
parent: 31
- proto: SpawnPointLatejoin
entities:
- uid: 9749
Expand Down
7 changes: 7 additions & 0 deletions Resources/Maps/_Stories/train.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89204,6 +89204,13 @@ entities:
- type: Transform
pos: -3.5,-54.5
parent: 2
- proto: SpawnPointJediNt
entities:
- uid: 13890
components:
- type: Transform
pos: -4.5,-358.5
parent: 2
- proto: SpawnPointLatejoin
entities:
- uid: 13344
Expand Down
28 changes: 14 additions & 14 deletions Resources/Prototypes/_Stories/Entities/Markers/Spawners/jobs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,3 @@
# JediNt

- type: entity
id: SpawnPointJediNt
parent: SpawnPointJobBase
name: jedint
components:
- type: SpawnPoint
job_id: JediNt
- type: Sprite
layers:
- state: green
- state: hos

# Base

- type: entity
Expand All @@ -24,3 +10,17 @@
spawn_type: Job
- type: Sprite
sprite: _Stories/Markers/jobs.rsi

# JediNt

- type: entity
id: SpawnPointJediNt
parent: SpawnPointJobBaseStories
name: jedint
components:
- type: SpawnPoint
job_id: JediNt
- type: Sprite
layers:
- state: green
- state: jedint
4 changes: 3 additions & 1 deletion Resources/Prototypes/_Stories/Maps/paper.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,6 @@
ResearchDirector: [ 1, 1 ]
Scientist: [ 2, 3 ]
ResearchAssistant: [ 2, 2 ]
Borg: [ 2, 2 ]
# security
HeadOfSecurity: [ 1, 1 ]
Warden: [ 1, 1 ]
Expand All @@ -65,6 +64,9 @@
Quartermaster: [ 1, 1 ]
SalvageSpecialist: [ 3, 3 ]
CargoTechnician: [ 2, 3 ]
# silicon
StationAi: [ 1, 1 ]
Borg: [ 2, 2 ]
#stories content
JediNt: [ 1, 1 ]

Binary file added Resources/Textures/_Stories/Markers/jobs.rsi/jedint.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
3 changes: 3 additions & 0 deletions Resources/Textures/_Stories/Markers/jobs.rsi/meta.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
},
{
"name": "doctor"
},
{
"name": "jedint"
}
]
}
Loading