Commit Graph

92 Commits

Author SHA1 Message Date
drteaspoon420
1a67c5583a Solutions on thrown spears/shot arrows (#20416)
* Solutions on thrown spears/shot arrows

Spears inject their solution on thrown hit.
Arrows now have 5u solution storage that is injected when it hits target.

* Whoops, wrong arrow.

Instead of base arrow, I accidentally modified the 'regular arrow'

* spear and arrow solution graphics

Spears and arrows now show what they are doped with when they are on ground. (just like beakers)
2023-09-24 15:46:16 -04:00
Kara
f8d194b117 Bows & arrows (#19771) 2023-09-22 02:45:21 -07:00
Kara
70e0520a2c Watchers (#19367) 2023-08-27 16:14:57 +10:00
chromiumboy
26eb71f1eb C.H.I.M.P handcannon redesign (#19004)
* Added basic alternative fire mode system for the CHIMP

* Redesign of the CHIMP handcannon
- the CHIMP now has an internal rechargable battery (10 shots at 100% charge)
- it has three alternative fire modes, one for each particle type, that its user can easily switch between
- syndicate scientists have access to an experimental version which can also fire omega particles (4 TC)
- each particle type now has a distinct color and damage type: delta (red): heat, epsilon (green): radiation, zeta (yellow): shock, omega (purple): heat + radiation. This affects A.P.E.s as well
- CHIMP particles now do 10 damage (up from 5)
- all CHIMP particle cartridges have been removed from the game (including the syndicate omega particle ammo pack)

* Code revisions

* Code revisions
- Removed changes to particle damage and damage types
- The experimental CHIMP was removed from the syndicate uplink and replaced with an upgrade kit, which when used on a standard CHIMP will convert it to an experimental one

* Code revisions
- Added a 2 second DoAfter for applying the upgrade kit

* Fixed spelling mistake

* Update projectiles.yml

Removed commented code

* Update Content.Server/Weapons/Ranged/Systems/AlternativeFireModesSystem.cs

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>

* Code revisions
- Implemented changes requested by EmoGarbage
- Removed UpgradeKitComponent in favor of using a construction graph
- Renamed AlternativeFireModesComponent.cs to BatteryWeaponFireModesComponent.cs

Textures
- Reverted omega particle to being a green color
- Epsilon particles are now a cyan color

* Added comments

* Revisions
- Moved BatteryWeaponFireModesComponent from Shared to Server
- Restricted access to this component to BatteryWeaponFireModesSystem
- Changed the CHIMP upgrade kit to a chip
- Updated the localization files to reflect this change

* Delete interaction-upgrade-kit-component.ftl

This file is no longer needed

* Update battery_guns.yml

Added new description for the experimental CHIMP

* Update battery_guns.yml

Updated experimental CHIMP description again...

* Fixed issue with ItemComponent

---------

Co-authored-by: Nemanja <98561806+EmoGarbage404@users.noreply.github.com>
2023-08-19 18:54:52 -04:00
TaralGit
8acac895fc (Re)Adds open bolt animations for gun sprites (#17219)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-13 15:58:07 +10:00
RiceMar1244
7de1cedff5 PKA resprite (#19024)
* Changed all PKA sprites, added wield sprites, modified meta.json

* Added animation assets for future yaml'ing. Made changes to existing textures.

* meta.json changes

* Corrected arsenal.yml missing sprite

* Removed unused animation assets.

* Put back the one animation asset I was suppose to keep.
2023-08-13 00:50:41 -04:00
metalgearsloth
5688c40f0e Resprite grappling hook (#18939) 2023-08-10 16:16:57 +10:00
Errant
5b2d20b654 Disabler inhand sprites (#18918) 2023-08-09 14:43:34 -06:00
Vordenburg
bd13a4b357 Cull high-velocity ammo (#18656) 2023-08-08 11:08:53 +10:00
Nim
6a2aac39e4 Magazine for C20R in uplink (#17108) 2023-08-02 20:03:39 +10:00
Jackal298
3ee808fcbe Syndicate Sniper bundle change and rework of the anti-material ammo box (#18414) 2023-07-29 00:09:33 -06:00
Jackal298
ceb77bc778 Retexture of weapons in the hands of the character Part 2 (#18365) 2023-07-28 13:55:46 -06:00
LankLTE
1247d23ce2 Revolver / Python changes. (#18352) 2023-07-27 17:32:26 +10:00
Jackal298
4a32c4698d Retexture of weapons in the hands of the character Part 1 (#18326)
* Retexture of weapons in the hands of the character Part 1

The beginning of a PR series dedicated to the refinement of weapon textures

* Refinement of a homemade pistol

* Test bot fix

* Test bot fix

* Meta
2023-07-26 20:18:11 -06:00
Flareguy
23ab5b8f3f Reworks the Python to match the SS13 .357 (#18197)
* buffs the python to replicate /tg/ stats

* meta.json shits

* fuc

* fix attributions.yml

* yaml linter fix?

* fix fill
2023-07-24 17:02:15 -06:00
Flareguy
ae9af73263 Adds the Improvised Shotgun (#18025)
* improvised shotguns

* spaghetti

* progress so far (TODO: rename modular_reciever.yml)

* i forgotted

* everything so far

* fuck fuck fuck (boner boner)

* ganon: You must die

* bobie

* boob boob booby balls
2023-07-18 15:10:07 -06:00
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617)
* he's got a gun

* gung

* oops
2023-06-24 13:56:42 -06:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
brainfood1183
4322faf5c9 Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
HerCoyote23
080060d135 L6 Wielded Sprites (#17078) 2023-06-08 17:22:34 +10:00
metalgearsloth
552fbb0585 Adds grappling gun (#16662) 2023-05-27 14:15:15 +10:00
TaralGit
57dfb82117 Shivs, spears and guns (#16654)
* weapons

* craft

* crafting but working this time. hopefully

* spear crafting fix

* graph id fix

---------

Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2023-05-21 18:14:42 -06:00
metalgearsloth
65e69cd472 Fix tethergun sprite (#16616) 2023-05-20 00:48:18 +10:00
metalgearsloth
4efb41aa58 Adds force-gun (#16561) 2023-05-19 17:10:31 +10:00
metalgearsloth
775258be52 Add tether gun (#16430) 2023-05-18 11:36:06 +10:00
Nemanja
4c2b521c90 Water gun cargo crate (#16172) 2023-05-07 13:14:54 +10:00
Nemanja
98481fb9a2 Spray Nozzle & Backpack Water Tank (#16133) 2023-05-06 11:50:09 +10:00
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