Commit Graph

23 Commits

Author SHA1 Message Date
Halo3moth a67f32773b
Adjutant Rekitting (#5014)
* THANK GOD THIS IS ALL IN _DV

Adjutant changes

* Forgot to use my full discord user for the metajason

:3c

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>

* 1.3 to 1.5

---------

Signed-off-by: Halo3moth <mdavid.wininger@gmail.com>
2025-12-27 07:26:51 -06:00
Velcroboy 75fbb95ace
Adds Christmas Kobolds: Defenders of The Yule Tree (#4940)
* Adds Christmas Kobolds: Defenders of The Yule Tree

* update comments

* Add candy spear sprite

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* no shoes for now

* Revert "no shoes for now"

This reverts commit 8bece94b57.

* No shoes for now

* maybe

* Ain't

---------

Co-authored-by: Velcroboy <velcroboy333@hotmail.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-12-18 20:33:03 +01:00
verybigman fe544932a6
Working Musket Bayonet, Musket Tweaks, and Pipe Sounds. (#4852)
* musket complete

* done

* added comment

* tada

* changed!

* fix

* fix

* migration thing

* test

* fixed comments
2025-12-17 07:51:49 -06:00
verybigman 0f1a7f69e8
Ultimate Wielded Sprites Update (and other fun things) (#4851)
* lasers done

* fixed drinks

* one done

* enforcer complete

* messed up the sprites

* fixed suitstorage

* edit

* electric boogaloo

* save

* IK done

* guess who forgot to edit the json

* every gun now has wield sprites

* kammerer is BROKEN

* finally free

* changes
2025-12-04 12:42:20 -06:00
Sir Warock 5914ff6e44
Make the Adv. Truncheon Advanced (#4736) 2025-11-30 10:46:38 -06:00
Sir Warock 09cbcd71cb
Add the NT-3 (#4622)
* Add Bipod System

* Add the NT-3

* Small fixes

* Small fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix Test Fails

* Small oversight

* Robust the Code

* Fix Action Name

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* Fix Action Description

Co-authored-by: Tobias Berger <toby@tobot.dev>
Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Add WallPierce + Changes

* Small fix

* Cleanup

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fix Testfail + Add Descriptions

---------

Signed-off-by: Sir Warock <67167466+SirWarock@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Tobias Berger <toby@tobot.dev>
Co-authored-by: Vanessa <908648+ShepardToTheStars@users.noreply.github.com>
2025-11-25 18:03:33 +00:00
Woljif f088295730
Rework the Vulcan, giving it a long-range niche. (#4672)
* Buff vulcan, giving it a new niche.

* Add attribution to my stinkiest gamedev cadet metafriend for her spriting.

* Remove slowdown penalty on wield
2025-11-19 20:39:04 -06:00
EmberAstra 35a2b791f1
Add mothroach grenades (#4558)
* Add mothroach grenades

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Removed unnecessary comment

* Double the mothroaches!!

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-10-23 18:59:55 -05:00
AeraAulin 4537e7ebeb
Silver swords and Radiant Swords (#4303)
* swords are cool

* remove unused tag

* build and test debug is yelling at me about this. presumably it's because of RevealRevenantOnCollide

* just remove both it's too late to deal with right now

* alright try 2 to get the build and debug to not yell at me about it. I dunno why the bible can just have the component but not the sword

* fix merge conflict before syncing branch because this is genuinely just easier for me to do it this way

* aaaaa

* i need merge conflicts to stop yelling at me aaaaaaa

* merge conflict fix pt. 1

* fix merge conflict pt. 2

* nukeops haunts me at night
2025-10-16 05:12:24 +00:00
AeraAulin 11f8e9d07b
Shadow Damage (#4440)
* aaaaaaaaaaaaaaaaaaa

* add shadow damage to some evil things and add ways to heal it

* bibles healing shadow doesn't work for some reason

* fix attribution, description, and remove placeholder sprite
2025-10-06 11:22:30 +11:00
No Elka 618c768e27
Add (rebalanced) double esword to uplink (#4145)
* Change stats

* Add to uplink

* Nerf a wee bit more

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Woops

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-08-09 10:16:49 +01:00
Field Command c72692747e
Laser tag (#3963)
* Laser tag

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Fixes

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* More fixes

* Even more fixes

* Last fix

* Fixes

* tiny yaml edit

---------

Signed-off-by: Field Command <159087063+FieldCommand@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2025-07-06 11:25:16 +01:00
Radezolid 9f45f590ec
Cherrypick Frontier's suit storage fixes for our guns (#3405)
* Fix: Suit storage sprites for DeltaV guns

* energygun.rsi metadata copyright

* Fix formatting on the JSON files

* Updated the copyright

* energy smgs, wielded sprites for DeltaV

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Signed-off-by: Radezolid <snappednexus@gmail.com>
Co-authored-by: steinhauer.erhard <steinhauer.erhard@gmail.com>
Co-authored-by: Whatstone <166147148+whatston3@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2025-04-12 03:45:31 +01:00
deltanedas e90e48622f reformat all our meta.json files 2025-04-10 01:05:32 +01:00
pre-commit-ci[bot] 21148ba733 [pre-commit.ci] auto fixes from pre-commit.com hooks 2025-04-09 18:11:20 +01:00
Stop-Signs 7996a5c55e
Unfucked version of ERT Overhaul 4.0 (#3365)
* Sprites + IK-30 and Advanced Energy Gun

* hardsuit YML

* Elite Hardsuit Sprites and Helmets

* fix laser mags rsi

* attempt fix

* fix 2

* fix3

* fix 5

* Give Chaplain ERT actual powers

* WHY IS THERE A 2 THERE

* Combat RCD

* advanced compact defib

* CMO Defib steal objective

* fix RSIs

* IK-60 redux

* RSI fixes

* License fix

* PDW-9 Redux

* Holorollerbeds

* Holostretcher folded

* Immolator Cannons

* Researchable Immolator Cannons

* rsi Fixes

* rsi fix

* fire protection to helmets

* typo

* Orderable Laser Carbines

* Lathe Recipes

* miss cap fixes

* helmet and projectiles fix

* chemical bottles

* ERT loadouts

* No more survival box

* Ghostroles for ERT

* fix

* fix2

* Update EmergencyResponseTeam.yml

* fix

* fix again

* ERT Hardsuit fix

* spritefix

* typo

* Typo fix 2.0

* mass commenting out

* Revert "mass commenting out"

This reverts commit 1ee6173328.

* hotfix

* fixes

* the gun fixes

* loadout fixes

* rsi fixes

* Loadout fixes

* No more DeltaV namespace

* no more textures DeltaV namespace

* fix order of meds

* whoops forgor to fix

* the great unfuckening

* defib ID fix

* second pass of unfuckening

* more unfuckening

* should be final wave of fixes

* stupid bottles

* fucking lathe pack

* whoops

* cleaning up

* they get plenty of these anyway

* guh

* wow i hate autofill

* nineteeneightyfour

* nineteeneightyfive

* requested changes

* whoops

---------

Signed-off-by: Tryded <tryded213@gmail.com>
Co-authored-by: Tryded <tryded213@gmail.com>
Co-authored-by: Tryded <139474617+Tryded@users.noreply.github.com>
2025-04-04 16:34:51 -05:00
Stop-Signs 23307978dc
New superweapon: gamblagator (#3326)
* change the ratio and max amount

* git tuah

* Update roundstart.yml

* the projectile

* yummy

* mhm

* sprites

* work please

* need to look at github

* finishing up

* Revert "Update roundstart.yml"

This reverts commit 9e81a6caaa.

* Revert "git tuah"

This reverts commit 4aab150be4.

* Revert "change the ratio and max amount"

This reverts commit 03a2a71d47.

* radezolid nitpick ops

* all requested changes + bugfix

* final run through and bug fixes (i hope)

* GOD BLESS RADEZOLID

* requested changes

* all bugs exterminated, works as intentded

* Meow

* THANK YOU RADEZOLID

* nitpick ops real

* requested changes

* deltanedas is so smart

* typo
2025-03-29 16:46:04 +00:00
Avalon f4992eb271
Secborg Module Overhaul (#2059)
* Secborg rework begin

A total rewqwork of secborg modules

* Patrol be gone!

Removed patrol module fully

* Conflictfixes?

* Update battery_guns.yml

* fixin oop

* Mergeconflictfixes

* Delete dupes

* More fixin

* Movin ops

* FUCKOFF UNEEDED DATA

* More fixes

* More work

* Maybe last fixes?

* MOre fixes

* fix

* cleanup launchers

* Fixes and changes

* Update shotguns.yml

* feck i broke the texture

* FIXED

* Update shotguns.yml

Signed-off-by: Avalon <jfbentley1@gmail.com>

* Direction fixes

* Conflict fix, parenting fixes

* Update shotguns.yml

* Tool modules for all

* Untouch the box

* Webedit ops are go

Signed-off-by: Avalon <jfbentley1@gmail.com>

* Fixes

* Delete Icon.png

* Create icon.png

* Typo ops

* Update robotics.yml

* Some fixes

* Update borg_types.yml

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Signed-off-by: Avalon <jfbentley1@gmail.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-03-09 18:47:40 +00:00
Kat 84f62fd7cf
Python Non-AP Tweak (#3093)
* python no longer AP default, added regular speedloader

* forgot comments or something

* add AP icon for uplink

* untouched upstream ftl

* upstream untouch 2, yml strikes back

* upstream untouch 3, return of the comment

* make my origin happy?

* Revert "make my origin happy?"

* the final fix

---------

Signed-off-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
Co-authored-by: deltanedas <39013340+deltanedas@users.noreply.github.com>
2025-03-08 19:56:10 +00:00
deltanedas 02a1b74065 undo drozd resprite 2025-02-14 16:44:03 +00:00
deltanedas 099dd285fb bring back rubber ammo sprites 2025-02-14 16:10:01 +00:00
deltanedas 80a2674f61 undo nerf gun sprites 2025-01-28 04:32:59 +00:00
deltanedas ec94579ebc
the great namespace refactor (#2574)
* refactor DeltaV/deltav resources to _DV

* change DeltaV namespaces to _DV

* add space before all DeltaV comments

* update xamls

* fix and move arena parallax to _DV

* more fix

* refactor even more stuff

* fix the grid fills

---------

Co-authored-by: deltanedas <@deltanedas:kde.org>
2025-01-01 07:50:34 +00:00