Merge pull request #1035 from SPLURT-Station/plumshe

Plush & others
SPLURT-Station · Dec 21, 2023 · 6b310c9 · 6b310c9
2 parents 557486f + d237bf1
commit 6b310c9
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 0 deletions.
diff --git 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()

diff --git 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
@@ -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
@@ -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
diff --git a/modular_splurt/sound/voice/barks/nomi.ogg b/modular_splurt/sound/voice/barks/nomi.ogg