fish-station/Resources/Textures/Objects/Weapons/Melee
Vigers Ray d853b875eb Merge remote-tracking branch 'refs/remotes/wizards/master'
# Conflicts:
#	Content.Client/Lobby/LobbyUIController.cs
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml
#	Content.Client/Lobby/UI/CharacterSetupGui.xaml.cs
#	Content.Server/Antag/AntagSelectionSystem.cs
#	Content.Server/GameTicking/GameTicker.Lobby.cs
#	Content.Server/Objectives/Systems/KillPersonConditionSystem.cs
#	Content.Server/Store/Systems/StoreSystem.Ui.cs
#	Content.Shared/Inventory/InventorySystem.Relay.cs
#	Resources/Maps/_Sunrise/Shuttles/abandoned_outpost.yml
#	Resources/Prototypes/Entities/Stations/base.yml
#	Resources/Textures/Interface/Misc/job_icons.rsi/meta.json
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm0.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b1.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_b2.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarm_bitem.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmp.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/alarmx.png
#	Resources/Textures/Structures/Wallmounts/air_monitors.rsi/meta.json
2024-11-19 18:34:32 +03:00
..
armblade.rsi Remove CRLF, enforce with workflow (#26401) 2024-03-24 22:06:17 +01:00
baseball_bat.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
bone_spear.rsi Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) 2024-08-02 17:18:59 +10:00
cane.rsi Canes + Cane Blade for Syndicate Librarians (#25873) 2024-04-27 20:22:10 +10:00
cane_blade.rsi Canes + Cane Blade for Syndicate Librarians (#25873) 2024-04-27 20:22:10 +10:00
captain_sabre.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
chainsaw.rsi Chainsaw weapon addition (#17743) 2023-08-05 14:49:55 +10:00
claymore.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
cleaver.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
combat_knife.rsi фиксы 2024-11-13 05:18:48 +03:00
crusher-inhands.rsi Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 2024-10-30 01:38:19 -06:00
crusher.rsi Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 2024-10-30 01:38:19 -06:00
crusher_dagger.rsi Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 2024-10-30 01:38:19 -06:00
crusher_glaive-inhands.rsi Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 2024-10-30 01:38:19 -06:00
crusher_glaive.rsi Give proto-kinetic crushers, glaives, and daggers better inhands. Update the crusher and glaive icons. (#32212) 2024-10-30 01:38:19 -06:00
cult_blade.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
cult_dagger.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
cult_halberd.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
cutlass.rsi
debug.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
e_cutlass.rsi
e_dagger.rsi
e_dagger_loud.rsi Replace the machete and laser in the borg weapons module with an e-dagger and recharging viper (#26947) 2024-07-21 17:04:33 +10:00
e_shield.rsi Energy Shield (#16996) 2023-06-22 00:08:58 -04:00
e_sword-inhands.rsi Resprites energy sword and double energy sword (#22797) 2023-12-20 23:32:11 -07:00
e_sword.rsi Resprites energy sword and double energy sword (#22797) 2023-12-20 23:32:11 -07:00
e_sword_double-inhands.rsi Resprites energy sword and double energy sword (#22797) 2023-12-20 23:32:11 -07:00
e_sword_double.rsi Resprites energy sword and double energy sword (#22797) 2023-12-20 23:32:11 -07:00
energykatana.rsi Фикс всех ошибок в validate_rsis.py 2024-06-12 14:15:29 +03:00
fireaxe.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
fireaxeflaming.rsi Fire Axe resprite 45 degrees v3 (#28866) 2024-07-06 00:37:29 +03:00
flash.rsi
gohei.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
gorilla.rsi Adds gorilla gauntlet storage sprite and updates hit sound (#33167) 2024-11-15 16:48:28 -06:00
incomplete_bat.rsi Make baseball bat crafting require a slicing tool (#26742) 2024-04-05 11:41:35 -04:00
katana.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
kitchen_knife.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
kukri_knife.rsi Minor revision of mercenary items 2 (#17957) 2023-07-11 13:32:37 -06:00
machete.rsi Merge sunrise build (#2) 2024-05-31 02:16:18 +03:00
needle.rsi official security anti-inflatable armament (#18634) 2023-08-03 19:53:06 -06:00
pickaxe.rsi pickaxe inhand resprite + wielded sprites (#18735) 2023-08-06 00:50:00 -06:00
plasma_shiv.rsi
plasma_spear.rsi Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) 2024-08-02 17:18:59 +10:00
reinforced_shiv.rsi
reinforced_spear.rsi Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) 2024-08-02 17:18:59 +10:00
shields.rsi Energy Shield (#16996) 2023-06-22 00:08:58 -04:00
shiv.rsi
sledgehammer.rsi Space Asshole Gear (#21243) 2023-10-29 20:09:18 -04:00
spear.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' 2024-08-05 17:22:05 +03:00
stunbaton.rsi
stunprod.rsi stun prod (#17467) 2023-08-10 12:33:34 +03:00
survival_knife.rsi фиксы 2024-11-13 05:18:48 +03:00
teleriot_shield.rsi Telescopic shield (#20048) 2023-09-13 18:03:12 -07:00
Throngler-in-hand.rsi Added "The Throngler" (#22995) 2023-12-27 04:13:47 -07:00
Throngler2.rsi Added "The Throngler" (#22995) 2023-12-27 04:13:47 -07:00
ThronglerPlushie.rsi Throngler Plushie Sprite (#30969) 2024-08-13 23:32:53 +03:00
throwing_knife.rsi Lighten throwing knive's border (#28977) 2024-06-14 10:55:30 +03:00
truncheon.rsi Security Melee Weapon, the Truncheon (#17666) 2023-07-31 14:37:12 -06:00
uranium_shiv.rsi
uranium_spear.rsi Add "fill levels" to spear in-hand/wielded/equipped sprites (#28865) 2024-08-02 17:18:59 +10:00
web-shield.rsi Arachnid 2: Episode 2 (#19984) 2023-11-08 12:18:52 -08:00
white_cane.rsi
xeno_claw.rsi