Commit Graph

148 Commits

Author SHA1 Message Date
Jackal298
09b2151e08 Space Ninja 3: an old enemy in a new environment (#20713)
Make Ninja more stable in terms of design
2023-10-04 18:18:28 -04:00
Nemanja
c396222a78 fix spears linter fail (#20476) 2023-09-24 16:45:36 -04:00
Tunguso4ka
ee54022832 Ash Walker`s spear and uniform (#20292)
* bones, gladiators, milk, spear and tears

* :trollface: my copy/paste python script did the funny

* forgor

* fixed

* mat.yml fixed

* bones

* bone armor

* gladiator uniform now in clothesmate like ss13

* bone armor craft

* pieces

* i was dumb in the past, now im dumb too

* that was dumb...

* fixing stuff

* i hate git

* Revert "i hate git"

This reverts commit 17ef4e5a07a3ebad7d4f487f15721d1df16d757f.

* Revert "fixing stuff"

This reverts commit 4fc5d6b2dc1fc6ebb3945bdf5663b8e432ca7aa3.

* this will work?

* i fucking merged it
2023-09-24 15:57:10 -04:00
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
Nim
afd30c5c75 Telescopic shield (#20048)
* telescopic shield

* research

* removed the shield from the locker

* sound

* eh

* fix
2023-09-13 18:03:12 -07:00
deltanedas
24810d916b ninja 2 electric boogaloo (#15534)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-09-10 16:20:27 +10: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
deltanedas
8b1af46a2b add throwing star (#18700)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-08-14 01:18:48 +10: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
AlexMorgan3817
62ccbdaeae Supermatter grenades (#13747)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-08-11 00:29:47 +10:00
kxv
4772d9e6f5 stun prod (#17467)
* stunprod

* update

alphabetical correct,
the battery charge is less,
stamina damage is less (5 hits now),
graph id fixed

* update

crafting has become more difficult

* update

makeshiftstunprod

* remove netsync

* Update meta.json

* fix

* remove bluntStaminaDamageFactor
2023-08-10 12:33:34 +03: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
Nemanja
2dcf7d21d8 pickaxe inhand resprite + wielded sprites (#18735)
* pickaxe inhand resprite

* wtf piece of shit
2023-08-06 00:50:00 -06:00
Jessetriesagain
1034081bf5 Chainsaw weapon addition (#17743)
Co-authored-by: JessePretendstoCode <j14527998@gmail.com>
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2023-08-05 14:49:55 +10:00
Nemanja
6db6b423f4 official security anti-inflatable armament (#18634) 2023-08-03 19:53:06 -06:00
Nim
6a2aac39e4 Magazine for C20R in uplink (#17108) 2023-08-02 20:03:39 +10:00
HerCoyote23
27becd8986 Security Melee Weapon, the Truncheon (#17666)
* Added Combat Baton

* Add to secfab

* reduce damage to 15

* Renamed to Truncheon, set damage to 17 again.

* Added T2 research, up dmg to 18 cause it'll be rarer.

* Make recipe dynamic
2023-07-31 14:37:12 -06: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
Slava0135
337870f60d Add holy hand grenade (#18107)
* no sound yet

* point light

* hallelujah

* uplink

* fix license maybe?

* 3.0 then (fake)
2023-07-17 13:36:37 -06:00
Jackal298
358a80b39c Minor revision of mercenary items 2 (#17957) 2023-07-11 13:32:37 -06:00
Jackal298
ad253056ca Minor tweak to mercenary item sprites (#17713) 2023-06-28 13:59:30 -06:00
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617)
* he's got a gun

* gung

* oops
2023-06-24 13:56:42 -06:00
Nim
4ed11ca73b Energy Shield (#16996)
* energy shield

* description edits

* shields protect

* small correction

* say no to asteroid bees

* fix

* BlockModifier

* fix

* tweak

* tweak

* ops

* fix

* Update RobustToolbox

* Revert "Update RobustToolbox"

This reverts commit 55be82fe537490367e0afaf86365b0e274e6597e.

* formatting
2023-06-22 00:08:58 -04:00
Nemanja
3975578e4e Arsenal tech discipline (#17400) 2023-06-18 15:56:49 -06:00
FacePluslll
422a84e029 Adds Double bladed Esword (#17227)
* Changed Energy Sword system to allow Wieldable eswords

Needed to add conditions to allow the wielding system to handle the esword if the component existed in the entity. The normal eswords work just fine still.

* Adds sprites for double bladed esword

* added double bladed esword to yml

* Add double bladed esword to uplink catalog

* fixed sprites on right handed wielding

* decresed speed a little and added a wielding time

* Reduced damage

* Damage change

* Balence change

* edited attack speed and heavy windup

* fixed readability issue and removed unwanted brackets

* reflectProp to .75

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* wieldTime to 0

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* litDisarmMalus to .7

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>

* changed heat and slash damage to 9 and structural damage to 20

* changed uplink desc

---------

Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-06-18 15:35:23 -04: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
Jackal298
f8d404d783 Mercenary Items (#16665)
* Mercenary Items

Adding Mercenary Items

* Fix

* icon jumpsuit fix

* Bot

* bot fix
2023-05-22 15:57:15 -06: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
Jackal298
11a1140127 Fix kitchen cleaver sprite (#16438) 2023-05-14 14:26:32 -04:00
metalgearsloth
6417bb4fa0 Proto-kinetic crusher (#16277)
Co-authored-by: AJCM-git <60196617+AJCM-git@users.noreply.github.com>
2023-05-14 13:15:18 +10:00
forkeyboards
e72db80060 White Cane for Blind People (#16318) 2023-05-13 13:11:35 +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