mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-21 20:20:33 +01:00
[MIRROR] Let's you talk through action figures, plushies, and toy mechs with .l and .r. Also a big clean up of say because its support for non-mobs was lackluster. (#26790)
* Let's you talk through action figures, plushies, and toy mechs with `.l` and `.r`. Also a big clean up of `say` because its support for non-mobs was lackluster. * Update code/game/objects/items/plushes.dm * a --------- Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> Co-authored-by: Pinta <68373373+softcerv@users.noreply.github.com>
This commit is contained in:
co-authored by
MrMelbert
Pinta
parent
13595c30a3
commit
b1df8c9cc2
@@ -20,16 +20,29 @@
|
||||
new /obj/item/circuit_component/bci_core,
|
||||
), SHELL_CAPACITY_SMALL, starting_circuit = circuit)
|
||||
|
||||
/obj/item/organ/internal/cyberimp/bci/say(message, bubble_type, list/spans, sanitize, datum/language/language, ignore_spam, forced = null, filterproof = null, message_range = 7, datum/saymode/saymode = null)
|
||||
/obj/item/organ/internal/cyberimp/bci/say(
|
||||
message,
|
||||
bubble_type,
|
||||
list/spans = list(),
|
||||
sanitize = TRUE,
|
||||
datum/language/language,
|
||||
ignore_spam = FALSE,
|
||||
forced,
|
||||
filterproof = FALSE,
|
||||
message_range = 7,
|
||||
datum/saymode/saymode,
|
||||
list/message_mods = list(),
|
||||
)
|
||||
if (owner)
|
||||
// Otherwise say_dead will be called.
|
||||
// It's intentional that a circuit for a dead person does not speak from the shell.
|
||||
if (owner.stat == DEAD)
|
||||
return
|
||||
|
||||
owner.say(message, forced = "circuit speech")
|
||||
else
|
||||
return ..()
|
||||
forced = "circuit speech"
|
||||
return owner.say(arglist(args))
|
||||
|
||||
return ..()
|
||||
|
||||
/obj/item/organ/internal/cyberimp/bci/proc/action_comp_registered(datum/source, obj/item/circuit_component/equipment_action/action_comp)
|
||||
SIGNAL_HANDLER
|
||||
|
||||
Reference in New Issue
Block a user