Commit Graph

8 Commits

Author SHA1 Message Date
Entvari
3d22d984b8 Mini Energy Crossbow (#39796)
* draft 1

* mono audio

* missed something

* end the torment

* release me

* let me free

* Submodule fix?

* submodule fix?

* thousand years of suffering

* fix conflicts mehopes

* fuuuhuck

* balance update

* small numbers change

* re-organises the stun values yada yada

* newline

---------

Co-authored-by: beck-thompson <beck314159@hotmail.com>
Co-authored-by: SlamBamActionman <slambamactionman@gmail.com>
2025-11-14 22:18:08 +00:00
Southbridge
aa5d344a57 ERT Janitor Weapon - Hydra (#34416)
* checkpointing work

* Got this fully working and all sprites done

* Exchanged my sprites with the ones made by AugustSun

* Changed the name to Hydra Launcher, and adjusted it to function like a revolver instead.

* Modified the hydra to be a revolver

* fixed container issue

* Swapped in even newer sprites

* review

---------

Co-authored-by: Milon <milonpl.git@proton.me>
2025-04-19 16:03:05 +02:00
IProduceWidgets
11bbf2b020 Uranium & AP magazine and projectile sprites (#23914)
Add missing uranium and AP magazine and box sprite layers. Add uranium and AP projectile sprites. Fix whitelist issue that made .45 pistol mags not go in secbelt.
2024-01-11 01:01:41 -07:00
Boaz1111
5fd3d4552c More pirate weapon content(two new cannon ammo types, a musket and flintlock resprite and rebalance) (#23408)
* tally ho

* yarg

* forgot some shit

* Update projectiles.yml

* fucl

* glass ball

* Update snipers.yml

---------

Co-authored-by: Ed <96445749+TheShuEd@users.noreply.github.com>
2024-01-09 15:23:11 +03:00
MaloTV
b85a9d7688 Bullet Type Visual Indicator (#21068)
* Bullet Class indicators

* New Practice Sprite

* Removed re-specified values

* fixes up whitespace to get this merged

---------

Co-authored-by: deathride58 <deathride58@users.noreply.github.com>
2024-01-06 21:36:51 -05:00
Boaz1111
4c081aab04 Uranium Ammo (#22406)
* working on depleted uranium shotgun ammo

* added depleted uranium to more ammo

* Last changes and additions

* Forgot something, theoretically resolved the merge conflict too

* Nerfed the DU munitions, renamed em to uranium because it's not really DU

* made the ammo more expensive, also fixing the crash at the same time

* Fixed the last error, theoretically at least

* Revert "Fixed the last error, theoretically at least"

This reverts commit a875d2ac320478e4cb407564d704d915d0ef158b.

* copyright changes, small sprite changes, last references of depleted uranium removed

* Revert "copyright changes, small sprite changes, last references of depleted uranium removed"

This reverts commit 93a12bf20bc72581a0bdc32a3cdc7d887f50de3f.

* Update meta.json

* Update meta.json

* Update lathe.yml

* Update arsenal.yml
2023-12-21 12:07:44 -05:00
brainfood1183
8e817e2b97 pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
metalgearsloth
fb943a61dc Gun refactor (#8301)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: T-Stalker <le0nel_1van@hotmail.com>
Co-authored-by: T-Stalker <43253663+DogZeroX@users.noreply.github.com>
Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-06-01 19:59:58 +10:00