119 Commits

Author SHA1 Message Date
Vaern
5af357f94f
Merge branch 'HbmMods:master' into master 2021-12-19 17:57:33 -08:00
Vaern
96000abaa2 Gas cent's done! 2021-12-19 18:01:05 -08:00
Bob
35a7ee8d31 a little bit of everything 2021-12-19 19:07:51 +01:00
Vaern
65567ac961 Merge remote-tracking branch 'origin/master' 2021-12-17 17:43:36 -08:00
Vaern
0fa36839f6 Revert "self-charging rgp battery!"
This reverts commit 2499b7f8c11d84ce0354494410db15eae87af257.
2021-12-17 17:41:59 -08:00
Vaern
ce67beb3d1
Merge branch 'HbmMods:master' into master 2021-12-16 19:34:22 -08:00
Boblet
3b938c5873 funky xray marker renderer thing 2021-12-16 17:00:08 +01:00
Boblet
d6b741b54f ReC nuclear waste hazard compat, some missing textures 2021-12-15 16:06:58 +01:00
Vaern
2336f43978
Merge branch 'HbmMods:master' into master 2021-12-14 19:42:14 -08:00
Vaern
2499b7f8c1 self-charging rgp battery! 2021-12-14 19:45:57 -08:00
Boblet
9e97a5caf5 some slight code refactoring, fun with enums 2021-12-14 16:12:03 +01:00
Vaern
9695763605 ducrete love 2021-12-04 19:00:08 -08:00
Vaern
9a5a597870 radium love and rebalancing 2021-12-03 19:42:40 -08:00
Vaern
c4a7efc23d Merge remote-tracking branch 'origin/master' 2021-11-28 10:43:10 -08:00
Vaern
453184e07a Much needed fixes 2021-11-28 10:43:01 -08:00
Boblet
0579ef7ad1 xp IV bags 2021-11-26 15:18:36 +01:00
Boblet
337891905f hadron power plug crashfix, IV bag 2021-11-25 15:41:19 +01:00
Bob
6aedf26a93 yum delicious garbage 2021-11-21 23:23:28 +01:00
Bob
dcbd0acabf catalytic cracker, fixed some garbage 2021-11-14 19:50:40 +01:00
Boblet
cbd99f6792 it's ZIRNOX time! 2021-11-10 10:48:21 +01:00
Boblet
4029b7cba6 lead tanks for nuclear waste fluids and other radioactive substances 2021-11-09 16:22:56 +01:00
Boblet
60d54086cf reliant robin space shuttle 2021-11-09 15:58:35 +01:00
Bob
81ec62be2e deuterium extraction tower, bobbleheads 2021-11-09 00:04:07 +01:00
Bob
f36f8ca826 Merge remote-tracking branch 'origin/master' 2021-11-06 18:26:40 +01:00
Bob
13aa7d8e4c fixed recipes, bobbleheads 2021-11-06 18:26:31 +01:00
Boblet
49369733f4 ethanol 2021-11-04 08:55:55 +01:00
Boblet
4bf34653e1 merged PR #319 (that's the funny one) 2021-11-03 15:14:10 +01:00
Boblet
2471777d04 lunar miner, helium plasma 2021-11-03 09:17:53 +01:00
Boblet
aa320d25cb some assets, fixed AA shovel being a singularity 2021-10-22 15:23:55 +02:00
Boblet
39801c72b6 fixed crash on start, updated textures, more hazards 2021-10-18 16:28:31 +02:00
Bob
c0fee87503 reworked the RadGen, updated swords, fixed hopper IO 2021-10-17 22:03:25 +02:00
Boblet
c4eee6990d cleaned up meteor spawn code, protection charm armor mod 2021-10-13 13:49:56 +02:00
Adam
d4c7d4078b
Add files via upload
lpg icon and gas canister
2021-10-12 19:52:44 +02:00
Bob
07c3c8e27b all sorts of fixes 2021-10-10 23:27:17 +02:00
Boblet
6cde27e91d fracksol chemplant recipe, oil spot indicators, HazardSystem debug spam 2021-10-08 15:20:40 +02:00
Boblet
bfeb0cb737 patched up the PR + some fixes 2021-10-06 16:38:11 +02:00
Vaern
8c89ea3969
Merge branch 'master' into master 2021-10-04 20:24:22 -07:00
Vaern
599e688598 rebalanced pile, added fibrosis treatment 2021-10-04 20:24:10 -07:00
Bob
52f55a8df5 fracking 2021-10-03 22:26:30 +02:00
Bob
fa88b16c4c derrick rewrite, new pumpjack model, oil pump base code 2021-10-02 19:00:14 +02:00
Boblet
82911a9027 fixed SILEX recipes, ZFB textures, more ItemHazard entries & modifiers 2021-10-01 15:25:35 +02:00
Bob
a42974d61e fixed ore dict funnies, fractioning tower, new niobium powder textures 2021-09-21 22:31:37 +02:00
Bob
f9f1ed9d6b redid the entire oredict, recipes, more memepack stuff 2021-09-19 16:32:56 +02:00
Boblet
a29f1ab8f8 mask filter unscrewing, small cooling tower, bedrock ore improvements 2021-09-15 16:22:49 +02:00
Bob
9a2751b7a4 some more fixes, recipes, chemistry icons 2021-09-14 19:16:23 +02:00
Bob
f077b6f39f mostly finished new gas mask funnies, improved mask filters 2021-09-12 21:39:04 +02:00
Bob
f5ad04fcfa enhanced lung diseases, coughing fits 2021-09-09 22:58:58 +02:00
Boblet
474d3fc020 black lung, leaded gasoline, more gas mask funnies 2021-09-08 15:16:13 +02:00
Boblet
efc382c9dc dynamic gas mask filters, cleanup, piss-soaked rags, recipe changes 2021-09-07 15:59:56 +02:00
Bob
34b7352f1f this has no right to be a commit but here we are 2021-09-06 00:04:29 +02:00