1473 Commits

Author SHA1 Message Date
Bob
6812deec68 some post merge cleanup 2023-01-22 17:15:46 +01:00
Boblet
fcf6767425 texture fixes 2023-01-16 11:09:14 +01:00
HbmMods
7269b26396
Merge pull request #852 from UFFR/casings
It's Raining Brass
2023-01-09 13:18:11 +01:00
UFFR
57f9bbf404
Tinkering + config
More tinkering, also tried to implement bounce sound effects, but they don't seem to work.
Added a config to disable casings.
Commented out smoke effect because it wasn't working out.
2022-12-21 21:47:02 -05:00
UFFR
754f88a42f
Fixes and tinkering
Fixed offset rotation sorta, now casing align with the ejection port for the most part. Turrets still need work in this regard.
Fixed some texture asset names.
FBI shotgunners make spent casings, but they are jank since NPC rotations don't match with their rendered rotation for some reason (ie NPC is facing player when rendered visually, but the actual entity isn't).
2022-12-20 00:04:58 -05:00
UFFR
84ad6bd659
Major work
Most guns and turrets use the system now.
Still needs work, rotations are a bit weird and the smoke effect is horrendous.
Other tweaks pending.
2022-12-14 22:55:47 -05:00
UFFR
51e392011e
Basis of casing system
All untested and should be considered still in-development. Just commiting for backup.
2022-11-18 16:54:01 -05:00
HbmMods
c87d7cceaa
Merge pull request #808 from UFFR/guns
Fixed reloads + some other stuff
2022-11-14 15:32:09 +01:00
UFFR
e75e328653
Fixed reloads + some other stuff
Reload issue was caused by some logic errors. Also made a new method for inventory checks that should be more efficient for single items.
2022-11-12 18:32:36 -05:00
HbmMods
938775851b
Merge pull request #768 from UFFR/guns
Guns, guns, and guns
2022-10-18 08:07:49 +02:00
UFFR
5716b956e9
Not sure how that one happened
Auto-import funnies.
2022-10-14 00:38:33 -04:00
UFFR
e392d04e3c
Done for this one
Most issues are fixed and the new guns are implemented. A few bugs are still present, but they're minor. There are some code `TODO` notes I added, notably in the `HbmPotions` class.
2022-10-13 23:51:44 -04:00
UFFR
fb1c4fff40
New guns + missed issues fixed
The new guns got added as well as some issues that I missed in the previous PRs got fixed too. More detail in the actual PR summary.
2022-10-13 00:08:35 -04:00
HbmMods
6f2d589788
Merge pull request #765 from UFFR/bullets
Some fixes(?)
2022-10-12 07:55:08 +02:00
UFFR
65a704eb2f
Some fixes(?)
Fixed some issues that should make some configs work properly. The full scale W9 shell is also implemented fully.
2022-10-11 21:22:44 -04:00
Bob
9890fc5525 first batch of post merge cleanup 2022-10-11 20:23:05 +02:00
HbmMods
1ff6f7b8da
Merge pull request #763 from UFFR/bullets
Bullet Time
2022-10-11 08:59:22 +02:00
UFFR
1df36201c0
Soon?!
Expect PR soon.
It's like 1 AM over here. I'm cold, hungry, and sleep deprived.
2022-10-11 02:12:27 -04:00
Bob
211da211b4 finished electric heater 2022-10-10 23:50:37 +02:00
Boblet
23fc31e2b0 electric heater functionality 2022-10-10 16:38:49 +02:00
Bob
3d765347dc redid all the turbines with the new fluid traits, electric heater 2022-10-09 21:00:50 +02:00
Bob
2ea17f1e13 boil yourself 2022-10-09 01:26:18 +02:00
Boblet
b15a69aa50 concrete stairs and a crapton of slabs 2022-10-07 13:53:29 +02:00
Boblet
870bec5d7d more crucible materials, better template search, crucible template icons 2022-10-06 16:50:23 +02:00
Boblet
8ca1513bf8 the thicc NEI handler that does nothing except render things thicc 2022-10-06 13:08:27 +02:00
Boblet
ab083eec59 heatable fluid trait, steam compression headaches 2022-10-05 16:29:25 +02:00
HbmMods
3ef8533142
Merge pull request #761 from Doctor17-git/master
Updated ru_RU.lang
2022-10-04 19:35:31 +02:00
Doctor17-git
af1799db38
Updated ru_RU.lang
updated russian localization
thanks to Sob for help
2022-10-04 18:55:44 +03:00
Voxelstice
f19e42cf93 h 2022-10-04 18:35:05 +03:00
Bob
f833fd512d the commit i missed + safer DFCs 2022-10-03 19:09:35 +02:00
Boblet
dd7695e00b some NEI handler stuff 2022-10-03 16:21:24 +02:00
HbmMods
91d4160d66
Merge pull request #756 from Doctor17-git/master
Updated ru_RU.lang
2022-10-02 20:30:31 +02:00
Doctor17-git
3929e6d013
Updated ru_RU.lang 2022-10-02 21:13:58 +03:00
Bob
b7456f1c51 NEI handlers, fixes, more matdefs, foundry pieces always dropping mats 2022-10-02 20:01:36 +02:00
HbmMods
3d1a195da5
Merge pull request #753 from Vaern/quickPR
Fixed Infinite loop, added safety for foundation placement
2022-10-01 23:46:31 +02:00
Bob
99f3909bed crucible templates in folder, storage tanks, recipes 2022-10-01 23:45:58 +02:00
Vaern
99bd1a3723 Fixed Infinite loop, added safety for foundation placement 2022-10-01 08:14:18 -07:00
Bob
6bb58fdcd1 Merge remote-tracking branch 'origin/master' 2022-09-30 16:04:50 +02:00
Boblet
db5757a283 i forgot to push again - intermission 2022-09-30 14:34:04 +02:00
Bob
19e5cf36c4 removable scraps, better textures, outlet redstone control 2022-09-29 23:21:30 +02:00
Boblet
46f11acb9b fixed diode lag, proper limit, functional crucible recipes, scraps 2022-09-29 16:52:05 +02:00
Bob
1f2937c666 mold recipes, casting basin automation 2022-09-28 22:31:58 +02:00
Boblet
4ee7e680fb Too Many Molds
there is toxic black mold growing in my brain
2022-09-28 16:54:42 +02:00
Bob
35c9833e69 fixed pouring, rendering for foundry outlet 2022-09-27 23:22:27 +02:00
Doctor17-git
ea18a9b4c9
Updated ru_RU.lang 2022-09-27 19:36:03 +03:00
Boblet
462be270d9 improved pouring code, crucible util class 2022-09-27 16:51:58 +02:00
Bob
50826c13f6 fixed pouring, proper item rendering in molds 2022-09-26 23:27:57 +02:00
Boblet
52fc3868ff more base code, usable molds 2022-09-26 16:54:24 +02:00
Boblet
05d370e7d1 better base code organization for foundry blocks, standardized pouring 2022-09-26 14:06:31 +02:00
Bob
05e07eae51 molds and channels and basins 2022-09-25 21:31:33 +02:00