Commit Graph

19 Commits

Author SHA1 Message Date
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
Jackal298
ceb77bc778 Retexture of weapons in the hands of the character Part 2 (#18365) 2023-07-28 13:55:46 -06:00
TaralGit
57dfb82117 Shivs, spears and guns (#16654)
* weapons

* craft

* crafting but working this time. hopefully

* spear crafting fix

* graph id fix

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2023-05-21 18:14:42 -06:00
metalgearsloth
10a51d8ad7 [replacement] Drozd (#16071)
* Drozd

Drozd.

* migr
2023-05-03 21:35:32 -06:00
Pieter-Jan Briers
b707b788ac Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01: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
c4dd5b676c guns (#9958)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-24 21:25:41 +10:00
TaralGit
f6da17d7d9 highlights (#9332)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 19:57:23 +10:00
TaralGit
aaad270146 ak and china lake sprites replacements (#9110)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-25 12:59:10 +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
TaralGit
478dab4b88 Reworked sprites, inhands and new melee weapons (#3691)
* reworks

* added the rest

* reworked the machete handle

* reworked the icon for the machete

* ok. last one

* .

* .

* replaced machete and knife sprites (again)

* the meta.json

* license

* ffs

* final

* bs

* .

* .

* got rid of the machete and bat

* fuck

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-04-10 16:34:45 +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
Swept
072f374bcc Removes the Straylight SMG (#1881)
* goodbye

* Removes Straylight from spawners
2020-09-02 00:38:35 +02: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