Morb0 1e0bee212f Merge remote-tracking branch 'upstream/master' into upstream-sync ... # Conflicts: # .github/workflows/publish.yml # Content.Server/GameTicking/GameTicker.RoundFlow.cs # Content.Server/GameTicking/Rules/NukeopsRuleSystem.cs # Resources/Prototypes/Datasets/tips.yml # Resources/Prototypes/Maps/barratry.yml # Resources/ServerInfo/Gameplay.txt # Resources/ServerInfo/Guidebook/Antagonist/MinorAntagonists.xml # Resources/ServerInfo/Guidebook/Engineering/Power.xml # Resources/ServerInfo/Guidebook/Engineering/Singularity.xml # Resources/ServerInfo/Guidebook/Jobs.xml # Resources/ServerInfo/Guidebook/Science/MachineUpgrading.xml # Resources/Textures/Clothing/Mask/bat.rsi/meta.json # Resources/Textures/Clothing/Mask/bear.rsi/meta.json # Resources/Textures/Clothing/Mask/bee.rsi/meta.json # Resources/Textures/Clothing/Mask/breath.rsi/meta.json # Resources/Textures/Clothing/Mask/clown.rsi/meta.json # Resources/Textures/Clothing/Mask/cluwne.rsi/meta.json # Resources/Textures/Clothing/Mask/ert.rsi/meta.json # Resources/Textures/Clothing/Mask/fox.rsi/meta.json # Resources/Textures/Clothing/Mask/gas.rsi/meta.json # Resources/Textures/Clothing/Mask/gascaptain.rsi/meta.json # Resources/Textures/Clothing/Mask/gascentcom.rsi/meta.json # Resources/Textures/Clothing/Mask/gasexplorer.rsi/meta.json # Resources/Textures/Clothing/Mask/gassecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/gassyndicate.rsi/meta.json # Resources/Textures/Clothing/Mask/jackal.rsi/meta.json # Resources/Textures/Clothing/Mask/joy.rsi/meta.json # Resources/Textures/Clothing/Mask/medical.rsi/meta.json # Resources/Textures/Clothing/Mask/medicalsecurity.rsi/meta.json # Resources/Textures/Clothing/Mask/merc.rsi/meta.json # Resources/Textures/Clothing/Mask/mime.rsi/meta.json # Resources/Textures/Clothing/Mask/muzzle.rsi/meta.json # Resources/Textures/Clothing/Mask/rat.rsi/meta.json # Resources/Textures/Clothing/Mask/raven.rsi/meta.json # Resources/Textures/Clothing/Mask/sadmime.rsi/meta.json # Resources/Textures/Clothing/Mask/scaredmime.rsi/meta.json # Resources/Textures/Clothing/Mask/sexyclown.rsi/meta.json # Resources/Textures/Clothing/Mask/sexymime.rsi/meta.json # Resources/Textures/Clothing/Mask/squadron.rsi/meta.json # Resources/Textures/Clothing/Mask/sterile.rsi/meta.json # Resources/Textures/Clothing/Mask/swat.rsi/meta.json		2024-01-10 00:23:02 +03:00
..
Guns	Fix attributions license format	2023-11-08 17:41:09 +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	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
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	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
dodgeball.ogg	More dynamic melee sounds (#8207)	2022-05-17 13:49:07 +10:00
drawbow2.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
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	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
emitter.ogg	Singularity, Particle Accelerator & Radiation Collectors (#2169)	2020-10-28 19:19:47 +01:00
flash.ogg	Remix flash.ogg down to mono	2020-07-08 00:50:24 +02:00
genhit1.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
genhit2.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
genhit3.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02: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	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
punch2.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
punch3.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
punch4.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
punchmiss.ogg	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
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	Re-organizing the Resources folder. Part 1. (#1234)	2020-07-07 19:19:00 +02:00
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
tap.ogg	More dynamic melee sounds (#8207)	2022-05-17 13:49:07 +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