Skip to content

Commit

Permalink
Adds a filterless forked tongue (#2437)
Browse files Browse the repository at this point in the history
* grfg

* Apply suggestions from code review

Co-authored-by: Bloop <[email protected]>

* Update modular_nova/modules/organs/code/tongue.dm

Co-authored-by: Bloop <[email protected]>

---------

Co-authored-by: Bloop <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed May 13, 2024
1 parent 70799df commit 26c62ef
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@
name = "Forked tongue"
path = /obj/item/organ/internal/tongue/lizard

<<<<<<< HEAD

Check failure on line 123 in modular_nova/modules/customization/modules/client/augment/organs.dm

View workflow job for this annotation

GitHub Actions / Run Linters

got '<<', expected one of: newline, '/', identifier
//FF add, for auto-accent for anthropomorphs
/datum/augment_item/organ/tongue/cat
name = "Cat tongue"
Expand All @@ -129,3 +130,8 @@
name = "Dog tongue"
path = /obj/item/organ/internal/tongue/dog
//FF add ends.
=======
/datum/augment_item/organ/tongue/forked/filterless
name = "Forked tongue (Without TTS Filter)"
path = /obj/item/organ/internal/tongue/lizard/filterless
>>>>>>> 827b1aa496b (Adds a filterless forked tongue (#2437))
13 changes: 11 additions & 2 deletions modular_nova/modules/organs/code/tongue.dm
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,19 @@

/obj/item/organ/internal/tongue/xeno_hybrid/Initialize(mapload)
. = ..()
var/obj/item/organ/internal/tongue/alien/alien_tongue_type = /obj/item/organ/internal/tongue/alien
voice_filter = initial(alien_tongue_type.voice_filter)
voice_filter = /obj/item/organ/internal/tongue/alien::voice_filter

/obj/item/organ/internal/tongue/skrell
name = "skrell tongue"
desc = "A fleshy muscle mostly used for warbling."
say_mod = "warbles"

/obj/item/organ/internal/tongue/lizard/filterless
name = "smooth forked tongue"

voice_filter = null

/obj/item/organ/internal/tongue/lizard/filterless/Initialize(mapload)
. = ..()

desc += " This one is noticeably smooth, and would lack any non-hissing lisps if used."

0 comments on commit 26c62ef

Please sign in to comment.