cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-25 22:28:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5415 from CHOMPStation2/upstream-merge-14196

Browse Source 
[MIRROR] Gives prometheans their language as inheirent, removes Tavan from Altevians
This commit is contained in:
Nadyr
2022-12-19 19:04:38 -05:00
committed by GitHub
parent a1ae0cf14c f6574b1795
commit b9d278c57e
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/species.dm
+1 -1
View File
@@ -75,7 +75,7 @@
// The languages the species can't speak without an assisted organ.
// This list is a guess at things that no one other than the parent species should be able to speak
var/list/assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) //VOREStation Edit
var/list/assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN) //VOREStation Edit
//Soundy emotey things.
var/scream_verb_1p = "scream"
code/modules/mob/living/carbon/human/species/station/prometheans.dm
+4 -3
View File
@@ -30,6 +30,7 @@ var/datum/species/shapeshifter/promethean/prometheans
spawn_flags = SPECIES_CAN_JOIN
health_hud_intensity = 2
num_alternate_languages = 3
language = LANGUAGE_PROMETHEAN
species_language = LANGUAGE_PROMETHEAN
secondary_langs = list(LANGUAGE_PROMETHEAN, LANGUAGE_SOL_COMMON) // For some reason, having this as their species language does not allow it to be chosen.
assisted_langs = list(LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX) // Prometheans are weird, let's just assume they can use basically any language.
@@ -60,7 +61,7 @@ var/datum/species/shapeshifter/promethean/prometheans
oxy_mod = 0
flash_mod = 0.5 //No centralized, lensed eyes.
item_slowdown_mod = 1.33
chem_strength_alcohol = 2
cloning_modifier = /datum/modifier/cloning_sickness/promethean
@@ -156,10 +157,10 @@ var/datum/species/shapeshifter/promethean/prometheans
/datum/species/shapeshifter/promethean/hug(var/mob/living/carbon/human/H, var/mob/living/target)
var/static/list/parent_handles = list("head", "r_hand", "l_hand", "mouth")
if(H.zone_sel.selecting in parent_handles)
return ..()
var/t_him = "them"
if(ishuman(target))
var/mob/living/carbon/human/T = target
code/modules/mob/living/carbon/human/species/station/station.dm
+3 -3
View File
@@ -13,7 +13,7 @@
species_language = LANGUAGE_SOL_COMMON
secondary_langs = list(LANGUAGE_SOL_COMMON, LANGUAGE_TERMINUS)
name_language = null // Use the first-name last-name generator rather than a language scrambler
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_SKRELLIAN, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN)
min_age = 18
max_age = 130
@@ -304,7 +304,7 @@
secondary_langs = list(LANGUAGE_SKRELLIAN, LANGUAGE_SCHECHI)
name_language = LANGUAGE_SKRELLIAN
species_language = LANGUAGE_SKRELLIAN
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_TERMINUS, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN)
health_hud_intensity = 2
chem_strength_alcohol = 5
@@ -401,7 +401,7 @@
taste_sensitivity = TASTE_SENSITIVE
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_ZADDAT, LANGUAGE_UNATHI)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_TERMINUS, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_SOL_COMMON, LANGUAGE_AKHANI, LANGUAGE_SIIK, LANGUAGE_GUTTER) //limited vocal range; can talk Unathi and magical Galcom but not much else
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN) //limited vocal range; can talk Unathi and magical Galcom but not much else
name_language = LANGUAGE_ZADDAT
species_language = LANGUAGE_ZADDAT
health_hud_intensity = 2.5
code/modules/mob/living/carbon/human/species/station/station_vr.dm
+2 -3
View File
@@ -86,7 +86,7 @@
name_language = LANGUAGE_SPACER
species_language = LANGUAGE_SPACER
color_mult = 1
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN)
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair, /mob/living/carbon/human/proc/water_stealth, /mob/living/carbon/human/proc/underwater_devour)
min_age = 18
max_age = 110
@@ -347,7 +347,7 @@
inherent_verbs = list(/mob/living/carbon/human/proc/tie_hair, /mob/living/carbon/human/proc/water_stealth, /mob/living/carbon/human/proc/underwater_devour)
reagent_tag = null
allergens = null
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX)
assisted_langs = list(LANGUAGE_EAL, LANGUAGE_ROOTLOCAL, LANGUAGE_ROOTGLOBAL, LANGUAGE_VOX, LANGUAGE_PROMETHEAN)
//CHOMPedit: link to our wiki
wikilink="https://wiki.chompstation13.net/index.php?title=Skrell"
@@ -662,7 +662,6 @@
icobase = 'icons/mob/human_races/r_altevian.dmi'
deform = 'icons/mob/human_races/r_def_altevian.dmi'
unarmed_types = list(/datum/unarmed_attack/stomp, /datum/unarmed_attack/kick, /datum/unarmed_attack/claws, /datum/unarmed_attack/bite/sharp)
language = LANGUAGE_TAVAN
num_alternate_languages = 3
secondary_langs = list(LANGUAGE_TAVAN)
species_language = LANGUAGE_TAVAN