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

Medical Conditions #1343

Merged
merged 26 commits into from
Jun 12, 2024
Merged

Medical Conditions #1343

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
beb3144
Medical Conditions progress
Markh3tr May 29, 2024
8d3df2f
Merge branch 'GregTechCEu:1.20.1' into medical-conditions
Markh3tr May 30, 2024
6136ce8
More MedicalCondition Shit
Markh3tr May 31, 2024
cf085ad
Merge remote-tracking branch 'origin/medical-conditions' into medical…
Markh3tr May 31, 2024
71133e2
Merge branch 'refs/heads/1.20.1' into medical-conditions
Markh3tr May 31, 2024
6fb74e9
removed non-existing import
Markh3tr May 31, 2024
def1b1a
shit actually does smth now
Markh3tr Jun 1, 2024
14c7400
Merge branch 'refs/heads/1.20.1' into sc/medical-conditions-help
screret Jun 7, 2024
9b030ea
complete work on medical conditions
screret Jun 7, 2024
98288ec
add more commands for medical conditions
screret Jun 7, 2024
507e0a3
run datagen
screret Jun 7, 2024
0dfbf18
add death messages for all medical conditions
screret Jun 7, 2024
dd845c6
apply spotless
screret Jun 7, 2024
bb48e09
Merge pull request #1 from GregTechCEu/sc/medical-conditions-help
Markh3tr Jun 7, 2024
154407e
add KJS accessors for medical conditions to allow creating new ones i…
screret Jun 8, 2024
295e4f7
add hunger as a symptom
screret Jun 8, 2024
05091ec
add carbon monoxide poisoning
screret Jun 8, 2024
887918d
mixed system?
screret Jun 8, 2024
38fdc49
nvm no mixed system
screret Jun 8, 2024
1e56471
add environmental hazards (toggleable in config)
screret Jun 8, 2024
3002526
add air scrubbers for cleaning environmental hazards
screret Jun 8, 2024
7bc1c63
add particles
screret Jun 8, 2024
9c71342
add vents for moving environmental hazards.
screret Jun 8, 2024
9ad0825
localized hazards (e.g. radiation)
screret Jun 9, 2024
e34129a
localized hazards shouldn't spread by default
screret Jun 11, 2024
e4a1d98
Merge branch '1.20.1' into medical-conditions
screret Jun 12, 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
18 changes: 18 additions & 0 deletions src/generated/resources/assets/gtceu/compass/nodes/machines/air_scrubber.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
{
"button_texture": {
"type": "item",
"res": "gtceu:lv_air_scrubber"
},
"items": [
"gtceu:lv_air_scrubber",
"gtceu:mv_air_scrubber",
"gtceu:hv_air_scrubber",
"gtceu:ev_air_scrubber"
],
"page": "gtceu:machines/air_scrubber",
"position": [
-100,
200
],
"section": "gtceu:machines"
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/battery_buffer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
],
"page": "gtceu:machines/battery_buffer",
"position": [
-150,
-100,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/block_breaker.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"page": "gtceu:machines/block_breaker",
"position": [
-350,
-300,
300
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/charger.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
],
"page": "gtceu:machines/charger",
"position": [
-100,
-50,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/combustion.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"page": "gtceu:machines/combustion",
"position": [
-100,
-50,
200
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/converter.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
],
"page": "gtceu:machines/converter",
"position": [
-300,
-250,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/crate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
],
"page": "gtceu:machines/crate",
"position": [
-300,
-250,
350
],
"section": "gtceu:machines"
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/compass/nodes/machines/creative_chest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
],
"page": "gtceu:machines/creative_chest",
"position": [
-50,
300
-400,
350
],
"section": "gtceu:machines"
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/creative_energy.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"page": "gtceu:machines/creative_energy",
"position": [
-150,
-100,
300
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/creative_tank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"page": "gtceu:machines/creative_tank",
"position": [
-100,
-50,
300
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/drum.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"page": "gtceu:machines/drum",
"position": [
-250,
-200,
350
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/fisher.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"page": "gtceu:machines/fisher",
"position": [
-400,
-350,
300
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/gas_turbine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"page": "gtceu:machines/gas_turbine",
"position": [
-400,
-350,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/item_collector.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
],
"page": "gtceu:machines/item_collector",
"position": [
-200,
-150,
300
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/ld_fluid_pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"page": "gtceu:machines/ld_fluid_pipeline",
"position": [
-200,
-150,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/ld_item_pipeline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
],
"page": "gtceu:machines/ld_item_pipeline",
"position": [
-250,
-200,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/miner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
],
"page": "gtceu:machines/miner",
"position": [
-300,
-250,
300
],
"section": "gtceu:machines"
Expand Down
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/compass/nodes/machines/pump.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
],
"page": "gtceu:machines/pump",
"position": [
-50,
250
-400,
300
],
"section": "gtceu:machines"
}
4 changes: 2 additions & 2 deletions src/generated/resources/assets/gtceu/compass/nodes/machines/steam_turbine.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
],
"page": "gtceu:machines/steam_turbine",
"position": [
-50,
200
-400,
250
],
"section": "gtceu:machines"
}
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/super_chest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"page": "gtceu:machines/super_chest",
"position": [
-400,
-350,
350
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/super_tank.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
],
"page": "gtceu:machines/super_tank",
"position": [
-350,
-300,
350
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/transformer.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
],
"page": "gtceu:machines/transformer",
"position": [
-350,
-300,
250
],
"section": "gtceu:machines"
Expand Down
2 changes: 1 addition & 1 deletion src/generated/resources/assets/gtceu/compass/nodes/machines/world_accelerator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
],
"page": "gtceu:machines/world_accelerator",
"position": [
-250,
-200,
300
],
"section": "gtceu:machines"
Expand Down
Loading
Loading