Commit Graph

1441 Commits

Author SHA1 Message Date
Alekshhh
2b7cc01e7f Capgun Ammo Recolor (#17617)
* he's got a gun

* gung

* oops
2023-06-24 13:56:42 -06:00
OctoRocket
4c15474619 [Sprite] Fix an error in the flannel sprite. (#17618) 2023-06-24 13:56:31 -06:00
Nemanja
bdbd01fbaf node scanner resprite (#17609) 2023-06-24 14:20:26 +10:00
Nemanja
7ab5127286 Cargo Bounties (#17344)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-22 21:49:33 +10: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
Sailor
4c43e20af3 Vend contraband/emag inventory expansion (#17503)
* Vend contraband/emag inventory expansion, do a 2-year TODO

* Map checks failed real
2023-06-20 14:30:27 -06:00
Flareguy
c27185720d updates supply department jumpsuits (#17506) 2023-06-20 14:26:40 -06:00
Jackal298
3cb919fe77 Small addition to mercenary items (#17464)
* Small addition to mercenary items

try number three

* Bot

* Bot fix
2023-06-19 11:38:57 -06:00
Flareguy
0e238dabc9 Adds the SWAT Helmet (#17384)
* adds swat helmet

* joever

* epic > rare

* A
2023-06-18 17:38:55 -06:00
Nemanja
9c1c7cabb3 machine part resprite (#17447) 2023-06-18 17:28:27 -06:00
Nim
9797a0d42e ert and death squad gas mask (#17444) 2023-06-18 17:14:31 -06: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
Nemanja
0d0bef455e artifact resprite (#17417) 2023-06-19 01:02:27 +10:00
Nemanja
0b5ccf3395 Artifact Fragments (#17420) 2023-06-19 00:56:45 +10:00
PixelTK
941a3cd113 Arachnid sprite changes (#17412)
* Changed arachnid sprites to be less human-like and more "fluffy"

* few fixes + tweaks

* torso quick change
2023-06-17 14:47:31 -05:00
lzk
b31c848418 [Sprites] guitar back and some resprites (#16611) 2023-06-15 21:55:06 +10:00
Nemanja
fa23d57fd8 Remove cloning tech, add bluespace chemistry tech (#17345) 2023-06-14 21:11:11 -06:00
brainfood1183
4322faf5c9 Behonker and Clown Spider (ready for merge) (#16678) 2023-06-15 12:47:36 +10:00
SonicHDC
7c609c913e Dumplings (#16966) 2023-06-15 12:45:30 +10:00
Flareguy
8dae049ed7 EVA suit resprite (+ new fluff hardsuit) (#17268)
* eva suit resprite

* speed bump

* yaml linter fix
2023-06-14 20:15:22 -06:00
Nemanja
9946bd1f61 Sheet-meister 2000 (#16686) 2023-06-15 10:49:23 +10:00
Nemanja
4bee773925 RND server boards (#17057) 2023-06-08 17:39:29 +10:00
HerCoyote23
080060d135 L6 Wielded Sprites (#17078) 2023-06-08 17:22:34 +10:00
brainfood1183
cd7d4be188 HAMTR mech (hamster mech) (needs review) (#16393)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-08 16:33:35 +10:00
TemporalOroboros
d71b6c84e5 Converts the particle accelerator over to ECS + misc (#17075)
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-06-08 16:25:59 +10:00
deltanedas
07d2430840 logic gate stuff (#16943)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-06-07 16:48:42 -07:00
DEATHB4DEFEAT
a8337172ca More gendered sprite masks (#14735) 2023-06-05 21:11:45 +10:00
Leon Friedrich
2ef95a3225 Replay client (#15001) 2023-06-05 14:44:09 +10:00
Nemanja
b9fb66f005 Chem guidebook (#17123)
* im good at atomizing. welcome to half-finished chem guides.

* wagh

* e

* save work

* aa

* woweee UI

* finishing the last of it

* don't actually update the engine :(

---------

Co-authored-by: moonheart08 <moonheart08@users.noreply.github.com>
2023-06-04 15:45:02 -05:00
Renlou
e190771d09 Add funny hampter plushie (#17099) 2023-06-03 11:50:53 -07:00
brainfood1183
c99585c94f Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
Flareguy
4a2a4e4eb5 Removes the IHS voidsuit, adds the ancient voidsuit (#16988)
* removes IHS voidsuit, adds ancient voidsuit

* remove ihs gloves

* fix

* fucjk
2023-05-31 16:03:14 -06:00
eoineoineoin
c8a2fb6cd4 Add custom paper for forensic scanner output (#16221)
Co-authored-by: Eoin Mcloughlin <helloworld@eoinrul.es>
2023-05-31 19:09:05 +10:00
lzk228
acae8fe973 brown bandana cargodrobe(#16949) 2023-05-30 22:32:15 -06:00
Puro
2179a4d534 [Sprite + SG] Centcom (#16913) 2023-05-30 21:43:55 -06:00
brainfood1183
e0ef7712c8 Station Map console Fixes and Resprite (#16697) 2023-05-28 16:42:41 +10:00
Julian Giebel
48518e502f Revert "Mail resprite (#15832)" (#16861)
This reverts commit 1195c6443a.
2023-05-27 12:31:10 -05:00
OctoRocket
3499f4265b [Add] Adds CentCom scarf (#16832)
Co-authored-by: faint <46868845+ficcialfaint@users.noreply.github.com>
Co-authored-by: metalgearsloth <31366439+metalgearsloth@users.noreply.github.com>
2023-05-27 19:09:32 +10:00
metalgearsloth
552fbb0585 Adds grappling gun (#16662) 2023-05-27 14:15:15 +10:00
Nemanja
1aceaccc27 Resprite network configurator (#16838) 2023-05-27 13:51:33 +10:00
Kit0vras
b3ac3c076e Broken wood tiles (#16776)
* broken wood tiles decals

* deleting decals

* broken wood tile
2023-05-25 16:06:06 -06:00
deltanedas
5c98b350a2 megafauna elimination mission and fish salv faction (#16720)
Co-authored-by: deltanedas <@deltanedas:kde.org>
2023-05-25 22:23:20 +10:00
potato1234_x
56f33bbae4 TG Smartfrige Sprite (#16801) 2023-05-25 19:11:12 +10:00
Slava0135
9abe2900b7 less syringe fill states (#16744) 2023-05-23 13:06:35 -06:00
HerCoyote23
e45dd96af9 Northstar Gloves (#16021)
* Added Gloves of North Star, no sprite or talking yet...

* Added sprites for the gloves of the north star...

* Replaced more placeholder sprites for northstar gloves...

* Added gloves of the north star to uplink...

* Added speech on hit, not yet configureable

* Not functional yet, but a step in the right direction I hope...

* IT WORKS!!

* Licensing and cleanup

* Reduced attack speed, changed from chat to popup, added some admin logging. It was causing too much adminlog spam otherwise

* Reorganized some files, final build??

* Changed the adminlog type from Verb to new type ItemConfigure

* More cleanup, fix sprite reference maybe

* Keronshb's suggestions, fixed some stuff, made hit sound use the meaty punch sfx

* Adds support for hiding speak/whisper/emote from adminlogs, makes northstar speak again!

* Some file shuffling, some of Keronshb's requests. Might appear a bit funky in github because vscode kept duplicating files for some reason and I had to delete them

* Made it work with the latest changes on Master

* Final? cleanup, upped dmg to 8, made ui not activate on activateinhand, instead you need to right click

* Set value to 0 credits, that's all

* Well that was much easier than I made it out to be. Now you can only activate the gloves with right click, no more mispredicts.

* Update MeleeWeaponSystem.cs

Iunno why this got changed in the first place, but I'm changin it back

* emptycommit

* emptycommit

* The tiny fixening
2023-05-23 14:12:30 -04:00
MisterMecky
8e3f2cc1fa fix watercooler sprite (Also adds solution visuals) (#16740) 2023-05-24 01:24:42 +10:00
potato1234_x
cf80193ef6 whoops (#16728) 2023-05-22 23:59:37 -06: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
MisterMecky
0e337fb646 add solution visuals for watertank, fueltank etc. (#16653) 2023-05-21 18:27:51 -06:00