cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-08-26 14:39:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

Golems now have tongues again, except cardboard golems (#68168)

Browse Source 
* vocal cord slot

* puts vocal chords back

* reverts changes i couldnt figure out how to make mutant_vocalcords work

* cleanup

* woops

* Makes cardboard golems have no tongues

* adds no tongue to the greet
This commit is contained in:
Coffee
2022-07-12 17:47:50 -05:00
committed by GitHub
parent d5449a5228
commit 150bf4085d
4 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/__DEFINES/DNA.dm
+3
View File
@@ -75,6 +75,9 @@
#define NOSTOMACH 10
#define NO_DNA_COPY 11
#define DRINKSBLOOD 12
/// Stops species from spawning with tongue. Doesn't actually make the species able to talk with no tongue
#define NOTONGUE 13
/// Use this if you want to change the race's color without the player being able to pick their own color. AKA special color shifting
#define DYNCOLORS 13
#define AGENDER 14
code/game/objects/items/devices/scanners/health_analyzer.dm
+2
View File
@@ -279,6 +279,8 @@
missing_organs += "liver"
if(!(NOSTOMACH in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_STOMACH))
missing_organs += "stomach"
if(!(NOTONGUE in the_dudes_species.species_traits) && !humantarget.getorganslot(ORGAN_SLOT_TONGUE))
missing_organs += "tongue"
if(!humantarget.getorganslot(ORGAN_SLOT_EARS))
missing_organs += "ears"
if(!humantarget.getorganslot(ORGAN_SLOT_EYES))
code/modules/mob/living/carbon/human/species_types/golems.dm
+3 -5
View File
@@ -21,7 +21,6 @@
)
inherent_biotypes = MOB_HUMANOID|MOB_MINERAL
mutant_organs = list(/obj/item/organ/internal/adamantine_resonator)
mutanttongue = /obj/item/organ/internal/vocal_cords/adamantine
speedmod = 2
payday_modifier = 0.75
armor = 55
@@ -89,8 +88,7 @@
name = "Adamantine Golem"
id = SPECIES_GOLEM_ADAMANTINE
meat = /obj/item/food/meat/slab/human/mutant/golem/adamantine
mutant_organs = list(/obj/item/organ/internal/adamantine_resonator)
mutanttongue = /obj/item/organ/internal/vocal_cords/adamantine
mutant_organs = list(/obj/item/organ/internal/adamantine_resonator, /obj/item/organ/internal/vocal_cords/adamantine)
fixed_mut_color = "#44eedd"
info_text = "As an <span class='danger'>Adamantine Golem</span>, you possess special vocal cords allowing you to \"resonate\" messages to all golems. Your unique mineral makeup makes you immune to most types of magic."
prefix = "Adamantine"
@@ -1059,8 +1057,8 @@
id = SPECIES_GOLEM_CARDBOARD
prefix = "Cardboard"
special_names = list("Box")
info_text = "As a <span class='danger'>Cardboard Golem</span>, you aren't very strong, but you are a bit quicker and can easily create more brethren by using cardboard on yourself."
species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES)
info_text = "As a <span class='danger'>Cardboard Golem</span>, you aren't very strong, but you are a bit quicker and can easily create more brethren by using cardboard on yourself. Cardboard makes a poor building material for tongues, so you'll have difficulty speaking."
species_traits = list(NOBLOOD,NO_UNDERWEAR,NOEYESPRITES,NOTONGUE)
inherent_traits = list(
TRAIT_ADVANCEDTOOLUSER,
TRAIT_CAN_STRIP,
code/modules/surgery/organs/tongue.dm
+3
View File
@@ -76,6 +76,9 @@
/obj/item/organ/internal/tongue/could_speak_language(language)
return is_type_in_typecache(language, languages_possible)
/obj/item/organ/internal/tongue/get_availability(datum/species/owner_species)
return !(NOTONGUE in owner_species.species_traits)
/obj/item/organ/internal/tongue/lizard
name = "forked tongue"
desc = "A thin and long muscle typically found in reptilian races, apparently moonlights as a nose."