Hopefully working re-merge of #7391 with some other minor tweaks (#7401)

* [s] Hopefully working re-merge of #7391 * pubby changes 2: electric boogaloo. * another small fix * adds missing camera * extremely critical addition of a jukebox to pubby bar * fucking missed a disposal pipe kill me <3 * fixes medbay disposals * Update .gitignore
2018-08-03 21:32:19 -05:00
parent f343814a15
commit d23f0b23a3
2 changed files with 363 additions and 223 deletions
@@ -201,4 +201,4 @@ tools/MapAtmosFixer/MapAtmosFixer/bin/*
 .atom-build.json

 #Jukebox audio files
-/config/jukebox_music/**/*
+/config/jukebox_music/**/*