Skip to content
This repository has been archived by the owner on Sep 8, 2022. It is now read-only.

[MIRROR] Adjusts oozelings to use slime speaking verbs #1012

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions code/modules/mob/living/carbon/human/say.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,16 @@
/mob/living/carbon/human/say_mod(input, list/message_mods = list())
<<<<<<< HEAD
verb_say = dna.species.say_mod
if(slurring)
=======
var/obj/item/organ/tongue/T = getorganslot(ORGAN_SLOT_TONGUE)
if(T)
verb_say = pick(T.say_mod)
verb_ask = pick(T.ask_mod)
verb_yell = pick(T.yell_mod)
verb_exclaim = pick(T.exclaim_mod)
if(slurring || !T)
>>>>>>> 4dca1e6173... Adjusts oozelings to use slime speaking verbs (#7482)
return "slurs"
else
. = ..()
Expand Down
77 changes: 77 additions & 0 deletions code/modules/surgery/organs/tongue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,17 @@
slot = ORGAN_SLOT_TONGUE
attack_verb = list("licked", "slobbered", "slapped", "frenched", "tongued")
var/list/languages_possible
<<<<<<< HEAD
var/say_mod = null
=======
var/say_mod = "says"
var/ask_mod = "asks"
var/yell_mod = "yells"
var/exclaim_mod = "exclaims"
var/liked_food = JUNKFOOD | FRIED
var/disliked_food = GROSS | RAW
var/toxic_food = TOXIC
>>>>>>> 4dca1e6173... Adjusts oozelings to use slime speaking verbs (#7482)
var/taste_sensitivity = 15 // lower is more sensitive.
var/modifies_speech = FALSE
var/static/list/languages_possible_base = typecacheof(list(
Expand Down Expand Up @@ -269,3 +279,70 @@
/obj/item/organ/tongue/ethereal/Initialize(mapload)
. = ..()
languages_possible = languages_possible_base += typecacheof(/datum/language/voltaic)
<<<<<<< HEAD
=======

/obj/item/organ/tongue/golem
name = "mineral tongue"
desc = "A strange tongue made out of some kind of mineral. It's smooth, but flexible."
say_mod = "rumbles"
taste_sensitivity = 101 //They don't eat.
icon_state = "adamantine_cords"

/obj/item/organ/tongue/golem/Initialize(mapload)
. = ..()
languages_possible = languages_possible_base += typecacheof(/datum/language/terrum)

/obj/item/organ/tongue/golem/bananium
name = "bananium tongue"
desc = "It's a tongue made out of pure bananium."
say_mod = "honks"

/obj/item/organ/tongue/golem/clockwork
name = "clockwork tongue"
desc = "It's a tongue made out of many tiny cogs. You can hear a very subtle clicking noise emanating from it."
say_mod = "clicks"

/obj/item/organ/tongue/cat
name = "cat tongue"
desc = "A rough tongue, full of small, boney spines all over it's surface."
say_mod = "meows"
disliked_food = VEGETABLES | SUGAR
liked_food = DAIRY | MEAT

/obj/item/organ/tongue/slime
name = "slimey tongue"
desc = "It's a piece of slime, shaped like a tongue."
say_mod = list("blorbles", "bubbles")
ask_mod = "inquisitively blorbles"
yell_mod = "shrilly blorbles"
exclaim_mod = "loudly blorbles"
toxic_food = NONE
disliked_food = NONE

/obj/item/organ/tongue/slime/Initialize(mapload)
. = ..()
languages_possible = languages_possible_base += typecacheof(/datum/language/slime)

/obj/item/organ/tongue/moth
name = "mothic tongue"
desc = "It's long and noodly."
say_mod = "flutters"
icon_state = "tonguemoth"
liked_food = VEGETABLES | DAIRY | CLOTH
disliked_food = FRUIT | GROSS
toxic_food = MEAT | RAW

/obj/item/organ/tongue/teratoma
name = "malformed tongue"
desc = "It's a tongue that looks off... Must be from a creature that shouldn't exist."
say_mod = "mumbles"
icon_state = "tonguefly"
liked_food = JUNKFOOD | FRIED | GROSS | RAW

/obj/item/organ/tongue/podperson
name = "plant tongue"
desc = "It's an odd tongue, seemingly made of plant matter."
disliked_food = MEAT | DAIRY
liked_food = VEGETABLES | FRUIT | GRAIN //cannibals apparently
>>>>>>> 4dca1e6173... Adjusts oozelings to use slime speaking verbs (#7482)