Vore system [TM only]

code/__DEFINES/hud.dm

@@ -77,7 +77,7 @@
 #define ui_building "EAST-4:22,SOUTH:21"
 #define ui_language_menu "EAST-4:6,SOUTH:21"
 #define ui_navigate_menu "EAST-4:22,SOUTH:5"
-#define ui_floor_menu "EAST-4:14,SOUTH:37"
+#define ui_floor_menu "EAST-4:22,SOUTH:37" // BUBBER EDIT: Shift over a bit for the vore button to sit nicely
 
 //Upper left (action buttons)
 #define ui_action_palette "WEST+0:23,NORTH-1:5"

code/__DEFINES/layers.dm

@@ -3,6 +3,7 @@
 
 //NEVER HAVE ANYTHING BELOW THIS PLANE ADJUST IF YOU NEED MORE SPACE
 #define LOWEST_EVER_PLANE -50
+#define EMISSIVE_PLANE -46 // BUBBER EDIT: Was 13, caused issues with rendering via \ref[appearance]
 
 // Doesn't really layer, just throwing this in here cause it's the best place imo
 #define FIELD_OF_VISION_BLOCKER_PLANE -45
@@ -45,7 +46,6 @@
 #define O_LIGHTING_VISUAL_PLANE 11
 #define O_LIGHTING_VISUAL_RENDER_TARGET "O_LIGHT_VISUAL_PLANE"
 
-#define EMISSIVE_PLANE 13
 /// This plane masks out lighting to create an "emissive" effect, ie for glowing lights in otherwise dark areas.
 #define EMISSIVE_RENDER_PLATE 14
 #define EMISSIVE_RENDER_TARGET "*EMISSIVE_PLANE"

code/_onclick/hud/hud.dm

