1376 Commits

Author SHA1 Message Date
Bob
17b4a355e5 stinger crap 2024-10-20 20:39:25 +02:00
BallOfEnergy
31c6809c65 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/main/ModEventHandlerRenderer.java
2024-10-20 12:54:06 -05:00
Bob
b72a52ef69 imagine looking at indev values and going "yeah this is definitely final
imagine being this much of a fucking idiot, but good thing we aren't that stupid, right? good thing we aren't complete fucking retards who stir though code that is in active development, pick out temporary inconsistencies and then going "oh well the dev must clearly be an idiot, how else could you explain that?", good thing we are reasonable people who aren't this fucking stupid, right?
2024-10-19 21:48:29 +02:00
Bob
be1b1c1df0 one shotgun, two shotgun 2024-10-19 00:32:07 +02:00
Boblet
805c06c802 in HEAT 2024-10-18 14:13:04 +02:00
Bob
09d11d49da explosive yeeter 2024-10-17 22:22:54 +02:00
Bob
7d2df857e6 spas12 2024-10-16 22:12:18 +02:00
Boblet
a1401b47e2 my ass is bleeding 2024-10-16 17:00:07 +02:00
Bob
ee1d3b37cd micro uzi? wrong! macro uzi 2024-10-15 22:44:36 +02:00
BallOfEnergy
b4b9042065 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-14 22:02:36 -05:00
Bob
8e3df0cc22 comically long pistol 2024-10-14 22:56:32 +02:00
BallOfEnergy
60536af06c Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-13 15:51:07 -05:00
Bob
047ebfe8aa better explosion particle effects, flamethrower sound loop 2024-10-13 19:49:31 +02:00
HbmMods
c8444cb8b7
Merge branch 'master' into master 2024-10-13 17:07:26 +02:00
Bob
ceb9abbec4 extremely shitty animations 2024-10-13 17:06:46 +02:00
BallOfEnergy
4d489bc938 Merge remote-tracking branch 'upstream/master' into Optimization 2024-10-12 22:13:39 -05:00
Bob
44b1604992 eh hehehehehe, fire, FIRE! 2024-10-13 01:05:06 +02:00
George Paton
2e2910c2ec
Merge branch 'HbmMods:master' into master 2024-10-11 12:56:52 +11:00
George Paton
c076d4f99b bees v2 2024-10-11 12:56:22 +11:00
BallOfEnergy
88f5ac1cf1 Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/TileEntityMachineBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterElectric.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityPWRController.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityCraneConsole.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneGrabber.java
2024-10-10 19:41:23 -05:00
Bob
19cfc54dee grenade tweaks 2024-10-10 23:21:39 +02:00
Boblet
6d924cbdc5 the rim flappe on a bongfish is mated to the bungus of its fuccbone.
the scrotewad is only present on females above the pootsack (see: snogbag).
2024-10-10 16:53:11 +02:00
George Paton
7c35b1923a Add Congo Lake inspect, jammed, and equip animations, also:
* fix importer breaking nested object offsets (for things like MagPlate inside Mag)
* fix sqrt3d throwing NaN on negative inputs
* >:3
2024-10-10 14:14:11 +11:00
Bob
c7ced50e67 DAY AND NIGHT 2024-10-09 23:19:54 +02:00
Boblet
66711f963e nothing productive for today 2024-10-09 16:25:43 +02:00
Bob
f2b64a82fe cursed 60s quad barrel shotgun from hell 2024-10-09 00:20:08 +02:00
Bob
6b0835f19c some very pissed off bees 2024-10-07 22:49:04 +02:00
Boblet
5819711586 casing smoke is no longer bound to the casing config 2024-10-07 16:47:38 +02:00
Bob
cdec9d074d greasy joe, horse leg and 🅱️untsman 2024-10-06 22:37:16 +02:00
Bob
de238ca0e0 🅱️enry 2024-10-03 21:29:20 +02:00
Boblet
c8d40f0d35 offsets and casing ejection sillies 2024-10-03 16:28:15 +02:00
Bob
59254c7179 the horngus of a dongfish 2024-10-02 22:02:19 +02:00
Boblet
ea895daa85 shells and casings 2024-10-02 16:58:12 +02:00
Bob
75df8fb945 ATLAS 2024-10-01 21:35:43 +02:00
Boblet
0bdfe286e4 shapes 2024-10-01 16:56:39 +02:00
Bob
6cddb3e238 NEI stuff, textures 2024-09-30 22:12:21 +02:00
Boblet
ad3c4e20ca it's fucking lego! 2024-09-30 16:55:43 +02:00
Bob
a6f694b7b3 GUNMETAL 2024-09-29 20:56:11 +02:00
Boblet
f7e804094c it's recoil! 2024-09-26 14:05:48 +02:00
Boblet
2584934e0b ended endlessIDs 2024-09-26 11:25:11 +02:00
Bob
eb157ea874 gun jamming 2024-09-25 21:47:45 +02:00
Boblet
0f277657db bullet damage, armor pen, durability stats 2024-09-25 16:45:42 +02:00
Bob
1d92bcbf13 ball and powder torture 2024-09-24 23:53:14 +02:00
Bob
b2c2ce9e4e casing ejectors, bullet ricochet 2024-09-23 22:39:38 +02:00
Bob
42b7d1f657 dry fire animations, clicky stuff 2024-09-22 22:52:47 +02:00
Bob
51839e8abb substantial amounts of trolling 2024-09-22 00:03:28 +02:00
Boblet
fcf0f0d2d9 yet more gun stuff! 2024-09-20 15:03:52 +02:00
BallOfEnergy
e7b5240a9d Merge remote-tracking branch 'upstream/master' into Optimization
# Conflicts:
#	src/main/java/com/hbm/tileentity/bomb/TileEntityNukeBalefire.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityAshpit.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityChungus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCondenser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityCore.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnace.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityDiFurnaceRTG.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityElectrolyser.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceIron.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityFurnaceSteel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoiler.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeatBoilerIndustrial.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityHeaterHeatex.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineAutosaw.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCombustionEngine.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineCompressor.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineDiesel.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineEPress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineHephaestus.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineMixer.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePlasmaHeater.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePress.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachinePumpBase.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadGen.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineRadiolysis.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSchrabidiumTransmutator.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineSolderingStation.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineStrandCaster.java
#	src/main/java/com/hbm/tileentity/machine/TileEntityMachineTurbofan.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySoyuzLauncher.java
#	src/main/java/com/hbm/tileentity/machine/TileEntitySteamEngine.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticCracker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCatalyticReformer.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineCoker.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineGasFlare.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineLiquefactor.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineRefinery.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineSolidifier.java
#	src/main/java/com/hbm/tileentity/machine/oil/TileEntityMachineVacuumDistill.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKConsole.java
#	src/main/java/com/hbm/tileentity/machine/rbmk/TileEntityRBMKControlAuto.java
#	src/main/java/com/hbm/tileentity/machine/storage/TileEntityMassStorage.java
#	src/main/java/com/hbm/tileentity/network/TileEntityCraneRouter.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneCrate.java
#	src/main/java/com/hbm/tileentity/network/TileEntityDroneRequester.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretFritz.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretMaxwell.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretRichard.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretSentry.java
#	src/main/java/com/hbm/tileentity/turret/TileEntityTurretTauon.java
2024-09-18 19:07:46 -05:00
Bob
1384f14fe3 a ton of gun stuff 2024-09-17 21:30:34 +02:00
Boblet
3a81e79554 *pipe falling sound effect* 2024-09-17 15:47:50 +02:00