Commit Graph

65 Commits

Author SHA1 Message Date
metalgearsloth
10a51d8ad7 [replacement] Drozd (#16071)
* Drozd

Drozd.

* migr
2023-05-03 21:35:32 -06:00
Interrobang01
a155fc432a [fix] removing the stray disabler pixel (#16041) 2023-05-02 23:07:23 -06:00
brainfood1183
d598ada16f Omega Cartridges Uplink rounds for CHIMP. (#15755)
Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-02 16:11:04 +10:00
Dawid Bla
449689e6ae [fix] ammo typo(#15954) 2023-04-30 21:44:58 -06:00
Nemanja
37bc649eef CHIMP handcannon (#15667) 2023-04-24 09:58:45 +10:00
brainfood1183
8e817e2b97 pirate content (#11799)
* pirate content

* pirate content

* merge

* merge

* update launchers

* trying to fix launcher error

* merge

* merge

* merge

* fix for launchers

* update to held cannon sprite

* attempt to fix issue

* first updates in long time

* changes mostly to sprites

* more sprite fixes

* more sprite changes

* json fixes

* small update

* new pirate crate

* update

* updae json

* fix eva

* update accent

* fix accentcomp

* improved pirate chest

* accent localized

* station to docks

* modified the pirate ship

* changed pda spawns for firstmate nad piratecaptain to passenger pdas

* fixes

* pirate accent

* removed  spacing in shotgun.yml

* redo accent

* fix

* removed no spawn from helmet hardsuit

* suffix capitalization

* tweaks

* a

* jusdt fixing up the hi and yes which are both replacement and not replacement and replaced.

* pirate accent fixes

* desc fix

---------

Co-authored-by: ElectroJr <leonsfriedrich@gmail.com>
Co-authored-by: AJCM <AJCM@tutanota.com>
Co-authored-by: Kara <lunarautomaton6@gmail.com>
2023-04-09 22:47:40 -07:00
potato1234_x
6bfd1d8f11 Missing box icons (#14891)
* boxes

* holo box
2023-03-30 22:46:06 -06:00
TaralGit
7eec71dcfc Mags and guns (#14032) 2023-03-12 20:52:57 -04:00
T-Stalker
645cc7888e beno turrets (#14516) 2023-03-11 00:25:33 +11:00
Kara
7253592126 Gunify pneumatic cannon (#13296) 2023-01-16 08:56:09 -08:00
Leon Friedrich
b33d1f003b Add RGB staff (#13125) 2023-01-01 16:01:40 -08:00
Pieter-Jan Briers
14f8b4e6d5 Use new validate-rsis for workflow (#12997)
* Use new validate-rsis for workflow

* A

* Add python deps

* --ignore-installed

* Make it only work on RSI changes again.

* Fix a bunch of RSIs.
2022-12-20 06:31:17 +01:00
Alex Evgrashin
6293c6f359 Uplink catalog localization (#12931)
* Add loc support

* New icons and translated weapon

* Explosives

* Finished ammo

* Utils

* Fixes

* Implants and bundles

* Removed sink from surplus

* Tools

* Start working on armor

* Finished armor

* Misc

* Finished uplink
2022-12-19 21:52:59 -06:00
Pieter-Jan Briers
b707b788ac Remove trailing commas from RSIs. (#12865) 2022-12-04 22:47:23 +01:00
Cheackraze
ec00589791 Practice Disabler (#12301)
* pewpew

* renamed the rsi and reparented off WeaponDisabler
2022-11-08 14:21:13 -06:00
Nairod
8da57fb16a Handgun belt sprites (#12081) 2022-10-22 14:53:43 -07:00
TaralGit
0d3a22cffa New sprites for pirate and deckard revolvers (#11481)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-10-03 18:57:10 -07:00
TaralGit
47dd0ff2e8 Advanced laser gun and four resprites (#11102)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-09-10 23:46:38 -07:00
metalgearsloth
0286b88388 NPC refactor (#10122)
Co-authored-by: metalgearsloth <metalgearsloth@gmail.com>
2022-09-06 00:28:23 +10: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
Kara
e43915c94a Proto-kinetic accelerator (#9748) 2022-07-15 14:28:14 +10:00
Kara
ad7889e8a9 Magic staves + wands (#9070) 2022-07-14 19:45:27 -07:00
TaralGit
ccefd0caf0 RPG-7, Kardashev rifle and Hristov heavy sniper resprites (#9729)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-14 08:37:57 -07:00
metalgearsloth
5107bc3be7 Bullet impact effects (#9530) 2022-07-09 13:46:11 +10:00
Nemanja
e36a4e44f5 sprite fix (#9542) 2022-07-09 04:09:27 +10:00
TaralGit
f6da17d7d9 highlights (#9332)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-07-06 19:57:23 +10:00
metalgearsloth
40eecdd78a Stamina damage (#9230) 2022-07-06 18:06:12 +10:00
TaralGit
8b0e8915a8 Hand made pistol replacement and inhands for ak and china lake (#9198)
* hand made pistol replacement and inhands for ak and china lake

* china lake inhands correction

* change

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-27 19:18:01 -05: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
Kara
cc755a2051 Projectile spells + fireball spell (#9058)
* Projectile spells + fireball spell

* say it with some gumption
2022-06-23 03:24:50 -07:00
TaralGit
0b7d22c168 quickfix (#8942)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-18 13:20:16 +10:00
metalgearsloth
dfad885e82 Fix large_casing sprite and cobra mag (#8809) 2022-06-13 19:30:15 +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
Emisse
ea498da45d Captain's Antique Laser Gun and Traitor Objective (#7940) 2022-05-09 17:43:36 -07:00
TaralGit
52ec5036d5 Another gun PR (#7450)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-04-15 15:39:16 -07:00
T-Stalker
f88fe48a6a Adds Onestar mech ghost-role enemy (#6943)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-03-12 16:14:17 -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
Peptide90
bcfb72519c Adds boxes of all magazine types + box of trashbags and flares (#6891) 2022-02-27 12:56:27 -07: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
Leon Friedrich
5dbe7be294 Fix on-collide explosive collisions (#6186) 2022-01-18 19:26:21 +11: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
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
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