cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-22 12:41:09 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into upstream-feb12-2026

Browse Source
This commit is contained in:
Alexis
2026-03-02 07:42:16 -05:00
parent 4dc38c0ad6 b721351dd4
commit 5c5a636485
385 changed files with 227785 additions and 5757 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/datums/components/aggro_emote.dm
+42 -2
View File
@@ -6,6 +6,14 @@
var/living_only
/// List of emotes to play
var/list/emote_list
// BUBBER EDIT - START: FLESHMIND
/// Audiable emotes to play
var/list/audible_emote_list
/// Do we taunt the target?
var/list/speak_list
/// Do we play any sounds?
var/list/sounds
// BUBBER EDIT - END
/// Chance to play an emote
var/emote_chance
/// Chance to subtract every time we play an emote (permanently)
@@ -17,6 +25,9 @@
target_key = BB_BASIC_MOB_CURRENT_TARGET,
living_only = FALSE,
list/emote_list,
list/speak_list, // BUBBER EDIT - ADDITION: FLESHMIND
list/sounds, // BUBBER EDIT - ADDITION: FLESHMIND
list/audible_emote_list, // BUBBER EDIT - ADDITION: FLESHMIND
emote_chance = 30,
minimum_chance = 2,
subtract_chance = 7,
@@ -30,6 +41,9 @@
src.target_key = target_key
src.emote_list = emote_list
src.speak_list = speak_list // BUBBER EDIT - ADDITION: FLESHMIND
src.sounds = sounds // BUBBER EDIT - ADDITION: FLESHMIND
src.audible_emote_list = audible_emote_list // BUBBER EDIT - ADDITION: FLESHMIND
src.emote_chance = emote_chance
src.minimum_chance = minimum_chance
src.subtract_chance = subtract_chance
@@ -46,9 +60,35 @@
/datum/component/aggro_emote/proc/on_target_changed(atom/source)
SIGNAL_HANDLER
var/atom/new_target = source.ai_controller.blackboard[target_key]
// BUBBER EDIT - START: FLESHMIND
var/mob/living/mob = source
/// Used to pick and choose between emotes and audiable sounds
// Grab the number length of each list
var/emotes_length = emote_list?.len
var/audible_emote_length = audible_emote_list?.len
var/speak_emote_length = speak_list?.len
// Add them all together
var/total_choices_length = audible_emote_length + speak_emote_length + emotes_length
//Pick a random number between 1 and the total length of every list
var/random_number_in_range = rand(1, total_choices_length)
var/sound_to_play = length(sounds) > 0 ? pick(sounds) : null
// Calculate the emote chance and determin if you'll run an emote
emote_chance = max(emote_chance - subtract_chance, minimum_chance)
// BUBBER EDIT - END
if (isnull(new_target) || !prob(emote_chance))
return
if (living_only && !isliving(new_target))
return // If we don't want to bark at food items or chairs or windows
emote_chance = max(emote_chance - subtract_chance, minimum_chance)
source.manual_emote("[pick(emote_list)] at [new_target].")
// BUBBER EDIT - START: FLESHMIND
/// Randomly choose between each emote
if(random_number_in_range <= audible_emote_length)
source.manual_emote("[pick(audible_emote_list)]")
playsound(source, sound_to_play, 80, vary = TRUE)
else if(random_number_in_range <= (audible_emote_length + emotes_length))
source.manual_emote("[pick(emote_list)] at [new_target].")
else
INVOKE_ASYNC(mob, TYPE_PROC_REF(/atom/movable, say), pick(speak_list), forced = "AI Controller")
playsound(source, sound_to_play, 80, vary = TRUE)
// BUBBER EDIT - END
code/datums/storage/subtypes/belts.dm
+1
View File
@@ -9,6 +9,7 @@
/obj/item/radio,
/obj/item/melee/sickly_blade/lock,
/obj/item/reagent_containers/cup/soda_cans,
/obj/item/holotool, // BUBBER EDIT ADDITION
))
///Medical belt