Commit Graph

43 Commits

Author SHA1 Message Date
Peptide90 bcfb72519c
Adds boxes of all magazine types + box of trashbags and flares (#6891) 2022-02-27 12:56:27 -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
ScalyChimp 3c9328ff99
Adds portable flasher (#4523)
Co-authored-by: Paul Ritter <ritter.paul1@googlemail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-02-07 02:59:41 +11:00
ScalyChimp 004c678853
Incediary Shells (#6208)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-01-31 00:44:45 +11:00
ScalyChimp e6f2239afe
Pirate guns (#6200)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-01-27 00:01:18 +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
Leon Friedrich 5dbe7be294
Fix on-collide explosive collisions (#6186) 2022-01-18 19:26:21 +11:00
keronshb 2a70ba88f7
Adds bola and a crafting recipe for them. (#6185) 2022-01-17 12:21:57 -07: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
TaralGit 887f667376
Deleting the old laser gun and replacing it with the COG (#5664)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-12-24 23:32:03 +11: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
mirrorcult 3f51ffbd3c
Pneumatic cannons (#4560)
* basics & visuals

* pneumatic cannon works perf

* loc + popups

* gas tank does stuff + queue changes

* updates

* b

* forcefeeding

* inhand

* crafting!

* pie cannon now is a pneumatic cannon

* oopy

* fix for entman + verbs

* pie

* change for tools

* actual

* combat mode + better sounds

* reviews
2021-11-03 14:33:36 -07: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
metalgearsloth 8fa7f902a1
Add basic meteor swarm (#4420)
* Add basic meteor swarm

* Map fixes

* Dependency cache

* Fix projectile crash

* Last of the reviews
2021-08-23 13:28:47 +10: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
Swept 0cccde9126
Ammunition boxes code quality (#3790)
* Boxes

* Reorganizes the YAML

* Reverts to previous commit and fixes the icons.

* Readds the new CLRifle.rsi as it'll be used soon.

Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2021-04-15 21:15:12 +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 b5f6f43aaa
Fixes pie cannon (#3797) 2021-04-04 13:13:19 +02:00
Swept 587d3fa7b9
Debug SWEPs (#3755) 2021-04-02 10:54:08 +02:00
Vera Aguilera Puerto d505ce1409 Adds creampie launcher 2021-03-21 18:08:42 +01:00
TaralGit 08f44050fe
Laser gun for security (#3632)
* laser gun

* filled up the energy depletion overlay

* small sprite correction

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2021-03-15 10:53:16 +01: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
Pieter-Jan Briers 63947a6d35
Fixes all the rotation bugs. (#3365) 2021-02-22 00:46:27 +01:00
komunre 2172d00409
Clusterbang (#2712)
* Code is ready but item now spawning

* Prototype of SeveralExplosive component

* Remaked to FlashExplosiveComponent using

* Done. But i feel myself retarted

* Remaked. Looks good

* Full loaded prototype added

* Throwing in progress. Fatal error is here

* I forgot about shared

* Sloth refactor

* Delayed spawning and fix crashes

* Full clusterbang code.

* Removed useless variable and tuned delay

* Delete wrong  in CreamPiedComponent

* Now yaml is code quality followed

* Reworked to GetLevel with bugs

* Never forget resources, guys

* RoundToLevels added. Now it works.

* New textures and sloth refactor is returned

* Now it's TryGetComponent

* Visualizer maximum fix and look fix

* Logging and no max and min check

* Removed max grenades sending

* vizualizer is better now

* GrenadesMax removed

* grammar, checks, NextFloat and no more try catch

* Unused using removed

Co-authored-by: Metal Gear Sloth <metalgearsloth@gmail.com>
2021-01-18 21:16:34 +11: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
Clement-O 621a39016f
Created and added empty ammo shell sprite (#2126) 2020-10-08 17:48:57 +02:00
Swept 072f374bcc
Removes the Straylight SMG (#1881)
* goodbye

* Removes Straylight from spawners
2020-09-02 00:38:35 +02:00
Swept 9019079d79
Adds a cat and then a gat (#1868)
* Adds the cat

* Adds the gat

* Adds the calico to suspicion spawner

* Fixed physics thing

* Updated BB

* Added Calico mag to ammo spawner
2020-08-24 20:27:32 +02:00
Swept abc446109e
Fixed sawn-off inhand-right sprite (#1869)
* Fixed

* Dunno what that file was
2020-08-24 20:10:57 +02:00
Swept 5e238a7ced
Nuclear Grenade (#1634)
* Hello there

* Change fueltank devastation range back to 0

Co-authored-by: Víctor Aguilera Puerto <6766154+Zumorica@users.noreply.github.com>
2020-08-10 16:35:04 +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