Commit Graph

61 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
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
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
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
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
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
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
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
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
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
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
TaralGit
ab560b6976 Cult weapons (#13414)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2023-01-17 11:08:36 -07:00
Easypoller
78a08c36f3 Baseball bat now wieldable (#13130) 2023-01-10 21:27:58 +11:00
metalgearsloth
798a880a82 Fix some more rsis (#13107) 2022-12-20 09:37:34 +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
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
Moony
ef6d0344de Revert "Fireaxe resprite" (#9676) 2022-07-13 10:22:31 +02:00
Deahaka
a7e4152171 Fireaxe resprite (#9302)
* fieraxe

* traitor-fireaxe
2022-07-08 20:03:20 -07: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
EmoGarbage404
1c7a09b736 Fire Axe [New syndie item] (#9088) 2022-06-23 18:27:28 -07:00
TaralGit
0b7d22c168 quickfix (#8942)
Co-authored-by: and_a <and_a@DESKTOP-RJENGIR>
2022-06-18 13:20:16 +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
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
Emisse
04792a47de Mantles, Medals, Changeling Prep (#7233)
Co-authored-by: mirrorcult <lunarautomaton6@gmail.com>
2022-03-27 21:15:39 -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
Fishfish458
5a03f6fa26 Add Energy dagger (#6669) 2022-02-12 21:42:10 +11:00
Lamrr
4d3c085eb7 Adds dedicated salvage specialist role (#6451) 2022-02-08 21:01:16 +11:00
Júlio César Ueti
6d5eee0d4c Add ESwords (now Inventory refactor compliant!) (#6000)
Co-authored-by: metalgearsloth <comedian_vs_clown@hotmail.com>
2022-01-24 23:55:48 +11:00
Lamrr
44d849d3f6 (Re)adds captain's sabre (#6101) 2022-01-11 17:50:10 +11:00
mirrorcult
72dcef4203 Reduce locker/crate hp and resistances, add spear wielding (#6001) 2022-01-03 10:53:09 +01:00
mirrorcult
62f6c8dd8e Wieldable/two-handed weapons (#4554)
* wielding kinda works

* rough out all the edges, wielding works nicely

* popups + loc

* increase damage & extra damage against whitelist

* small fixes

* forgot to actually do that

* reviews

* reviews + thing

* use resistances and not extradamageagainstwhitelist

* slashy

* make increasedamageonwield and melee hit events work with modifiersets

* Silly individual
2021-09-17 07:16:11 -07:00
Swept
19551047c8 Spear shows on all sides when on back 2021-09-12 13:16:29 -07:00
Swept
030c4a07ce Can now equip fireaxe, claymore, spear and baseball back on your back (#4484)
* Can equip spears and claymores on your back now

* Adds fireaxe and baseball bat back equip
2021-08-17 19:42:50 -07: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