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

Resolve conflicts, fix compile errors

Browse Source
This commit is contained in:
Meghan-Rossi
2019-12-19 16:47:57 +00:00
parent 3b7a737c08
commit 604fd1b74f
16 changed files with 24 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -68,11 +68,7 @@ var/list/organ_cache = list()
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

2
code/modules/organs/robolimbs_vr.dm
View File

@@ -202,7 +202,7 @@
suggested_species = "Teshari"
/datum/robolimb/dsi_teshari/New()
species_cannot_use = all_species.Copy()
species_cannot_use = GLOB.all_species.Copy()
species_cannot_use -= SPECIES_TESHARI
..()