Ed 5420469d62 Merge remote-tracking branch 'upstream/stable' into ed-upstream-sync ...

# Conflicts:
#	Content.Shared/Weapons/Melee/MeleeWeaponComponent.cs

2025-04-15 00:44:29 +03:00

..

Consumable

Add cooked dragon steak and cutlets (#36273)

2025-04-10 08:59:18 -07:00

Decoration

Merge remote-tracking branch 'upstream/master' into ed-16-02-2025-planet-light-upstream

2025-02-16 11:58:47 +03:00

Devices

Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

2025-04-08 23:27:07 +02:00

Economy/cash.rsi

Plates & Cash gridinv visuals (#24075)

2024-01-14 11:44:17 -05:00

Fun

Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

2025-04-08 23:27:07 +02:00

Magic

Wizard: Repulse Spell (#35377)

2025-02-22 10:56:54 -05:00

Materials

Cabinetification (#34293)

2025-02-04 00:52:10 -07:00

Misc

Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

2025-04-08 23:27:07 +02:00

Power

Portable Recharger: Arsenal T3 (#26655)

2024-04-28 13:19:33 +10:00

Specific

Updates to Hydroponic sprites (#35004)

2025-03-27 10:11:02 -07:00

Storage

New security box fills, renamed and replaced sechud box icon (#35057)

2025-04-08 10:23:12 +02:00

Tanks

Resprite the equipped gas canister suit slots (#30809)

2024-08-09 20:32:55 +10:00

Tiles

Upstream sync (#846)

2025-02-06 13:57:14 +03:00

Tools

Add inhands for Holoprojectors, labelers, cone, brb sign, fartbag (#36036)

2025-04-08 23:27:07 +02:00

Vehicles

ATV resprite (#25885)

2024-03-07 08:36:00 +03:00

Weapons

Salvage melee weapon tweaks (#35914)

2025-04-05 23:48:18 -07:00