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

..

Consumable

Adds open icon for tonic water (#5502)

2021-11-25 12:35:01 +11:00

Devices

Add barebone nuke (#5242)

2021-11-11 12:29:11 +11:00

Fun

gunpet (#4978)

2021-10-22 11:14:09 +02:00

Materials

Fix glass sheet inhands

2021-05-08 16:16:06 -07:00

Misc

Added Basic Parts Technology (#4440)

2021-08-23 03:28:37 +00:00

Power

AME jars and parts now have inhand sprites

2021-06-23 00:39:35 -07:00

Specific

Epinephrine + epipen (#5444)

2021-11-22 23:51:51 -07:00

Storage

Massive Food PR (#3436)

2021-05-03 13:17:22 +02:00

Tanks

Copyright Pass/Pruning | Part 2 - Objects (#3905)

2021-04-29 18:09:14 +00:00

Tiles/tile.rsi

Respriting the codebase (#4820)

2021-10-15 11:58:40 +02:00

Tools

Adds hand labelers (#4903)

2021-10-16 13:34:05 -07:00

Weapons

New Guns (hopefully no conflicts this time) (#5105)

2021-11-25 15:37:21 -07:00