@@ -614,7 +614,7 @@ GLOBAL_LIST_INIT(available_erp_ui_styles, list(
 	listed_actions.check_against_view()
 	palette_actions.check_against_view()
 	for(var/atom/movable/screen/movable/action_button/floating_button as anything in floating_actions)
-		var/list/current_offsets = screen_loc_to_offset(floating_button.screen_loc)
+		var/list/current_offsets = screen_loc_to_offset(floating_button.screen_loc, our_view) // BUBBER EDIT: Pass our_view to screen_loc_to_offset
 		// We set the view arg here, so the output will be properly hemm'd in by our new view
 		floating_button.screen_loc = offset_to_screen_loc(current_offsets[1], current_offsets[2], view = our_view)
 

code/datums/actions/innate_action.dm

@@ -21,7 +21,7 @@
 			unset_ranged_ability(owner, disable_text)
 		else
 			set_ranged_ability(owner, enable_text)
-		build_all_button_icons(UPDATE_BUTTON_STATUS)
+		build_all_button_icons(UPDATE_BUTTON_BACKGROUND | UPDATE_BUTTON_STATUS) // BUBBER EDIT: This is just an upstream error, it should have BUTTON_BACKGROUND
 		return TRUE
 
 	// We're not a click action (we're a toggle or otherwise)

code/game/objects/items/devices/radio/radio.dm

@@ -383,6 +383,12 @@
 	. = ..()
 	if(radio_freq || !broadcasting || get_dist(src, speaker) > canhear_range || message_mods[MODE_RELAY])
 		return
+	// BUBBER Edit Start - the worst snowflake code for vore
+	if(istype(speaker.loc, /obj/vore_belly))
+		var/obj/vore_belly/VB = speaker.loc
+		if(VB.muffles_radio)
+			return
+	// BUBBER Edit End
 	var/list/filtered_mods = list()
 
 	if (message_mods[MODE_SING])

code/modules/mob/mob.dm

@@ -311,7 +311,13 @@
 			msg = blind_message
 			msg_type = MSG_AUDIBLE
 		else if(T != loc && T != src) //if src is inside something and not a turf.
-			if(M != loc) // Only give the blind message to hearers that aren't the location
+			// BUBBER EDIT Start - Prey hear each other in bellies + pred always hears prey
+			if(istype(loc, /obj/vore_belly))
+				if(M.loc != loc && M != loc.loc)
+					msg = blind_message
+					msg_type = MSG_AUDIBLE
+			// BUBBER EDIT End
+			else if(M != loc)  // Only give the blind message to hearers that aren't the location
 				msg = blind_message
 				msg_type = MSG_AUDIBLE
 		else if(!HAS_TRAIT(M, TRAIT_HEAR_THROUGH_DARKNESS) && M.lighting_cutoff < LIGHTING_CUTOFF_HIGH && T.is_softly_lit() && !in_range(T,M)) //if it is too dark, unless we're right next to them.

config/admins.txt

@@ -149,3 +149,4 @@ WaylandSmithy = Game Master
 NamelessFairy = Game Master
 WalterMeldron = Game Master
 san7890 = Game Master
+tigercat2000 = Game Master

modular_skyrat/master_files/code/modules/client/preferences/erp_preferences.dm

@@ -89,11 +89,13 @@
 /datum/preference/toggle/erp/sex_toy_sounds
 	savefile_key = "sextoy_sounds_pref"
 
+/* BUBBER REMOVAL START
 /datum/preference/toggle/erp/vore_pred
 	savefile_key = "vore_pred_pref"
 
 /datum/preference/toggle/erp/vore_prey
-	savefile_key = "vore_prey_pref"
+	savefile_key = "vore_prey_pref
+BUBBER REMOVAL END */
 
 /datum/preference/toggle/erp/bimbofication
 	savefile_key = "bimbofication_pref"

modular_skyrat/modules/modular_items/lewd_items/code/verbs.dm

@@ -41,12 +41,20 @@
 	if(CONFIG_GET(flag/disable_lewd_items))
 		verbs -= /mob/living/carbon/human/verb/safeword
 
-/mob/living/carbon/human/verb/safeword()
+/* BUBBER EDIT START: Rename remove_lewd_items to OOC Safe Word */
+/mob/living/carbon/human/verb/remove_lewd_items()
 	set name = "Remove Lewd Items"
 	set category = "OOC"
 	set desc = "Removes any and all lewd items from you."
+	// literally just another way to safeword
+	safeword()
+
+/mob/living/carbon/human/verb/safeword()
+	set name = "OOC Safe Word"
+	set category = "OOC"
+	set desc = "Removes any and all lewd items from you."
 
-	log_message("[key_name(src)] used the Remove Lewd Items verb.", LOG_ATTACK)
+	log_message("[key_name(src)] used the OOC Safe Word verb.", LOG_ATTACK)
 	for(var/obj/item/equipped_item in get_equipped_items())
 		if(!(equipped_item.type in GLOB.pref_checked_clothes))
 			continue
@@ -59,7 +67,12 @@
 	if(leash_check)
 		qdel(leash_check)
 
+	// Vore Edit
+	if(istype(loc, /obj/vore_belly))
+		forceMove(get_turf(src))
+
 	return TRUE
+/* BUBBER EDIT END */
 
 /mob/living/carbon/human/verb/lick(mob/living/carbon/human/target in get_adjacent_humans())
 	set name = "Lick"

modular_zubbers/code/datums/components/vore/README.md

@@ -0,0 +1,28 @@
+# Modular DCS Vore
+This is an implementation of vore made entirely using components.
+
+By [Shadow Larkens](https://github.com/ShadowLarkens/)
+
+## Configuration
+Most critical options are in [_defines.dm](./_defines.dm) including things such as the max amount of bellies that can
+be created, how many prey can be eaten, etc.
+
+## Debugging
+If you need to debug this system, go to the top of [_defines.dm](./_defines.dm) and uncomment `#define VORE_TESTING`
+to enable helpful debugging features such as not needing clients and working on all living mobs.
+
+## Code Overview
+[_defines.dm](./_defines.dm) - Settings and constants.
+[absorb_control.dm](./absorb_control.dm) - Component used for prey controlling preds temporarily
+[belly.dm](./belly.dm) - Individual areas that have their own name, description and digestion mode.
+[belly_messages.dm](./belly_messages.dm) - Contains helpers for all of the many different customizable messages a belly can produce.
+[belly_serde.dm](./belly_serd.dm) - Controls belly serialization and deserialization.
+[digest_modes.dm](./digest_modes.dm) - Singletons that handle affecting a belly's contents on each process.
+[preferences.dm](./preferences.dm) - Vore related preferences
+[subsystem.dm](./subsystem.dm) - Belly processing subsystem / global event listener
+[ui.dm](./ui.dm) - tgui interface for managing the component
+[vore.dm](./vore.dm) - The main component that orchestrates everything else.
+[z_undefs.dm](./z_undefs.dm) - undefs to keep defines from escaping.
+
+## Special Notes
+- Being absorbed is marked by TRAIT_RESTRAINED and TRAIT_STASIS with a source of TRAIT_SOURCE_VORE.