3364 Commits

Author SHA1 Message Date
Bob
35e9fc0c7d more missile UV 2024-02-08 21:30:49 +01:00
Boblet
8878b3f9de arty sync fix 2024-02-08 16:28:12 +01:00
George Paton
a95079826c you forgot beam cutting ya ding dong 2024-02-08 18:12:00 +11:00
George Paton
88a90aada7 Add new Spotlight block type, spawns SpotlightBeam blocks away from the wall that it is placed on 2024-02-08 18:01:59 +11:00
fedoraman737
760d7e9456
Update TileEntityReactorResearch.java
Updated line 435 -  last argument in clamp_double changed to 1.0
2024-02-07 22:40:45 -06:00
Bob
e5f2ae6860 half a UV because i spent all day playing fucking infinitecraft 2024-02-07 21:34:18 +01:00
Boblet
a8acfafebf polluting fluid trait, more oil work 2024-02-07 16:44:07 +01:00
George Paton
2c6fa42bf0 Fucking murder the sound loop, this way it'll call .stop() every update until it is disposed 2024-02-07 13:48:18 +11:00
Vaern
86c738532d Merge remote-tracking branch 'HbmMods/master' into structure-2 2024-02-06 16:07:01 -08:00
Bob
7a1a3de63f some UV 2024-02-06 21:21:59 +01:00
Boblet
0de7b319bb oil oil oil oil oil 2024-02-06 16:07:13 +01:00
HbmMods
443e154e57
Merge pull request #1326 from MellowArpeggiation/siphon
Add fluid siphon
2024-02-06 08:10:35 +01:00
George Paton
72a252194a Add a new "unsiphonable" fluid trait instead of using a static list 2024-02-06 18:07:21 +11:00
George Paton
05a087bce4 you know what *unsiphons your water* 2024-02-06 17:40:51 +11:00
George Paton
bcb8a48620 you know what *siphons your gas* 2024-02-06 14:52:06 +11:00
Boblet
bc0c64e27f desulfurized oils 2024-02-05 16:45:29 +01:00
HbmMods
08105fea5f
Merge pull request #1319 from Kal19801/master
Update zh_CN.lang
2024-02-05 09:34:11 +01:00
Bob
26db2c7076 ribbed for her pleasure 2024-02-04 01:36:26 +01:00
HbmMods
217ce07e6c
Merge pull request #1324 from MellowArpeggiation/master
SPAS-12 animations (and a few bugfixes)
2024-02-03 12:01:01 +01:00
HbmMods
77e0fe5338
Merge pull request #1325 from Doctor17-git/master
Updated ru_RU.lang
2024-02-03 11:59:17 +01:00
Doctor17-git
662c81b26f
h2 2024-02-03 11:10:47 +03:00
Doctor17-git
a1208f6ebd
h 2024-02-03 10:44:54 +03:00
Doctor17-git
1b21c87daf
Updated ru_RU.lang
updated russian localization
2024-02-03 10:11:50 +03:00
Boblet
dcad1001d2 missile stuff 2024-02-02 14:59:02 +01:00
George Paton
25e01b3742
Merge branch 'HbmMods:master' into master 2024-02-02 16:52:17 +11:00
George Paton
dc653d485e Add alt-fire sound to SPAS-12, and adjust animation to fit 2024-02-02 16:30:06 +11:00
Bob
ae24f4cbef this fucking sucks 2024-02-01 21:37:57 +01:00
Boblet
9965ada88f ough 2024-02-01 16:54:12 +01:00
George Paton
b1d7dc1738 Why not fix up the audio while I'm eeeere 2024-02-01 22:07:54 +11:00
George Paton
1de796fec5 Add animations to SPAS-12 2024-02-01 21:56:51 +11:00
George Paton
3d6c2aa67e Fix reload animation getting stuck if you run out of ammo before filling the weapon
Fix ALT_CYCLE support, will fall back to CYCLE if no ALT_CYCLE animation is defined
2024-02-01 21:56:04 +11:00
Kal19801
07a7a46269
Update zh_CN.lang 2024-02-01 16:45:44 +08:00
Kal19801
5adcecfb78
Update zh_CN.lang 2024-02-01 14:07:07 +08:00
George Paton
273018a5c7 Add correct shell colouring to KS23 2024-02-01 12:07:04 +11:00
Kal19801
11e1dd7e08
Update zh_CN.lang 2024-02-01 01:54:19 +08:00
Kal19801
fb1660b74d
Update zh_CN.lang 2024-02-01 01:19:48 +08:00
Boblet
1b1682a9d6 mind the GUI 2024-01-31 17:01:13 +01:00
Kal19801
24a60d6740
Update zh_CN.lang 2024-01-31 19:44:49 +08:00
HbmMods
85ba8dd587
Merge pull request #1288 from FOlkvangrField/more-custom-machine-options
More custom machine options
2024-01-31 09:25:03 +01:00
Kal19801
735a115bcd
Update zh_CN.lang 2024-01-31 16:20:27 +08:00
HbmMods
df5eef4182
Merge pull request #1318 from MellowArpeggiation/animation-rework
Weapon animation rework
2024-01-31 08:18:50 +01:00
George Paton
d979fd2e09 Add support for shotgun reloading animations
Add support for alternate reload animations when loading from completely empty
Add animations for Samuel The Big Fucking Shotgun
2024-01-31 17:11:03 +11:00
George Paton
67c4273ebf Add offsets to file format, so sequential animations don't have fucky offsets 2024-01-31 12:08:50 +11:00
George Paton
a5ad9c8f5a Scrap the reload animation on the novac 2024-01-31 09:51:51 +11:00
FOlkvangrField
3638ad475b Compatibility with old configs
Add compatibility with old configs. If the newly added option is not read, it will be automatically written to the default value.
2024-01-30 21:59:01 +08:00
George Paton
2faf317e0d silly duffer moment 2024-01-30 20:55:04 +11:00
George Paton
0a7f0a3b9c Merge branch 'master' into animation-rework 2024-01-30 20:35:45 +11:00
George Paton
a2e487912c Initial animation work for the Novac 2024-01-30 20:33:28 +11:00
George Paton
60de291033 Add animations to Cursed 357 2024-01-30 19:12:52 +11:00
George Paton
41759d096d Add note to use YZX rotation mode in Blender 2024-01-30 18:42:55 +11:00