NikoTeam/CatStation
4
0
Fork 0
mirror of https://github.com/space-syndicate/space-station-14.git synced 2026-10-09 18:31:17 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 4
CatStation/Resources/Audio/Weapons
History
Exact
Morb0 860f045b08 Merge remote-tracking branch 'upstream/master' into upstream-sync 
# Conflicts:
#	Resources/Audio/Machines/attributions.yml
#	Resources/Prototypes/Catalog/Fills/Books/bookshelf.yml
#	Resources/Prototypes/Catalog/Fills/Lockers/security.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/curadrobe.yml
#	Resources/Prototypes/Catalog/VendingMachines/Inventories/lawdrobe.yml
#	Resources/Prototypes/Entities/Objects/Specific/Medical/hypospray.yml
#	Resources/Prototypes/Roles/Jobs/Security/security_officer.yml
#	Resources/Prototypes/Roles/Jobs/Security/warden.yml
#	Resources/Prototypes/Voice/speech_emotes.yml
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-left.png
#	Resources/Textures/Clothing/OuterClothing/Coats/labcoat_cmo.rsi/open-inhand-right.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookfireball.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookforcewall.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/bookknock.png
#	Resources/Textures/Objects/Magic/spellbooks.rsi/meta.json
#	Resources/Textures/Objects/Magic/spellbooks.rsi/spellbook.png
#	Resources/Textures/Objects/Misc/books.rsi/book0.png
#	Resources/Textures/Objects/Misc/books.rsi/book1.png
#	Resources/Textures/Objects/Misc/books.rsi/book2.png
#	Resources/Textures/Objects/Misc/books.rsi/book3.png
#	Resources/Textures/Objects/Misc/books.rsi/book4.png
#	Resources/Textures/Objects/Misc/books.rsi/book5.png
#	Resources/Textures/Objects/Misc/books.rsi/book6.png
#	Resources/Textures/Objects/Misc/books.rsi/book7.png
#	Resources/Textures/Objects/Misc/books.rsi/book8.png
#	Resources/Textures/Objects/Misc/books.rsi/book_bar.png
#	Resources/Textures/Objects/Misc/books.rsi/book_boneworking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_borg.png
#	Resources/Textures/Objects/Misc/books.rsi/book_chemistry.png
#	Resources/Textures/Objects/Misc/books.rsi/book_cooking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_demonomicon.png
#	Resources/Textures/Objects/Misc/books.rsi/book_detective.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering.png
#	Resources/Textures/Objects/Misc/books.rsi/book_engineering2.png
#	Resources/Textures/Objects/Misc/books.rsi/book_fish.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hacking.png
#	Resources/Textures/Objects/Misc/books.rsi/book_hydroponics_pod_people.png
#	Resources/Textures/Objects/Misc/books.rsi/book_infections.png
#	Resources/Textures/Objects/Misc/books.rsi/book_nuclear.png
#	Resources/Textures/Objects/Misc/books.rsi/book_origami.png
#	Resources/Textures/Objects/Misc/books.rsi/book_particle_accelerator.png
#	Resources/Textures/Objects/Misc/books.rsi/book_space_law.png
#	Resources/Textures/Objects/Misc/books.rsi/meta.json
2024-04-02 11:32:48 +03:00
..
Guns Merge remote-tracking branch 'upstream/master' into upstream-sync 2024-01-31 00:23:19 +03:00
Xeno Converted weapons license.txts to attributions.ymls (#21444) 2023-11-05 17:36:05 -07:00
attributions.yml Allow plungers to be fired by bows and embedded into entities (#23406) 2024-01-02 22:36:16 -07:00
bladeslice.ogg
block_metal1.ogg Blocking and Shields (#8584) 2022-07-04 16:31:12 +10:00
bolathrow.ogg Adds bola and a crafting recipe for them. (#6185) 2022-01-17 12:21:57 -07:00
boxingbell.ogg Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
boxingpunch1.ogg Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
boxingpunch2.ogg Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
boxingpunch3.ogg Port boxer from Nyano (#9080) 2022-07-26 18:34:19 -07:00
chainsaw.ogg Chainsaw weapon addition (#17743) 2023-08-05 14:49:55 +10:00
chainsawidle.ogg Chainsaw weapon addition (#17743) 2023-08-05 14:49:55 +10:00
chainsawwield.ogg Chainsaw weapon addition (#17743) 2023-08-05 14:49:55 +10:00
click.ogg
dodgeball.ogg More dynamic melee sounds (#8207) 2022-05-17 13:49:07 +10:00
drawbow2.ogg
eblade1.ogg Add ESwords (now Inventory refactor compliant!) (#6000) 2022-01-24 23:55:48 +11:00
ebladehum.ogg ItemToggle system expansion (#22369) 2023-12-24 17:11:05 +11:00
eblademiss.ogg ItemToggle system expansion (#22369) 2023-12-24 17:11:05 +11:00
ebladeoff.ogg Add ESwords (now Inventory refactor compliant!) (#6000) 2022-01-24 23:55:48 +11:00
ebladeon.ogg Add ESwords (now Inventory refactor compliant!) (#6000) 2022-01-24 23:55:48 +11:00
egloves.ogg
emitter.ogg Singularity, Particle Accelerator & Radiation Collectors (#2169) 2020-10-28 19:19:47 +01:00
flash.ogg
genhit1.ogg
genhit2.ogg
genhit3.ogg
glug.ogg Toilet Upgrade (needs review) (#22133) 2024-03-31 14:21:18 +11:00
grille_hit.ogg More dynamic melee sounds (#8207) 2022-05-17 13:49:07 +10:00
guitarsmash.ogg Guitar Smashing (#17724) 2023-06-29 15:27:08 -04:00
pierce.ogg lizz does the slashies (#10215) 2022-08-01 10:34:50 -05:00
plasma_cutter.ogg Proto-kinetic crusher (#16277) 2023-05-14 13:15:18 +10:00
pop.ogg Fix pop.ogg (was stereo now mono) (#23795) 2024-01-09 13:11:54 -05:00
punch1.ogg
punch2.ogg
punch3.ogg
punch4.ogg
punchmiss.ogg
reel.ogg Adds grappling gun (#16662) 2023-05-27 14:15:15 +10:00
rubberhammer.ogg Toy Box filled with toys (ready for merge) (#16252) 2023-06-03 13:31:47 +10:00
slash.ogg More dynamic melee sounds (#8207) 2022-05-17 13:49:07 +10:00
smash.ogg
soup.ogg Adds force-gun (#16561) 2023-05-19 17:10:31 +10:00
star_hit.ogg add throwing star (#18700) 2023-08-14 01:18:48 +10:00
telescopicoff.ogg Telescopic shield (#20048) 2023-09-13 18:03:12 -07:00
telescopicon.ogg Telescopic shield (#20048) 2023-09-13 18:03:12 -07:00
weoweo.ogg Add tether gun (#16430) 2023-05-18 11:36:06 +10:00