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

Jump to bottom

Update dotnet version #12

Merged
merged 3 commits into from
May 29, 2024
Merged

Update dotnet version #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9e2493
Epistemics is apparently hardcoded in the server's database
VMSolidus May 29, 2024
08af5d8
yml fixes
VMSolidus May 29, 2024
415347b
Update global.json
VMSolidus May 29, 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: 1 addition & 1 deletion Resources/Prototypes/Catalog/uplink_catalog.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,7 +1177,7 @@
conditions:
- !type:BuyerDepartmentCondition
whitelist:
- Science
- Epistemics

- type: listing
id: uplinkProximityMine
Expand Down
4 changes: 2 additions & 2 deletions Resources/Prototypes/Entities/Structures/Doors/Airlocks/airlocks.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
- type: Sprite
sprite: Structures/Doors/Airlocks/Standard/science.rsi
- type: PaintableAirlock
department: Science
department: Epistemics

- type: entity
parent: Airlock
Expand Down Expand Up @@ -247,7 +247,7 @@
- type: Sprite
sprite: Structures/Doors/Airlocks/Glass/science.rsi
- type: PaintableAirlock
department: Science
department: Epistemics

- type: entity
parent: AirlockGlass
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Entities/Structures/Doors/airlock_groups.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,6 @@
freezer: Civilian
maintenance: Civilian
medical: Medical
science: Science
science: Epistemics
security: Security
virology: Medical
6 changes: 3 additions & 3 deletions Resources/Prototypes/Loadouts/Jobs/science.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
jobs:
- Scientist
- !type:LoadoutDepartmentTimeRequirement
department: Science
department: Epistemics
min: 216000 # 60 hours
items:
- ClothingUniformJumpskirtSeniorResearcher
Expand All @@ -23,7 +23,7 @@
jobs:
- Scientist
- !type:LoadoutDepartmentTimeRequirement
department: Science
department: Epistemics
min: 216000 # 60 hours
items:
- ClothingUniformJumpsuitSeniorResearcher
Expand Down Expand Up @@ -66,7 +66,7 @@
jobs:
- Scientist
- !type:LoadoutDepartmentTimeRequirement
department: Science
department: Epistemics
min: 216000 # 60 hours
items:
- ClothingOuterCoatLabSeniorResearcher
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Civilian/chaplain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
playTimeTracker: JobChaplain
# requirements:
# - !type:DepartmentTimeRequirement
# department: Science
# department: Epistemics
# time: 14400 4 hours
startingGear: ChaplainGear
icon: "JobIconChaplain"
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/Science/research_assistant.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
playTimeTracker: JobResearchAssistant
# requirements:
# - !type:DepartmentTimeRequirement # DeltaV - Removes time limit
# department: Science
# department: Epistemics
# time: 54000 #15 hrs
# inverted: true # stop playing intern if you're good at science!
startingGear: ResearchAssistantGear
Expand Down
2 changes: 1 addition & 1 deletion Resources/Prototypes/Roles/Jobs/departments.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@
- Brigmedic # DeltaV - Brigmedic, see Resources/Prototypes/DeltaV/Roles/Jobs/Security/brigmedic.yml

- type: department
id: Science
id: Epistemics
description: department-Science-description
color: "#D381C9"
roles:
Expand Down
2 changes: 1 addition & 1 deletion global.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"sdk": {
"version": "8.0.100",
"rollForward": "disable"
"rollForward": "patch"
}
}
Loading