Commit Graph

572 Commits

Author SHA1 Message Date
MichaelYick 6639a19c0b Merge branch 'Monster-Update-6' 2021-10-14 23:26:05 -05:00
MichaelYick 9ac4e03f08 map updates 2021-10-14 22:41:42 -05:00
Nutbuster 377894db98 Merge pull request 'Fang -> Lucy & Naomi fix, 12.5CD chapters added' (#110) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/110
2021-10-15 02:44:17 +00:00
Nutbuster af033ada9e Fang -> Lucy & Naomi fix, 12.5CD chapters added
Fang -> Lucy, including Fang's Mom & Fang's Dad -> Lucy's ..
Naomi in 13C "Oh, come on, you're in..."
2021-10-15 13:16:42 +11:00
Nutbuster a88b2fc919 Merge pull request 'lets-fucking-go' (#109) from lets-fucking-go into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/109
2021-10-14 22:35:50 +00:00
Bowie 657e0c5ea1 remove 1337 hax 2021-10-14 22:39:27 +01:00
Bowie 042065be54 remove semicolons from python wtf 2021-10-14 22:36:07 +01:00
Bowie 080ca299c0 Merge branch 'Monster-Update-6' into lets-fucking-go 2021-10-14 22:25:50 +01:00
Bowie fb3f2c5c7e remove dupe & unused sfx, work in final changes before release 2021-10-14 21:58:12 +01:00
Nutbuster 55825bc6ac Merge pull request 'Save incomptibility' (#107) from nutbuster/SnootGame:Monster-Update-6 into Monster-Update-6
Reviewed-on: https://git.snootgame.xyz/Cavemanon/SnootGame/pulls/107
2021-10-14 19:45:25 +00:00
Nutbuster 178be91261 Merge branch 'Monster-Update-6' of https://git.snootgame.xyz/Cavemanon/SnootGame into Monster-Update-6 2021-10-15 06:42:12 +11:00
Nutbuster 671ef6486a Saves Directory change & Changed endings filename 2021-10-15 06:41:52 +11:00
Nutbuster 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
Nutbuster a77f97a565 Lyrics punc 2021-10-14 16:53:58 +11:00
Nutbuster 5bbf9b8020 Punctuation and smaller capitalization fixes 2021-10-14 13:12:48 +11:00
Nutbuster 7b05c1a594 Attribute line to Fang 2021-10-14 12:01:28 +11:00
Nutbuster 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
Nutbuster 333c6ad184 Merge branch 'Monster-Update-6' into chapter-9-adjustment 2021-10-13 22:10:47 +00:00
Bowie 01f024cb14 add Good Faith cover 2021-10-13 22:58:17 +01:00
Bowie b65f419dfd make the Fang supporting Anon sprite visible for longer as requested 2021-10-13 22:49:19 +01:00
Nutbuster 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
Bowie be808a8607 change BG for interim scenes etc., tweak raymba to show shadow for carpeted scenes 2021-10-13 22:11:59 +01:00
Nutbuster 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
Nio f1ed86514a Merge branch 'Monster-Update-6' into NioFT2 2021-10-13 13:17:00 +00:00
Nio 68953aefb2 resolve issue #100 2021-10-13 23:04:35 +11:00
Nio 9c887f6c8a added back Rip Large 2021-10-13 21:57:28 +11:00
Nutbuster 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
Nutbuster e7de17809e lewd move 2021-10-13 12:27:31 +11:00
Nutbuster 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
Bowie 7f498e223c fix crash after fire alarm scene due to debug labels 2021-10-12 21:46:50 +01:00
Nutbuster 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
MichaelYick 4269ecff65 Manually Merged Map's Masterpiece 2021-10-12 15:06:05 -05:00
Bowie 090b433ac5 remove double-fade transitions, restructure Nio's second photoshoot slightly 2021-10-12 20:51:42 +01:00
Nutbuster 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
Nutbuster 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
Bowie 16320f921a slow down credits to sub-lightspeed 2021-10-12 20:04:30 +01:00
Nio 4ed02c917d and the one straggler 2021-10-12 22:43:50 +11:00
Nio 3906f75f5b removed weird duplication 2021-10-12 22:42:23 +11:00
Nio 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
Bowie b578c002b4 uplift fire alarm scene 2021-10-11 22:51:12 +01:00
Nutbuster 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
Bowie c2ad3153e3 remove debug tag 2021-10-11 21:29:25 +01:00
Bowie e217a90883 Merge branch 'Monster-Update-6' into credits-sketches 2021-10-11 21:28:01 +01:00
Bowie 84aa2bafb1 add ending sketches 2021-10-11 21:27:42 +01:00
Nutbuster 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
Nutbuster 48913f8a83 Revert mod 2021-10-12 06:32:25 +11:00
Nutbuster e1b0979e6c missing shottinnitus.ogg 2021-10-11 08:26:50 +11:00
Nutbuster 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
Bowie a6eeef590e add emphasis to Samantha keeping Ripley in line 2021-10-10 21:03:00 +01:00