6 Commits

Author	SHA1	Message	Date
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