From 7be1797dbcb726154ef4dc31803a8416eaac0042 Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Wed, 20 Dec 2023 18:34:35 -0500 Subject: [PATCH 1/2] things - braixen plush - remove undead quirk - nomi vocal bark --- modular_splurt/code/datums/bark.dm | 5 +++++ modular_splurt/code/datums/traits/neutral.dm | 3 +++ .../code/game/objects/items/plushes.dm | 7 +++++++ modular_splurt/icons/obj/plushes.dmi | Bin 2889 -> 3134 bytes modular_splurt/sound/voice/barks/nomi.ogg | Bin 0 -> 6662 bytes 5 files changed, 15 insertions(+) create mode 100644 modular_splurt/sound/voice/barks/nomi.ogg diff --git a/modular_splurt/code/datums/bark.dm b/modular_splurt/code/datums/bark.dm index 7c09ad61ce2d..5046cdd1b37f 100644 --- a/modular_splurt/code/datums/bark.dm +++ b/modular_splurt/code/datums/bark.dm @@ -487,3 +487,8 @@ soundpath = 'modular_splurt/sound/voice/barks/ace_attorney/aa_blip_typewriter.ogg' minspeed = 4 minvariance = 0 + +/datum/bark/nomi + name = "Nomi" + id = "nomi" + soundpath = 'modular_splurt/sound/voice/barks/nomi.ogg' diff --git a/modular_splurt/code/datums/traits/neutral.dm b/modular_splurt/code/datums/traits/neutral.dm index 8e080cc8d8bf..40c1049cb4be 100644 --- a/modular_splurt/code/datums/traits/neutral.dm +++ b/modular_splurt/code/datums/traits/neutral.dm @@ -148,6 +148,8 @@ species.disliked_food &= ~MEAT //Zombies + Cumplus Fix\\ + +/* /datum/quirk/undead name = "Undeath" desc = "Your body, be it anomalous, or just outright refusing to die - has indeed become undead. Due to this you may be more susceptible to burn-based weaponry." @@ -184,6 +186,7 @@ H.adjustFireLoss(-0.15, forced = TRUE) else if (H.getToxLoss() <= 90) H.adjustToxLoss(-0.3, forced = TRUE) +*/ /datum/quirk/cum_plus name = "Extra-Productive Genitals" diff --git a/modular_splurt/code/game/objects/items/plushes.dm b/modular_splurt/code/game/objects/items/plushes.dm index 5465d7ead917..c6ba51a359e8 100644 --- a/modular_splurt/code/game/objects/items/plushes.dm +++ b/modular_splurt/code/game/objects/items/plushes.dm @@ -36,3 +36,10 @@ icon_state = "foth_plush" item_state = "foth_plush" squeak_override = list('modular_splurt/sound/misc/fox_squeak.ogg' = 1, 'modular_splurt/sound/misc/fox_squeak1.ogg' = 1, 'modular_splurt/sound/misc/fox_squeak2.ogg' = 1) + +/obj/item/toy/plush/braixen + name = "Braixen Plushie" + desc = "A plushie resembling a whimsical short yellow creature" + icon = 'modular_splurt/icons/obj/plushes.dmi' + icon_state = "braixen" + item_state = "braixen" diff --git a/modular_splurt/icons/obj/plushes.dmi b/modular_splurt/icons/obj/plushes.dmi index 5d597d21dc0fb960082a696d857cf38a88be29a3..ba91b5434c8a52f49540108bfd055a099ced2027 100644 GIT binary patch delta 2892 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 delta 2647 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 diff --git a/modular_splurt/sound/voice/barks/nomi.ogg b/modular_splurt/sound/voice/barks/nomi.ogg new file mode 100644 index 0000000000000000000000000000000000000000..822b0f1e1d7f51cd748007aa26fd767f830281b7 GIT binary patch literal 6662 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 K`mw-BUH%gdn-F6F literal 0 HcmV?d00001 From d237bf19f8032f86497033dce9cb428f133b585b Mon Sep 17 00:00:00 2001 From: BongaTheProto <93835010+BongaTheProto@users.noreply.github.com> Date: Thu, 21 Dec 2023 17:15:09 -0500 Subject: [PATCH 2/2] Update interaction_menu_granter.dm --- .../datums/components/interaction_menu_granter.dm | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/modular_sand/code/datums/components/interaction_menu_granter.dm b/modular_sand/code/datums/components/interaction_menu_granter.dm index 56f2a93cff8f..bd909310e87c 100644 --- a/modular_sand/code/datums/components/interaction_menu_granter.dm +++ b/modular_sand/code/datums/components/interaction_menu_granter.dm @@ -206,6 +206,18 @@ if(HAS_UNEXPOSED_GENITAL) required_from_user_unexposed |= INTERACTION_REQUIRE_EYESOCKETS + //SPLURT EDIT + var/user_has_belly = self.has_belly() + switch(user_has_belly) + if(HAS_EXPOSED_GENITAL) + required_from_user_exposed |= INTERACTION_REQUIRE_BELLY + if(HAS_UNEXPOSED_GENITAL) + required_from_user_unexposed |= INTERACTION_REQUIRE_BELLY + if(TRUE) + required_from_user_exposed |= INTERACTION_REQUIRE_BELLY + required_from_user_unexposed |= INTERACTION_REQUIRE_BELLY + //SPLURT EDIT END + .["required_from_user_exposed"] = required_from_user_exposed .["required_from_user_unexposed"] = required_from_user_unexposed .["user_num_feet"] = self.get_num_feet()