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

Change various global species lists to GLOB versions, adds 2 more event subspecies.

Browse Source
This commit is contained in:
Atermonera
2019-12-15 21:51:05 -08:00
committed by VirgoBot
parent dbef0774d6
commit 3b7a737c08
49 changed files with 148 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/organs/internal/voicebox.dm
View File

@@ -18,7 +18,7 @@
/obj/item/organ/internal/voicebox/proc/amend_assist_langs() // Adds the list of language datums assisted by the voicebox to the list used in speaking
for(var/L in will_assist_languages)
assists_languages |= all_languages[L]
assists_languages |= GLOB.all_languages[L]
/obj/item/organ/internal/voicebox/proc/add_assistable_langs(var/language) // Adds a new language (by string/define) to the list of things the voicebox can assist
will_assist_languages |= language

8
code/modules/organs/organ.dm
View File

@@ -65,10 +65,14 @@ var/list/organ_cache = list()
if(istype(holder))
src.owner = holder
src.w_class = max(src.w_class + mob_size_difference(holder.mob_size, MOB_MEDIUM), 1) //smaller mobs have smaller organs.
species = all_species[SPECIES_HUMAN]
species = GLOB.all_species[SPECIES_HUMAN]
if(holder.dna)
dna = holder.dna.Clone()
<<<<<<< HEAD
species = holder.species //VOREStation Edit - For custom species
=======
species = GLOB.all_species[dna.species]
>>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies
else
log_debug("[src] at [loc] spawned without a proper DNA.")
var/mob/living/carbon/human/H = holder
@@ -87,7 +91,7 @@ var/list/organ_cache = list()
if(internal)
holder.internal_organs |= src
else
species = all_species["Human"]
species = GLOB.all_species["Human"]
handle_organ_mod_special()