Commit Graph

15 Commits

Author SHA1 Message Date
Seam_Less
861d0fac71 Gun Inhand Sprite Fixes (#38294)
* cobra, viper, pulse pistol

* c20 and wt550

* l6 + attributions
2025-06-16 18:03:14 -04:00
RiceMar1244
2287f59e8a Adds wielding for all large guns (#26970)
* Adds wielding assets

* Modifies meta.json files and adds artist credit

* Adds wieldable component to a bunch of weapons

* Moves shotgun inhands and wield inhands to their own folders (because its the only way the sprites would work)

* Removes the wieldable component from some guns

* Adds wielding sprites for wieldable guns that didnt have them

* Adds gun wielding bonuses and base innaccuracy to wieldable guns.

* Corrects wielded accuracy to be default accuracy instead of perfect

* Makes the drozd smg and bulldog shotgun wieldable

* Makes nukie c20r wieldable and adds sprites

* Adds BaseGunWieldable

* Makes all the newly wieldable gun use the base inheritable

* Adds accuracy to smgs to resolve inheritance conflict

* Makes all wieldable shotguns require wielding to fire because of a bug involving spread innacuracy

* Adds wield bonus message on examine
2024-05-09 19:58:15 -07:00
vanx
6c239890c5 Suit slot weapon consistency + visuals (#26152)
suit slot my beloved

Co-authored-by: vanx <#vanxxxx>
2024-03-18 00:16:09 -06:00
Boaz1111
4220b098a3 Sling Resprites (#21538)
* DB texture on back changed

* cheese

* test

* CR20 Syndie Sling

* NT slings implemented

* finished SMGS, starting on Laser Weapons

* added more laser slings

* laser weapons done

* small changes to laser weapons and pie cannon slings

* added chinalake and l6 slings

* finished launcher catagory, almost finished rifle catagory

* almost done, just missing the heavy sniper

* Replaced L6, Chinalake and Heavy Sniper resprite because my old heavy sling was ugly af

* all slings done

* added copyright to the .meta files

* Revert "cheese"

This reverts commit a1f7ac7b70709a6789a7b6fc0dc00a2c0734b83a.

* fixed sln file, in theory at least
2023-11-08 14:18:33 -07:00
TaralGit
8acac895fc (Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00
Peptide90
5a5884727f Guns as clothing PR (suit storage, back, belt) (#9330)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-08-31 20:21:13 -07:00
TaralGit
f6da17d7d9 highlights (#9332)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 19:57:23 +10:00
TaralGit
43dc0be57c Revamp guns: Revival (#8675)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-06-12 12:39:52 +10: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
TaralGit
52ec5036d5 Another gun PR (#7450)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-04-15 15:39:16 -07:00
TaralGit
a816bd809c New battery guns and some resprites (#6295)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-03-12 15:29:16 -07:00
TaralGit
e5bf2192cf New Guns (hopefully no conflicts this time) (#5105)
* New Guns (hopefully conflict free)

* solving conflicts

* forgot to delete old laser gun png

* Revert "forgot to delete old laser gun png"

This reverts commit 6273aff7a411f24484fdbde0757446ab7ab5f873.

* small corrections

* carbine

* uplink correction

* cog meta.json correction

* replace laser pistol

* svalinn inhands

* getting rid of my old lasergun

* forgot to delete the old lasergun from yml

* Revert "getting rid of my old lasergun"

This reverts commit 763caefd64f1497da5ff6ac5239e3c64b0a892c2.

* Revert "forgot to delete the old lasergun from yml"

This reverts commit 144f4533c44d29e56e5356389d498a437180fa1e.

* base.png and taser fire cost corrections

* last changes for this PR. the c20 and predator sprites. and corrected meta.json

* lowercased

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-11-25 15:37:21 -07:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
Swept
a57db85208 Swept commits JSON genocide. (#2991)
* Clothing Folder Complete

* All Textures 1st Pass

* All Textures 2nd Pass

* All Textures 3rd Pass PLUS Manual Tweaking

* 5th Pass MORE MANUAL

* Fixes flares

* 4th Pass (I skipped over)

* The 6th Pass (Finality) - With Manual Fixes
2021-01-13 23:04:38 +11:00
AJCM-git
ae41d03ec6 Re-organizing the Resources folder. Part 1. (#1234)
* First commit

* Lockers

* Lockers electric boogaloo

* Crates and Lockers

* Almost finishing the Textures folder

* Updating texture paths. Reminder to fix:
* Lockers
* Windows
* Vending Machines
* APC
* Catwalks
* Bedsheets and Cloaks
* Status effects

* dont know what happened here

* Commit before merge

* re-organizing

* Lockers broken

* Commit before merge

* Submodule

* renaming

* Fixing most issues

* forgot these ones

* Updating submodule

* typo

* Fixing some paths

* fixing some paths

* updating submodule

* (hopefully) fixing the submodule
2020-07-07 19:19:00 +02:00