CatStation/Resources/Textures/Objects/Weapons/Melee
Morb0 a0bce916fb Merge remote-tracking branch 'refs/remotes/upstream/master' into upstream-sync
# Conflicts:
#	Content.Server/Administration/Systems/AdminSystem.cs
#	Content.Server/Chat/Managers/ChatManager.cs
#	Resources/Prototypes/Entities/Objects/Consumable/Food/produce.yml
#	Resources/Prototypes/Entities/Objects/Weapons/Melee/e_sword.yml
#	Resources/Prototypes/Guidebook/rules.yml
#	Resources/Prototypes/Maps/cluster.yml
#	Resources/Prototypes/Maps/europa.yml
#	Resources/Prototypes/Maps/origin.yml
2024-08-16 14:29:08 +03:00
..
armblade.rsi Remove CRLF, enforce with workflow (#26401) 2024-03-24 22:06:17 +01:00
baseball_bat.rsi
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
chainsaw.rsi
claymore.rsi
cleaver.rsi
combat_knife.rsi
crusher.rsi
crusher_dagger.rsi
crusher_glaive.rsi
cult_blade.rsi
cult_dagger.rsi
cult_halberd.rsi
cutlass.rsi
debug.rsi
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
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 Space Ninja 3: an old enemy in a new environment (#20713) 2023-10-04 18:18:28 -04:00
fireaxe.rsi Fireaxe icon resprite (#22805) 2023-12-21 01:03:52 -07:00
fireaxeflaming.rsi Fire Axe resprite 45 degrees v3 (#28866) 2024-07-06 00:37:29 +03:00
flash.rsi
gohei.rsi
gorilla.rsi GORILLA Gauntlets (#23012) 2023-12-27 20:11:13 -07:00
incomplete_bat.rsi Make baseball bat crafting require a slicing tool (#26742) 2024-04-05 11:41:35 -04:00
katana.rsi
kitchen_knife.rsi
kukri_knife.rsi
machete.rsi
needle.rsi
pickaxe.rsi Revert upstream pickaxe icon sprite 2023-08-06 10:25:13 +03:00
plasma_shiv.rsi [Resprite] Melee weapon part 2 (#1131) 2024-07-02 15:46:36 +03:00
plasma_spear.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-02 11:29:44 +03:00
reinforced_shiv.rsi [Resprite] Melee weapon part 2 (#1131) 2024-07-02 15:46:36 +03:00
reinforced_spear.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-02 11:29:44 +03:00
shields.rsi
shiv.rsi [Resprite] Melee weapon part 2 (#1131) 2024-07-02 15:46:36 +03:00
sledgehammer.rsi Space Asshole Gear (#21243) 2023-10-29 20:09:18 -04:00
spear.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-02 11:29:44 +03:00
stunbaton.rsi
stunprod.rsi stun prod (#17467) 2023-08-10 12:33:34 +03:00
survival_knife.rsi
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
uranium_shiv.rsi [Resprite] Melee weapon part 2 (#1131) 2024-07-02 15:46:36 +03:00
uranium_spear.rsi Merge remote-tracking branch 'refs/remotes/wizards/master' into upstream-sync 2024-08-02 11:29:44 +03:00
web-shield.rsi Arachnid 2: Episode 2 (#19984) 2023-11-08 12:18:52 -08:00
white_cane.rsi
xeno_claw.rsi