Commit Graph

23 Commits

Author SHA1 Message Date
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
Fishfish458
5a03f6fa26 Add Energy dagger (#6669) 2022-02-12 21:42:10 +11:00
Lamrr
4d3c085eb7 Adds dedicated salvage specialist role (#6451) 2022-02-08 21:01:16 +11:00
Júlio César Ueti
6d5eee0d4c Add ESwords (now Inventory refactor compliant!) (#6000)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-24 23:55:48 +11:00
Lamrr
44d849d3f6 (Re)adds captain's sabre (#6101) 2022-01-11 17:50:10 +11:00
mirrorcult
72dcef4203 Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
mirrorcult
62f6c8dd8e Wieldable/two-handed weapons (#4554)
* wielding kinda works

* rough out all the edges, wielding works nicely

* popups + loc

* increase damage & extra damage against whitelist

* small fixes

* forgot to actually do that

* reviews

* reviews + thing

* use resistances and not extradamageagainstwhitelist

* slashy

* make increasedamageonwield and melee hit events work with modifiersets

* Silly individual
2021-09-17 07:16:11 -07:00
Swept
19551047c8 Spear shows on all sides when on back 2021-09-12 13:16:29 -07:00
Swept
030c4a07ce Can now equip fireaxe, claymore, spear and baseball back on your back (#4484)
* Can equip spears and claymores on your back now

* Adds fireaxe and baseball bat back equip
2021-08-17 19:42:50 -07:00
Swept
c55f3fd478 Adds mapped storage for lots of entities + a botanical belt (#4342)
* Cleans up belt stuff and some sprites

* Tag cleanup and sheathed sword

* Adds plant belt for botany chads and maps it's items

* CE belt, will most likely child it to utility instead

* Merges belt_icon and belt_mob into the same RSI

* Cut out alpha layers for wirecutters

* Added lots of equipped-BELT sprites for various items

* Medical, Janitor, Security, Assault, Chief Engineer, Utility and Botany have mapped storage layers

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-07-25 17:21:18 +10:00
TaralGit
1188d3bafb Added claymore as a weapon (#4124)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-06-09 05:21:08 +00:00
Swept
ece403ca57 Copyright Pass/Pruning | Part 2 - Objects (#3905) 2021-04-29 18:09:14 +00:00
SweptWasTaken
84d83d1902 Slight fixes for sabre and machete inhands 2021-04-28 16:31:47 -07:00
TaralGit
ebec1b7dcf Inhands for pistols, beakers, reworked melee weapons and laser gun (#3887)
* new pull

* beakers

* melee

* ffs

* hope this works

* ffffff

* Update meta.json

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: Swept <sweptwastaken@protonmail.com>
2021-04-28 21:14:27 +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
587d3fa7b9 Debug SWEPs (#3755) 2021-04-02 10:54:08 +02:00
Tarlan2
efbfd7d68a New melee weapons (#3473) 2021-03-08 19:16:09 +01:00
Elijahrane
590453a57f Removed most redundant delays in meta.json (#3549) 2021-03-07 20:26:25 +01:00
Elijahrane
db67f42bc2 Le Miko has Arrived (#3543) 2021-03-07 13:41:42 +01: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
mirrorcult
7977992e5a Add kitchen knife & sliceable foods (#2891)
* sliceable food, kitchen knives

* sprite fixes, sounds

* add to vendor

* address reviews

* address reviews

* stereo -> mono

* fix wrong amount of nutriment being removed

* oops im dumb

* meta.json

* fix merge

* probably fix test

* remove all instances of [ComponentReference(typeof(IAfterInteract))]

Co-authored-by: cyclowns <cyclowns@protonmail.ch>
2021-01-07 12:48:08 +11:00
Swept
c3a6d0c597 Add belt slots for several items 2020-12-23 16:32:42 +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