From 604fd1b74f2af1e997a3be09480e3a95041e65ef Mon Sep 17 00:00:00 2001 From: Meghan-Rossi <56671765+Meghan-Rossi@users.noreply.github.com> Date: Thu, 19 Dec 2019 16:47:57 +0000 Subject: [PATCH] Resolve conflicts, fix compile errors --- code/_global_vars/lists/species.dm | 4 +++- code/_helpers/global_lists.dm | 10 ---------- code/_helpers/global_lists_vr.dm | 4 ++-- .../client/preference_setup/preference_setup_vr.dm | 2 +- .../client/preference_setup/vore/07_traits.dm | 6 +++--- .../living/carbon/human/species/station/alraune.dm | 4 ++-- .../living/carbon/human/species/station/blank_vr.dm | 4 ++-- .../species/station/protean_vr/protean_powers.dm | 2 +- .../human/species/station/station_special_vr.dm | 4 ++-- code/modules/mob/new_player/new_player.dm | 10 +--------- code/modules/mob/new_player/new_player_vr.dm | 2 +- code/modules/organs/organ.dm | 4 ---- code/modules/organs/robolimbs_vr.dm | 2 +- code/modules/research/prosfab_designs.dm | 12 +----------- code/modules/resleeving/designer.dm | 6 +++--- code/modules/resleeving/infocore_records.dm | 2 +- 16 files changed, 24 insertions(+), 54 deletions(-) diff --git a/code/_global_vars/lists/species.dm b/code/_global_vars/lists/species.dm index fec8e4a069..780ce3fb70 100644 --- a/code/_global_vars/lists/species.dm +++ b/code/_global_vars/lists/species.dm @@ -3,4 +3,6 @@ GLOBAL_LIST_INIT(all_species, list()) GLOBAL_LIST_INIT(all_languages, list()) GLOBAL_LIST_INIT(language_keys, list()) // Table of say codes for all languages GLOBAL_LIST_INIT(whitelisted_species, list(SPECIES_HUMAN)) // Species that require a whitelist check. -GLOBAL_LIST_INIT(playable_species, list(SPECIES_HUMAN)) // A list of ALL playable species, whitelisted, latejoin or otherwise. +// VOREStation edit - include custom species +GLOBAL_LIST_INIT(playable_species, list(SPECIES_HUMAN, SPECIES_CUSTOM)) // A list of ALL playable species, whitelisted, latejoin or otherwise. +// VOREStation edit end \ No newline at end of file diff --git a/code/_helpers/global_lists.dm b/code/_helpers/global_lists.dm index b5aad2eec2..4c98e06c4d 100644 --- a/code/_helpers/global_lists.dm +++ b/code/_helpers/global_lists.dm @@ -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 diff --git a/code/_helpers/global_lists_vr.dm b/code/_helpers/global_lists_vr.dm index d57bd09558..3469779fda 100644 --- a/code/_helpers/global_lists_vr.dm +++ b/code/_helpers/global_lists_vr.dm @@ -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 diff --git a/code/modules/client/preference_setup/preference_setup_vr.dm b/code/modules/client/preference_setup/preference_setup_vr.dm index 67c1d1792a..2379875910 100644 --- a/code/modules/client/preference_setup/preference_setup_vr.dm +++ b/code/modules/client/preference_setup/preference_setup_vr.dm @@ -1,7 +1,7 @@ //Minimum limit is 18 /datum/category_item/player_setup_item/get_min_age() var/min_age = 18 - var/datum/species/S = all_species[pref.species ? pref.species : "Human"] + var/datum/species/S = GLOB.all_species[pref.species ? pref.species : "Human"] if(!is_FBP() && S.min_age > 18) min_age = S.min_age return min_age diff --git a/code/modules/client/preference_setup/vore/07_traits.dm b/code/modules/client/preference_setup/vore/07_traits.dm index 06b748f359..6462a142c7 100644 --- a/code/modules/client/preference_setup/vore/07_traits.dm +++ b/code/modules/client/preference_setup/vore/07_traits.dm @@ -73,7 +73,7 @@ if(!(path in negative_traits)) pref.neg_traits -= path - var/datum/species/selected_species = all_species[pref.species] + var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) // Allowed! else if(!pref.custom_base || !(pref.custom_base in custom_species_bases)) @@ -81,7 +81,7 @@ /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character) character.custom_species = pref.custom_species - var/datum/species/selected_species = all_species[pref.species] + var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) var/datum/species/custom/CS = character.species var/S = pref.custom_base ? pref.custom_base : "Human" @@ -99,7 +99,7 @@ . += "Custom Species Name: " . += "[pref.custom_species ? pref.custom_species : "-Input Name-"]
" - var/datum/species/selected_species = all_species[pref.species] + var/datum/species/selected_species = GLOB.all_species[pref.species] if(selected_species.selects_bodytype) . += "Icon Base: " . += "[pref.custom_base ? pref.custom_base : "Human"]
" diff --git a/code/modules/mob/living/carbon/human/species/station/alraune.dm b/code/modules/mob/living/carbon/human/species/station/alraune.dm index a26c15ad46..14a9d61679 100644 --- a/code/modules/mob/living/carbon/human/species/station/alraune.dm +++ b/code/modules/mob/living/carbon/human/species/station/alraune.dm @@ -459,7 +459,7 @@ if(ispath(to_copy)) to_copy = "[initial(to_copy.name)]" if(istext(to_copy)) - to_copy = all_species[to_copy] + to_copy = GLOB.all_species[to_copy] var/datum/species/alraune/new_copy = new() @@ -495,5 +495,5 @@ return base_species /datum/species/alraune/get_race_key() - var/datum/species/real = all_species[base_species] + var/datum/species/real = GLOB.all_species[base_species] return real.race_key diff --git a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm index c187450734..5374d21b33 100644 --- a/code/modules/mob/living/carbon/human/species/station/blank_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/blank_vr.dm @@ -51,7 +51,7 @@ return base_species /datum/species/custom/get_race_key() - var/datum/species/real = all_species[base_species] + var/datum/species/real = GLOB.all_species[base_species] return real.race_key /datum/species/custom/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) @@ -61,7 +61,7 @@ if(ispath(to_copy)) to_copy = "[initial(to_copy.name)]" if(istext(to_copy)) - to_copy = all_species[to_copy] + to_copy = GLOB.all_species[to_copy] var/datum/species/custom/new_copy = new() diff --git a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm index 4172a4be3b..e8f83e5f19 100644 --- a/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm +++ b/code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm @@ -260,7 +260,7 @@ to_chat(src,"You must be awake and standing to perform this action!") return - var/new_species = input("Please select a species to emulate.", "Shapeshifter Body") as null|anything in playable_species + var/new_species = input("Please select a species to emulate.", "Shapeshifter Body") as null|anything in GLOB.playable_species if(new_species) impersonate_bodytype = new_species regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing diff --git a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm index 7599d6f6db..cdf1638453 100644 --- a/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm +++ b/code/modules/mob/living/carbon/human/species/station/station_special_vr.dm @@ -276,7 +276,7 @@ if(ispath(to_copy)) to_copy = "[initial(to_copy.name)]" if(istext(to_copy)) - to_copy = all_species[to_copy] + to_copy = GLOB.all_species[to_copy] var/datum/species/xenochimera/new_copy = new() @@ -312,7 +312,7 @@ return base_species /datum/species/xenochimera/get_race_key() - var/datum/species/real = all_species[base_species] + var/datum/species/real = GLOB.all_species[base_species] return real.race_key diff --git a/code/modules/mob/new_player/new_player.dm b/code/modules/mob/new_player/new_player.dm index 49a05a7045..1bcafd6e45 100644 --- a/code/modules/mob/new_player/new_player.dm +++ b/code/modules/mob/new_player/new_player.dm @@ -185,21 +185,13 @@ else if(ticker && ticker.mode && ticker.mode.explosion_in_progress) usr << "The station is currently exploding. Joining would go poorly." return -<<<<<<< HEAD -/* - if(!is_alien_whitelisted(src, all_species[client.prefs.species])) - src << alert("You are currently not whitelisted to play [client.prefs.species].") - return 0 -*/ - var/datum/species/S = all_species[client.prefs.species] -======= if(!is_alien_whitelisted(src, GLOB.all_species[client.prefs.species])) src << alert("You are currently not whitelisted to play [client.prefs.species].") return 0 var/datum/species/S = GLOB.all_species[client.prefs.species] ->>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies + if(!(S.spawn_flags & SPECIES_CAN_JOIN)) src << alert("Your current species, [client.prefs.species], is not available for play on the station.") return 0 diff --git a/code/modules/mob/new_player/new_player_vr.dm b/code/modules/mob/new_player/new_player_vr.dm index b18e66fd83..711332e692 100644 --- a/code/modules/mob/new_player/new_player_vr.dm +++ b/code/modules/mob/new_player/new_player_vr.dm @@ -22,7 +22,7 @@ to_chat(src,"You have not set your scale yet. Do this on the VORE tab in character setup.") //Can they play? - if(!is_alien_whitelisted(src,all_species[client.prefs.species]) && !check_rights(R_ADMIN, 0)) + if(!is_alien_whitelisted(src,GLOB.all_species[client.prefs.species]) && !check_rights(R_ADMIN, 0)) pass = FALSE to_chat(src,"You are not allowed to spawn in as this species.") diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm index 818e5a2e7f..efdf8efd3e 100644 --- a/code/modules/organs/organ.dm +++ b/code/modules/organs/organ.dm @@ -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 diff --git a/code/modules/organs/robolimbs_vr.dm b/code/modules/organs/robolimbs_vr.dm index 3a872ea690..8f0de65d43 100644 --- a/code/modules/organs/robolimbs_vr.dm +++ b/code/modules/organs/robolimbs_vr.dm @@ -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 ..() diff --git a/code/modules/research/prosfab_designs.dm b/code/modules/research/prosfab_designs.dm index dea0e010ea..50a5d6db0d 100644 --- a/code/modules/research/prosfab_designs.dm +++ b/code/modules/research/prosfab_designs.dm @@ -15,9 +15,8 @@ var/newspecies = "Human" if(prosfab.manufacturer) var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer] -<<<<<<< HEAD newspecies = manf.suggested_species - O.species = all_species[newspecies] + O.species = GLOB.all_species[newspecies] if(istype(O,/obj/item/organ/external)) var/obj/item/organ/external/EO = O if(EO.species.base_color) @@ -26,11 +25,6 @@ var/b_skin = hex2num(copytext(EO.species.base_color,6,8)) EO.s_col = list(r_skin, g_skin, b_skin) //VOREStation Edit End -======= - O.species = GLOB.all_species["[manf.suggested_species]"] - else - O.species = GLOB.all_species["Human"] ->>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies O.robotize(prosfab.manufacturer) O.dna = new/datum/dna() //Uuughhhh... why do I have to do this? O.dna.ResetUI() @@ -60,11 +54,7 @@ EO.remove_rejuv() for(var/obj/item/organ/external/O in H.organs) -<<<<<<< HEAD - O.species = all_species[newspecies] //VOREStation Edit with species suggestion above -======= O.species = GLOB.all_species[newspecies] ->>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies O.robotize(prosfab.manufacturer) O.dna = new/datum/dna() O.dna.ResetUI() diff --git a/code/modules/resleeving/designer.dm b/code/modules/resleeving/designer.dm index 4803a9e668..d9d4073d16 100644 --- a/code/modules/resleeving/designer.dm +++ b/code/modules/resleeving/designer.dm @@ -68,8 +68,8 @@ if(menu == "3") var/stock_bodyrecords_list_ui[0] - for (var/N in all_species) - var/datum/species/S = all_species[N] + for (var/N in GLOB.all_species) + var/datum/species/S = GLOB.all_species[N] if((S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue stock_bodyrecords_list_ui += N if(stock_bodyrecords_list_ui.len) @@ -172,7 +172,7 @@ temp = "ERROR: Record missing." else if(href_list["view_stock_brec"]) - var/datum/species/S = all_species[href_list["view_stock_brec"]] + var/datum/species/S = GLOB.all_species[href_list["view_stock_brec"]] if(S && (S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) == SPECIES_CAN_JOIN) // Generate body record from species! mannequin = new(null, S.name) diff --git a/code/modules/resleeving/infocore_records.dm b/code/modules/resleeving/infocore_records.dm index 134d2be87d..e32c28e66b 100644 --- a/code/modules/resleeving/infocore_records.dm +++ b/code/modules/resleeving/infocore_records.dm @@ -108,7 +108,7 @@ locked = ckeylock //Prevent people from printing restricted and whitelisted species - var/datum/species/S = all_species["[M.dna.species]"] + var/datum/species/S = GLOB.all_species["[M.dna.species]"] if(S) toocomplex = (S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_IS_RESTRICTED)