powder that makes you say yes

This commit is contained in:
Nadyr
2022-06-25 22:18:46 -04:00
committed by GitHub
parent 3ca90cdf85
commit c103af1607
+2 -57
View File
@@ -1,4 +1,3 @@
<<<<<<< HEAD
#ignore misc BYOND files
Thumbs.db
vchat.db
@@ -23,64 +22,10 @@ cfg/
!/.vscode/settings.json
!/.vscode/tasks.json
ch-merge-upstream-pull-request.sh
code/game/gamemodes/technomancer/spells/projectile/overload.dm
code/game/gamemodes/technomancer/spells/projectile/overload.dm
code/modules/client/preference_setup/loadout/loadout_xeno.dm
temp.dmi
/maps/RandomZLevels/backup/blackmarketpackers.dmm
/maps/backup/virgo-1.dmm
/maps/backup/virgo-2.dmm
/tools/midi2piano/.vs/midi2piano/v14/.suo
/tools/midi2piano/midi2piano/bin/x86/Debug/Sanford.Multimedia.Midi.dll
/tools/midi2piano/midi2piano/bin/x86/Debug/midi2piano.exe
/tools/midi2piano/midi2piano/bin/x86/Debug/midi2piano.pdb
/tools/midi2piano/midi2piano/obj/x86/Debug/DesignTimeResolveAssemblyReferencesInput.cache
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.Form1.resources
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csproj.FileListAbsolute.txt
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csproj.GenerateResource.Cache
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.csprojResolveAssemblyReference.cache
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.exe
/tools/midi2piano/midi2piano/obj/x86/Debug/midi2piano.pdb
/maps/backup
/maps/original
/maps/RandomZLevels/backup
/tools/midi2piano.zip
/maps/yw/backup
icons/mecha/mecha_ch.dmi
.vscode/settings.json
=======
#ignore misc BYOND files
Thumbs.db
vchat.db
vchat.db*
*.log
*.int
*.rsc
*.dmb
*.lk
*.backup
*.before
*.pyc
*.pid
data
data/
cfg/
#Visual studio stuff
*.vscode/*
!/.vscode/launch.json
!/.vscode/extensions.json
!/.vscode/settings.json
!/.vscode/tasks.json
code/game/gamemodes/technomancer/spells/projectile/overload.dm
code/game/gamemodes/technomancer/spells/projectile/overload.dm
code/modules/client/preference_setup/loadout/loadout_xeno.dm
temp.dmi
node_modules/
package-lock.json
>>>>>>> 27374124c4... Merge pull request #13164 from ItsSelis/tgui-prettierx
node_modules/
package-lock.json