cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

New Trait, Custom Species Icon Base and Language (#7585)

Browse Source
This commit is contained in:
Etheo
2024-01-23 19:13:05 -06:00
committed by GitHub
parent 1085681780
commit bf83f8f5e4
4 changed files with 37 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/__defines/species_languages_vr.dm
View File

@@ -18,8 +18,9 @@
#define LANGUAGE_MOUSE "Mouse" #define LANGUAGE_MOUSE "Mouse"
#define LANGUAGE_SHADEKIN "Shadekin Empathy" #define LANGUAGE_SHADEKIN "Shadekin Empathy"
#define LANGUAGE_MARISH "Marish" // CHOMPedit
//CHOMPedit Start - Xeno languages selectable //CHOMPedit Start - Xeno languages selectable
#define LANGUAGE_XENOLINGUA "Xenolingua" #define LANGUAGE_XENOLINGUA "Xenolingua"
#define LANGUAGE_HIVEMIND "Hivemind" #define LANGUAGE_HIVEMIND "Hivemind"
// CHOMPedit End. // CHOMPedit End.

2
code/_helpers/global_lists.dm
View File

@@ -293,7 +293,7 @@ GLOBAL_LIST_EMPTY(mannequins)
// Custom species icon bases // Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //VOREStation Edit var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //VOREStation Edit
var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID) //VOREStation Edit var/list/whitelisted_icons = list(SPECIES_FENNEC,SPECIES_XENOHYBRID, SPECIES_SHADEKIN) //CHOMPedit
for(var/species_name in GLOB.playable_species) for(var/species_name in GLOB.playable_species)
if(species_name in blacklisted_icons) if(species_name in blacklisted_icons)
continue continue

11
code/modules/mob/language/station_vr.dm
View File

@@ -103,6 +103,17 @@
machine_understands = FALSE machine_understands = FALSE
flags = RESTRICTED | HIVEMIND //CHOMPstation Edit: Changining from WHITELISTED to RESTRICTED | Empathy should be shadekin exclusive. This probably breaks carbon shadekins ability to use emptathy, we dont use them and if it does it should be implemented like DIONA root talk. -shark flags = RESTRICTED | HIVEMIND //CHOMPstation Edit: Changining from WHITELISTED to RESTRICTED | Empathy should be shadekin exclusive. This probably breaks carbon shadekins ability to use emptathy, we dont use them and if it does it should be implemented like DIONA root talk. -shark
/datum/language/marish // CHOMPedit
name = LANGUAGE_MARISH
desc = "Where shadekin have a language rooted in empathy, there are still subtle tones and syllables that are as delicate as the emotions that shadekin normally communicate with."
speech_verb = "mars"
ask_verb = "mars"
exclaim_verb = "MARS"
colour = "shadekin"
key = "9"
machine_understands = FALSE
syllables = list("mar", "mwrrr", "maaAr", "'aarrr", "wrurrl", "mmar") // Placeholder syllables until someone else has a better idea!
/datum/language/slavic //CHOMP reAdd this language /datum/language/slavic //CHOMP reAdd this language
name = LANGUAGE_SLAVIC name = LANGUAGE_SLAVIC
desc = "The official language of the Independent Colonial Confederation of Gilgamesh, originally established in 2122 by the short-lived United Slavic Confederation on Earth." desc = "The official language of the Independent Colonial Confederation of Gilgamesh, originally established in 2122 by the short-lived United Slavic Confederation on Earth."

23
code/modules/mob/living/carbon/human/species/station/traits_vr/positive_ch.dm
View File

@@ -407,3 +407,26 @@
/datum/trait/positive/toxin_gut/apply(var/datum/species/S,var/mob/living/carbon/human/H) /datum/trait/positive/toxin_gut/apply(var/datum/species/S,var/mob/living/carbon/human/H)
..() ..()
H.toxin_gut = TRUE H.toxin_gut = TRUE
/datum/trait/positive/nobreathe // CHOMPedit
name = "Breathless"
desc = "You or your species have adapted to no longer require lungs, and as such no longer need to breathe!"
can_take = ORGANICS
var_changes = list("breath_type" = "null", "poison_type" = "null", "exhale_type" = "null", "water_breather" = "TRUE")
excludes = list(/datum/trait/negative/breathes/phoron,
/datum/trait/negative/breathes/nitrogen,
/datum/trait/positive/light_breather,
/datum/trait/negative/deep_breather
)
cost = 6
/datum/trait/positive/nobreathe/apply(var/datum/species/S, var/mob/living/carbon/human/H)
..()
H.does_not_breathe = 1
var/obj/item/organ/internal/breathy = H.internal_organs_by_name[O_LUNGS]
if(!breathy)
return
H.internal_organs -= breathy
qdel(breathy)