Commit Graph

148 Commits

Author SHA1 Message Date
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
Slava0135
c00bd9c247 Add hot potato (#14204)
Co-authored-by: AJCM <AJCM@tutanota.com>
2023-04-22 21:40:36 +10:00
keronshb
ac87effca0 [Revert] Reverts Ninja (#15516)
* Revert "[Antag] add space ninja as midround antag (#14069)"

This reverts commit c1cda0dbf8.

* Revert "[Fix] move ninja objectives into NinjaRole (#15490)"

This reverts commit 251f429fb3.
2023-04-19 01:43:09 -06:00
deltanedas
c1cda0dbf8 [Antag] add space ninja as midround antag (#14069)
* start of space ninja midround antag

* suit has powercell, can be upgraded only (not replaced with equal or worse battery)

* add doorjacking to ninja gloves, power cell, doorjack objective (broken), tweaks

* 💀

* add basic suit power display that uses stamina rsi

* add draining apc/sub/smes - no wires yet

* add research downloading

* ninja starts implanted, move some stuff to yaml

* add Automated field to OnUseTimerTrigger

* implement spider charge and objective

* fix client crash when taking suit off, some refactor

* add survive condition and tweak locale

* add comms console icon for objective

* add calling in a threat - currently revenant and dragon

* combine all glove abilities

* locale

* spark sounds when draining, refactoring

* toggle is actually toggle now

* prevent crash if disabling stealth with outline

* add antag ctrl for ninja, hopefully show greentext

* fix greentext and some other things

* disabling gloves if taken off or suit taken off

* basic energy katana, change ninja loadout

* recallable katana, refactoring

* start of dash - not done yet

* katana dashing ability

* merge upstream + compiling, make AutomatedTimer its own component

* docs and stuff

* partial refactor of glove abilities, still need to move handling

* make dooremaggedevent by ref

* move bunch of stuff to shared - broken

* clean ninja antag verb

* doc

* mark rule config fields as required

* fix client crash

* wip systems refactor

* big refactor of systems

* fuck

* make TryDoElectrocution callable from shared

* finish refactoring?

* no guns

* start with internals on

* clean up glove abilities, add range check

* create soap, in place of ninja throwing stars

* add emp suit ability

* able to eat chefs stolen food in space

* stuff, tell client when un/cloaked but there is bug with gloves

* fix prediction breaking gloves on client

* ninja soap despawns after a minute

* ninja spawns outside the station now, with gps + station coords to navigate

* add cooldown to stun ability

* cant use glove abilities in combat mode

* require empty hand to use glove abilities

* use ghost role spawner

* Update Content.Server/Ninja/Systems/NinjaSuitSystem.cs

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

* some review changes

* show powercell charge on examine

* new is needed

* address some reviews

* ninja starts with jetpack, i hope

* partial feedback

* uhh

* pro

* remove pirate from threats list

* use doafter refactor

* pro i gave skeleton jetpack

* some stuff

* use auto gen state

* mr handy

* use EntityQueryEnumerator

* cleanup

* spider charge target anti-troll

* mmmmmm

---------

Co-authored-by: deltanedas <deltanedas@laptop>
Co-authored-by: deltanedas <user@zenith>
Co-authored-by: deltanedas <@deltanedas:kde.org>
Co-authored-by: keronshb <54602815+keronshb@users.noreply.github.com>
2023-04-17 01:33:27 -06: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
Slava0135
b2972c1d2c Add emp grenade (#14393) 2023-03-06 11:05:12 -08:00
TaralGit
ab560b6976 Cult weapons (#13414)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2023-01-17 11:08:36 -07:00
Kara
7253592126 Gunify pneumatic cannon (#13296) 2023-01-16 08:56:09 -08:00
Easypoller
78a08c36f3 Baseball bat now wieldable (#13130) 2023-01-10 21:27:58 +11:00
Leon Friedrich
b33d1f003b Add RGB staff (#13125) 2023-01-01 16:01:40 -08:00
metalgearsloth
798a880a82 Fix some more rsis (#13107) 2022-12-20 09:37:34 +01: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
OctoRocket
001830b6e4 Fixed energy dagger sprite being flipped the wrong way in one frame of its animation (#10560) 2022-08-13 22:15:54 -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
Moony
ef6d0344de Revert "Fireaxe resprite" (#9676) 2022-07-13 10:22:31 +02:00
metalgearsloth
5107bc3be7 Bullet impact effects (#9530) 2022-07-09 13:46:11 +10:00
Deahaka
a7e4152171 Fireaxe resprite (#9302)
* fieraxe

* traitor-fireaxe
2022-07-08 20:03:20 -07: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
keronshb
d65601f024 Blocking and Shields (#8584)
* Blocking

* Fixes Bodytype bug

* Blocking Damage Modifier

* Storing bodytype

* Consolidates Stop Blocking code

* Consolidates more methods

* Some cleanup, hitbox fix

* Shield Textures

* Passive blocking modifier check

* Localization, popups, and more cleanup

* Small cleanup

* Relay event

* Fixes a shutdown bug, adds specific containers and sets

* Popups and sounds

* Fixes typo

* Removes whitespace, adds comment

* Some requested changes

* Remove Shared

* Audio fix

* More changes

* More requested changes

* Properly remove on shutdown

* Adds riot shields to seclathes

* SecTech Riot shield

* Constant variable

* Relay transfer to user blocking system

* More destruction behavior

* Adds a shape field

* Riot shield cleanup

* More requested changes.

* Prevents blocking attempt where a user cannot be anchored

* Listen for anchor change

* Unused using cleanup

* More shields.

* Buckler

* Construction

* Linter fix
2022-07-04 16:31: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
EmoGarbage404
1c7a09b736 Fire Axe [New syndie item] (#9088) 2022-06-23 18:27:28 -07: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
EmoGarbage404
63fd01f3bb Zombie Rework & Polymorph Expansion (#8413)
Co-authored-by: Kara <lunarautomaton6@gmail.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2022-06-12 15:53:13 +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
EmoGarbage404
db56d5ef60 Zombies!!! (#7509)
* wip

* heal on bite

* more fixes and additions

* don't crash

* Update medicine.yml

* zombie claw item and damage resist

* ignoredcomponents.cs

* Add zombie claw, fix infection, add immunities

* fix

* razzle dazzle

* yaml fix

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: Moony <moonheart08@users.noreply.github.com>

* sdasadsadsadasd

* Generalize DiseaseProgression.cs

* final final final final final final cope seethe

* Update medicine.yml

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update BloodstreamSystem.cs

* Update Content.Server/Disease/Components/DiseaseZombieComponent.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* Update Content.Server/Disease/DiseaseZombieSystem.cs

Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>

* fixing until i die

* folder + zombietransfer fix

* smol fixe

* the smallest of fixes

* aaaa

* Infection timer buff

Co-authored-by: Moony <moonheart08@users.noreply.github.com>
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-04-18 17:30:22 -05:00
Leon Friedrich
a231429cb4 Make energy swords use RgbLightController (#7344) 2022-04-16 15:11:48 +10:00
TaralGit
52ec5036d5 Another gun PR (#7450)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-04-15 15:39:16 -07:00