Skip to content

[Experimental] Routine update 8 #207

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

Open
wants to merge 94 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
94 commits
Select commit Hold shift + click to select a range
45a6e10
Brand Cearal Mod - remove charges
TheGoatGod Sep 4, 2024
1f1aee7
Brand Cereal mod - update description
TheGoatGod Sep 4, 2024
9f31fa5
Brand Cereal mod - update charges for drinks
TheGoatGod Sep 4, 2024
63c00d9
Brand Cereal mod - add charges to nut milk
TheGoatGod Sep 4, 2024
bd04e61
move pks no mods to shelved mods
TheGoatGod Sep 5, 2024
d0da68b
update nocts cata mod
TheGoatGod Sep 5, 2024
b07d461
update arcana
TheGoatGod Sep 5, 2024
9e9b8bd
update MST Extra
TheGoatGod Sep 5, 2024
e414d9f
update dorf life
TheGoatGod Sep 5, 2024
a0c8094
update mining mod
TheGoatGod Sep 5, 2024
cd0e1d0
update tankmod revived
TheGoatGod Sep 8, 2024
ad54a8a
move nechronica redux to maintained mods
TheGoatGod Sep 8, 2024
7de776c
lint
TheGoatGod Sep 8, 2024
f8083e8
update primitive survival
TheGoatGod Sep 8, 2024
6e84ff6
update nechronica redux
TheGoatGod Sep 8, 2024
4c3d0a8
Primitive mod move seed rice
TheGoatGod Sep 15, 2024
b21fe92
primitive mod variants update
TheGoatGod Sep 15, 2024
dac5215
primitive mod remove charges
TheGoatGod Sep 15, 2024
c6e74c6
primitive mod remove bashing from generic materials
TheGoatGod Sep 15, 2024
f3a5ee1
primitive mod add activity level
TheGoatGod Sep 15, 2024
0381afa
Extract tea from primitive survival mod
TheGoatGod Sep 15, 2024
7a56a55
Update Item_groups.json
TheGoatGod Sep 15, 2024
d80d109
primitive mod update
TheGoatGod Sep 15, 2024
a3f3fa2
Tea mod update
TheGoatGod Sep 15, 2024
37c6a26
bio_mod update
TheGoatGod Sep 15, 2024
1e041af
Blazemod variants update
TheGoatGod Sep 15, 2024
de13764
Update blaze_override.json
TheGoatGod Sep 15, 2024
b5aba1f
Blazemod update time
TheGoatGod Sep 15, 2024
a6e6926
Blazemod update armor
TheGoatGod Sep 15, 2024
d0f67aa
Update blaze_weapons_parts.json
TheGoatGod Sep 15, 2024
499203a
Blazemod update
TheGoatGod Sep 16, 2024
35c11ae
move blaze mod and blaze mod extended
TheGoatGod Sep 16, 2024
2adcff4
move broken mods out of folder
TheGoatGod Sep 16, 2024
e18bd90
blazemod extension update still broken
TheGoatGod Sep 16, 2024
7317b4f
Animatronics update
TheGoatGod Sep 16, 2024
05fc12b
Animatronics update
TheGoatGod Sep 16, 2024
e8b2123
dark skies above update and move to broken mods
TheGoatGod Sep 16, 2024
8e09a7d
CRT_EXPANSION update
TheGoatGod Sep 16, 2024
e6ab59a
Craft_gunpowder update
TheGoatGod Sep 16, 2024
433b96d
update and move deoxymod
TheGoatGod Sep 16, 2024
9d39edf
Update recipes.json
TheGoatGod Sep 23, 2024
9e7ed39
move broken mods
TheGoatGod Sep 23, 2024
3f9569f
update primitive survival mod
TheGoatGod Sep 29, 2024
c758277
lint
TheGoatGod Sep 29, 2024
7f5b045
update primitive survival mod
TheGoatGod Sep 30, 2024
90a9439
Update Primitive-readme.md
TheGoatGod Sep 30, 2024
9f49920
primitive survival update
TheGoatGod Oct 1, 2024
9fd2ab1
lint
TheGoatGod Oct 1, 2024
cc1e68c
primitive survival mod update
TheGoatGod Oct 1, 2024
5344011
primitive survival mod update
TheGoatGod Oct 1, 2024
f92e5d4
Update Requirements.json
TheGoatGod Oct 1, 2024
851a9f2
primitive survival mod update
TheGoatGod Oct 1, 2024
3cd6a84
primitive survival mod update
TheGoatGod Oct 1, 2024
f044eaa
primitive mod update to 0.4
TheGoatGod Oct 1, 2024
e70ee96
primitive survival mod update
TheGoatGod Oct 2, 2024
3ed4aa9
primitive survival mod update
TheGoatGod Oct 2, 2024
5106d00
primitive survival update
TheGoatGod Oct 2, 2024
71ced1b
lint
TheGoatGod Oct 2, 2024
e26a089
Primitive survival mod update
TheGoatGod Oct 2, 2024
94e2527
primitive survival update
TheGoatGod Oct 4, 2024
298e2b4
Update cloth_clothing.json
TheGoatGod Oct 4, 2024
61a1e9c
primitive survival update
TheGoatGod Oct 4, 2024
52910ab
primitive survival update
TheGoatGod Oct 6, 2024
8fbd9e0
primitive survival update
TheGoatGod Oct 7, 2024
25131a2
primitive survival update
TheGoatGod Oct 7, 2024
2ac74a3
primitive survival update 0.5
TheGoatGod Oct 7, 2024
2de47ff
primitive survival update
TheGoatGod Oct 7, 2024
afd9f1b
primitive survival update
TheGoatGod Oct 7, 2024
cd11ee4
Update Primitive-readme.md
TheGoatGod Oct 7, 2024
1224deb
primitive survival partial update
TheGoatGod Oct 8, 2024
5daece5
primitive survival update mushrooms
TheGoatGod Oct 13, 2024
0bb5559
primitive survival update mushrooms 2
TheGoatGod Oct 13, 2024
1b5a8c7
primitive survival mushroom update 3
TheGoatGod Oct 13, 2024
47debf4
primitive survival mushroom update 4
TheGoatGod Oct 13, 2024
896550d
primitive survivial update
TheGoatGod Oct 14, 2024
9046bd2
Update Requirements_override.json
TheGoatGod Oct 14, 2024
a7a6ad0
primitive survival update
TheGoatGod Oct 14, 2024
2e4607b
expansion tefnut update
TheGoatGod Oct 15, 2024
ce46cb3
Delete modinfo.json
TheGoatGod Oct 27, 2024
f13b307
expansion tefnut update part 1
TheGoatGod Oct 28, 2024
9852824
Update kitsune.json
TheGoatGod Oct 28, 2024
630d663
lint
TheGoatGod Nov 19, 2024
20c1dcc
expansion tefnut update
TheGoatGod Nov 19, 2024
f1172e7
move expansion tefnut to broken mods
TheGoatGod Nov 26, 2024
3103586
Dorf life update from github
TheGoatGod Nov 26, 2024
97478c7
update stamina regen buff from github
TheGoatGod Nov 26, 2024
0a2ac6b
Update modinfo.json
TheGoatGod Nov 26, 2024
8ea2c6a
nocts cata mod update from github
TheGoatGod Nov 26, 2024
37f8583
arcana update from github
TheGoatGod Nov 26, 2024
fa46670
medieval mod reborn update from github
TheGoatGod Nov 26, 2024
c7bfb99
tankmod revived update from github
TheGoatGod Nov 26, 2024
f829856
remove mod due to cdda having this as content
TheGoatGod Dec 5, 2024
86f8a72
Update Regional_map_settings.json
TheGoatGod Dec 17, 2024
a75a952
Primitive survival mod update for 0.H
TheGoatGod Dec 17, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
"price": "25 USD",
"price_postapoc": "2 USD",
"material": [ "wheat", "fruit" ],
"charges": 2,
"flags": [ "USE_EAT_VERB", "EATEN_COLD" ],
"vitamins": [ [ "vitA", 4 ], [ "iron", 12 ] ],
"fun": 20
Expand All @@ -38,7 +37,6 @@
"price": "50 USD",
"price_postapoc": "275 cent",
"material": [ "wheat", "fruit" ],
"charges": 4,
"flags": [ "USE_EAT_VERB", "EATEN_COLD" ],
"vitamins": [ [ "vitA", 4 ], [ "iron", 12 ] ],
"fun": 20
Expand All @@ -60,7 +58,6 @@
"price": "100 USD",
"price_postapoc": "4 USD",
"material": [ "wheat", "fruit" ],
"charges": 6,
"flags": [ "USE_EAT_VERB", "EATEN_COLD" ],
"vitamins": [ [ "vitA", 4 ], [ "iron", 12 ] ],
"fun": 20
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
"quench": -2,
"calories": 400,
"healthy": 4,
"charges": 12,
"spoils_in": "720 days",
"material": [ "wheat" ],
"flags": [ "USE_EAT_VERB", "EATEN_COLD", "EATEN_HOT", "TARDIS" ],
Expand All @@ -39,7 +38,6 @@
"quench": -2,
"calories": 600,
"healthy": 4,
"charges": 28,
"spoils_in": "720 days",
"material": [ "wheat" ],
"flags": [ "USE_EAT_VERB", "EATEN_COLD", "EATEN_HOT", "TARDIS" ],
Expand All @@ -63,7 +61,6 @@
"quench": -2,
"calories": 800,
"healthy": 4,
"charges": 28,
"spoils_in": "720 days",
"material": [ "wheat" ],
"flags": [ "USE_EAT_VERB", "EATEN_COLD", "EATEN_HOT", "TARDIS" ],
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@
"id": "Weetabix_cereal8",
"type": "COMESTIBLE",
"name": { "str_sp": "Weetabix Oatibix Flakes Cereal" },
"description": "Weetabix Oatibix.",
"description": "Weetabix Oatibix flakes.",
"comestible_type": "FOOD",
"copy-from": "cereal_medium"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@
"type": "COMESTIBLE",
"copy-from": "cereal_drink",
"name": { "str_sp": "Fuel 10K liquid breakfast strawberry drink" },
"description": "A 330ml Fuel 10K liquid breakfast strawberry drink."
"description": "A 330ml Fuel 10K liquid breakfast strawberry drink.",
"charges": 4
},
{
"id": "fuel10k2",
"type": "COMESTIBLE",
"copy-from": "cereal_drink",
"name": { "str_sp": "Fuel 10K liquid breakfast vanilla drink" },
"description": "A 330ml Fuel 10K liquid breakfast vanilla drink."
"description": "A 330ml Fuel 10K liquid breakfast vanilla drink.",
"charges": 4
},
{
"id": "fuel10k3",
"type": "COMESTIBLE",
"copy-from": "cereal_drink",
"name": { "str_sp": "Fuel 10K liquid breakfast chocolate drink" },
"description": "A 330ml Fuel 10K liquid breakfast chocolate drink."
"description": "A 330ml Fuel 10K liquid breakfast chocolate drink.",
"charges": 4
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -4,20 +4,23 @@
"type": "COMESTIBLE",
"copy-from": "cereal_drink",
"name": { "str_sp": "Up and go liquid breakfast chocolate drink" },
"description": "A 330ml up and go liquid breakfast chocolate drink."
"description": "A 330ml up and go liquid breakfast chocolate drink.",
"charges": 4
},
{
"id": "upandGo2",
"type": "COMESTIBLE",
"copy-from": "cereal_drink",
"name": { "str_sp": "Up and go breakfast drink banana and honey" },
"description": "A 330ml Up and Go breakfast drink banana and honey."
"description": "A 330ml Up and Go breakfast drink banana and honey.",
"charges": 4
},
{
"id": "upandGo3",
"type": "COMESTIBLE",
"copy-from": "cereal_drink1",
"name": { "str_sp": "Up and go breakfast chocolate drink" },
"description": "A 250ml Up and Go breakfast chocolate drink."
"description": "A 250ml Up and Go breakfast chocolate drink.",
"charges": 4
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@
"symbol": "%",
"spoils_in": "90 day",
"quench": -4,
"charges": 4,
"calories": 998,
"price": "350 cent",
"price_postapoc": "5 USD",
Expand All @@ -35,7 +34,6 @@
"color": "white",
"symbol": "%",
"quench": -4,
"charges": 4,
"calories": 870,
"price": "350 cent",
"price_postapoc": "5 USD",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,27 +4,31 @@
"type": "COMESTIBLE",
"copy-from": "cereal_drink1",
"name": { "str_sp": "Weetabix on the go chocolate drink" },
"description": "A 250ml Weetabix on the go chocolate drink."
"description": "A 250ml Weetabix on the go chocolate drink.",
"charges": 4
},
{
"id": "weetabix2",
"type": "COMESTIBLE",
"copy-from": "cereal_drink1",
"name": { "str_sp": "Weetabix On The Go vanilla drink" },
"description": "A 250ml Weetabix On The Go vanilla drink."
"description": "A 250ml Weetabix On The Go vanilla drink.",
"charges": 4
},
{
"id": "weetabix3",
"type": "COMESTIBLE",
"copy-from": "cereal_drink1",
"name": { "str_sp": "Weetabix on the go strawberry drink" },
"description": "A 250ml Weetabix on the go strawberry drink."
"description": "A 250ml Weetabix on the go strawberry drink.",
"charges": 4
},
{
"id": "weetabix4",
"type": "COMESTIBLE",
"copy-from": "cereal_drink1",
"name": { "str_sp": "Weetabix on the go banana drink" },
"description": "A 250ml Weetabix on the go banana drink."
"description": "A 250ml Weetabix on the go banana drink.",
"charges": 4
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"quench": -2,
"healthy": 4,
"calories": 800,
"charges": 28,
"spoils_in": "720 days",
"container": "cereal_medium",
"material": [ "wheat", "fruit" ],
Expand Down
10 changes: 2 additions & 8 deletions data/Goats_mods/Brand_Cereal_mod/comestibles/nuts.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"description": "One of the most versatile nuts out there, almonds are good both for snacking and cooking. These are plain.",
"price": "120 cent",
"material": [ "veggy" ],
"charges": 6,
"fun": 2
},
{
Expand All @@ -32,7 +31,6 @@
"description": "Ah, pecans. The crown jewel of nuts! These are plain.",
"price": "130 cent",
"material": [ "veggy" ],
"charges": 6,
"fun": 2
},
{
Expand All @@ -50,7 +48,6 @@
"description": "A dark, brain-shaped nut that is vaguely meat-like in flavor. These are plain.",
"price": "125 cent",
"material": [ "veggy" ],
"charges": 6,
"fun": 1
},
{
Expand All @@ -68,7 +65,6 @@
"description": "Lung-shaped nuts that are a staple of any good trail mix. These are plain.",
"price": "120 cent",
"material": [ "veggy" ],
"charges": 6,
"fun": 1
},
{
Expand All @@ -86,7 +82,6 @@
"quench": -1,
"price": "120 cent",
"material": [ "veggy" ],
"charges": 6,
"fun": 1
},
{
Expand All @@ -105,6 +100,7 @@
"nutrition": 4,
"price": "228 cent",
"material": [ "veggy" ],
"charges": 6,
"phase": "liquid",
"flags": [ "EATEN_COLD" ]
},
Expand All @@ -123,7 +119,6 @@
"spoils_in": "40 days",
"price": "2 USD",
"material": [ "veggy" ],
"charges": 4,
"fun": -2
},
{
Expand All @@ -140,7 +135,6 @@
"nutrition": 17,
"quench": -1,
"healthy": 3,
"material": [ "veggy", "junk" ],
"charges": 4
"material": [ "veggy", "junk" ]
}
]
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
"quench": -2,
"healthy": 4,
"calories": 800,
"charges": 28,
"spoils_in": "720 days",
"container": "cereal_medium",
"material": [ "wheat" ],
Expand Down
Loading
Loading