cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-10 18:22:39 +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

10
code/_helpers/global_lists.dm
View File

@@ -24,16 +24,6 @@ var/global/list/turfs = list() //list of all turfs
#define all_genders_define_list list(MALE,FEMALE,PLURAL,NEUTER,HERM) //VOREStaton Edit
#define all_genders_text_list list("Male","Female","Plural","Neuter","Herm") //VOREStation Edit
<<<<<<< HEAD
//Languages/species/whitelist.
var/global/list/all_species[0]
var/global/list/all_languages[0]
var/global/list/language_keys[0] // Table of say codes for all languages
var/global/list/whitelisted_species = list(SPECIES_HUMAN) // Species that require a whitelist check.
var/global/list/playable_species = list(SPECIES_CUSTOM, SPECIES_HUMAN) // A list of ALL playable species, whitelisted, latejoin or otherwise. //VOREStation Edit - Making sure custom species is obvious.
=======
>>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies
var/list/mannequins_
// Posters

4
code/_helpers/global_lists_vr.dm
View File

@@ -469,10 +469,10 @@ var/global/list/remainless_species = list(SPECIES_PROMETHEAN,
// Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well.
for(var/species_name in playable_species)
for(var/species_name in GLOB.playable_species)
if(species_name in blacklisted_icons)
continue
var/datum/species/S = all_species[species_name]
var/datum/species/S = GLOB.all_species[species_name]
if(S.spawn_flags & SPECIES_IS_WHITELISTED)
continue
custom_species_bases += species_name