7415eb1313
Merge pull request 'Punctuation & Missing Fang' ( #106 ) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/106
2021-10-14 05:55:41 +00:00
a77f97a565
Lyrics punc
2021-10-14 16:53:58 +11:00
5bbf9b8020
Punctuation and smaller capitalization fixes
2021-10-14 13:12:48 +11:00
7b05c1a594
Attribute line to Fang
2021-10-14 12:01:28 +11:00
4d1f2aa182
Merge pull request 'make the Fang supporting Anon sprite visible for longer as requested, add OST cover' ( #105 ) from Bowie/SnootGame:chapter-9-adjustment into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/105
2021-10-13 22:27:04 +00:00
333c6ad184
Merge branch 'Monster-Update-6' into chapter-9-adjustment
2021-10-13 22:10:47 +00:00
01f024cb14
add Good Faith cover
2021-10-13 22:58:17 +01:00
b65f419dfd
make the Fang supporting Anon sprite visible for longer as requested
2021-10-13 22:49:19 +01:00
db885c837c
Merge pull request 'Change RAYmba BG, fixes #103 ' ( #104 ) from Bowie/SnootGame:raymba-bg-change into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/104
2021-10-13 21:47:44 +00:00
be808a8607
change BG for interim scenes etc., tweak raymba to show shadow for carpeted scenes
2021-10-13 22:11:59 +01:00
a6fd0e9099
Merge pull request 'added back Rip Large' ( #101 ) from Nio/SnootGame_w_ExtrasMenu:NioFT2 into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/101
2021-10-13 20:08:25 +00:00
f1ed86514a
Merge branch 'Monster-Update-6' into NioFT2
2021-10-13 13:17:00 +00:00
68953aefb2
resolve issue #100
2021-10-13 23:04:35 +11:00
9c887f6c8a
added back Rip Large
2021-10-13 21:57:28 +11:00
23a30dcf14
Merge pull request 'Rename finalamp & Move into notforkids folder' ( #99 ) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/99
2021-10-13 01:30:21 +00:00
e7de17809e
lewd move
2021-10-13 12:27:31 +11:00
8b6fda5952
Merge pull request 'MAPWork' ( #98 ) from MAPWork into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/98
2021-10-13 01:09:15 +00:00
7f498e223c
fix crash after fire alarm scene due to debug labels
2021-10-12 21:46:50 +01:00
b4a23f0dce
Merge pull request 'Remove double-fade transitions in 13C&D, restructure Nio's second photoshoot scene slightly' ( #96 ) from Bowie/SnootGame:remove-double-fade into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/96
2021-10-12 20:08:54 +00:00
4269ecff65
Manually Merged Map's Masterpiece
2021-10-12 15:06:05 -05:00
090b433ac5
remove double-fade transitions, restructure Nio's second photoshoot slightly
2021-10-12 20:51:42 +01:00
84e7e0da3f
Merge pull request 'NioFT2' ( #94 ) from Nio/SnootGame_w_ExtrasMenu:NioFT2 into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/94
2021-10-12 19:21:21 +00:00
4bf86ea11b
Merge pull request 'Fixes fast credits left over from debugging' ( #95 ) from Bowie/SnootGame:credits-fix into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/95
2021-10-12 19:20:12 +00:00
16320f921a
slow down credits to sub-lightspeed
2021-10-12 20:04:30 +01:00
4ed02c917d
and the one straggler
2021-10-12 22:43:50 +11:00
3906f75f5b
removed weird duplication
2021-10-12 22:42:23 +11:00
6e6d8af08b
fixes
2021-10-12 22:34:26 +11:00
Bowie
75bd952957
Merge pull request 'Uplift fire alarm scene' ( #93 ) from Bowie/SnootGame:fire-alarm into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/93
2021-10-11 22:09:29 +00:00
b578c002b4
uplift fire alarm scene
2021-10-11 22:51:12 +01:00
54b48cc96b
Merge pull request 'Add credits sketches, Closes #90 ' ( #92 ) from Bowie/SnootGame:credits-sketches into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/92
2021-10-11 20:36:24 +00:00
c2ad3153e3
remove debug tag
2021-10-11 21:29:25 +01:00
e217a90883
Merge branch 'Monster-Update-6' into credits-sketches
2021-10-11 21:28:01 +01:00
84aa2bafb1
add ending sketches
2021-10-11 21:27:42 +01:00
e393cec738
Fix sounds & set defaults
...
Set persistent values to False if None
Play both On & Off Sound
onclick_audio, hardcode the audio and instead have a flag system for
just the transitions menu
2021-10-12 07:12:09 +11:00
48913f8a83
Revert mod
2021-10-12 06:32:25 +11:00
e1b0979e6c
missing shottinnitus.ogg
2021-10-11 08:26:50 +11:00
d619edbd44
Merge pull request 'Deduplicate long segment at the start of prom chapters A, C and D' ( #91 ) from Bowie/SnootGame:prom-deduplication into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/91
2021-10-10 21:15:16 +00:00
a6eeef590e
add emphasis to Samantha keeping Ripley in line
2021-10-10 21:03:00 +01:00
418464e07e
fix label
2021-10-10 20:50:45 +01:00
537cd23f03
actually add the deduplicated prom segment
2021-10-10 20:49:39 +01:00
a4b98ddbe3
deduplicate large segment of script at the start of prom night, tweak leadup scripts to transition smoothly, remove soulful-but-redundant error handling block in storyline
2021-10-10 20:39:24 +01:00
Bowie
3163fa0ea8
Merge pull request 'Post merge cleanup, Closes #84 ' ( #89 ) from Bowie/SnootGame:post-merge-cleanup into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/89
2021-10-10 16:05:12 +00:00
6e370f984f
Merge branch 'Monster-Update-6' into post-merge-cleanup
2021-10-10 14:17:25 +01:00
f4a39e2e18
removed tumor from Rosa's palm
2021-10-10 13:44:57 +01:00
2fd318528c
Merge pull request 'New image' ( #87 ) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/87
2021-10-10 12:12:42 +00:00
3da180d5ff
New image
2021-10-10 23:10:22 +11:00
Bowie
d29f889752
Merge branch 'Monster-Update-6' into post-merge-cleanup
2021-10-10 11:17:48 +00:00
91a9d1e187
less crispy Naomi
2021-10-10 11:41:02 +01:00
b6da0ef2ff
Merge pull request 'Fix lint errors, Closes #83 ' ( #86 ) from Bowie/SnootGame:fix-lint-errors into Monster-Update-6
...
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/86
2021-10-10 10:34:48 +00:00
18ce4b2f45
add missing character definitions, fix wrong filename for music, fix bad filepath
2021-10-10 11:26:15 +01:00
