cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +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/_global_vars/lists/species.dm
View File

@@ -3,4 +3,6 @@ GLOBAL_LIST_INIT(all_species, list())
GLOBAL_LIST_INIT(all_languages, list()) GLOBAL_LIST_INIT(all_languages, list())
GLOBAL_LIST_INIT(language_keys, list()) // Table of say codes for all languages 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(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

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_define_list list(MALE,FEMALE,PLURAL,NEUTER,HERM) //VOREStaton Edit
#define all_genders_text_list list("Male","Female","Plural","Neuter","Herm") //VOREStation 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_ var/list/mannequins_
// Posters // 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 // Custom species icon bases
var/list/blacklisted_icons = list(SPECIES_CUSTOM,SPECIES_PROMETHEAN) //Just ones that won't work well. 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) if(species_name in blacklisted_icons)
continue 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) if(S.spawn_flags & SPECIES_IS_WHITELISTED)
continue continue
custom_species_bases += species_name custom_species_bases += species_name

2
code/modules/client/preference_setup/preference_setup_vr.dm
View File

@@ -1,7 +1,7 @@
//Minimum limit is 18 //Minimum limit is 18
/datum/category_item/player_setup_item/get_min_age() /datum/category_item/player_setup_item/get_min_age()
var/min_age = 18 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) if(!is_FBP() && S.min_age > 18)
min_age = S.min_age min_age = S.min_age
return min_age return min_age

6
code/modules/client/preference_setup/vore/07_traits.dm
View File

@@ -73,7 +73,7 @@
if(!(path in negative_traits)) if(!(path in negative_traits))
pref.neg_traits -= path 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) if(selected_species.selects_bodytype)
// Allowed! // Allowed!
else if(!pref.custom_base || !(pref.custom_base in custom_species_bases)) 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) /datum/category_item/player_setup_item/vore/traits/copy_to_mob(var/mob/living/carbon/human/character)
character.custom_species = pref.custom_species 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) if(selected_species.selects_bodytype)
var/datum/species/custom/CS = character.species var/datum/species/custom/CS = character.species
var/S = pref.custom_base ? pref.custom_base : "Human" var/S = pref.custom_base ? pref.custom_base : "Human"
@@ -99,7 +99,7 @@
. += "<b>Custom Species Name:</b> " . += "<b>Custom Species Name:</b> "
. += "<a href='?src=\ref[src];custom_species=1'>[pref.custom_species ? pref.custom_species : "-Input Name-"]</a><br>" . += "<a href='?src=\ref[src];custom_species=1'>[pref.custom_species ? pref.custom_species : "-Input Name-"]</a><br>"
var/datum/species/selected_species = all_species[pref.species] var/datum/species/selected_species = GLOB.all_species[pref.species]
if(selected_species.selects_bodytype) if(selected_species.selects_bodytype)
. += "<b>Icon Base: </b> " . += "<b>Icon Base: </b> "
. += "<a href='?src=\ref[src];custom_base=1'>[pref.custom_base ? pref.custom_base : "Human"]</a><br>" . += "<a href='?src=\ref[src];custom_base=1'>[pref.custom_base ? pref.custom_base : "Human"]</a><br>"

4
code/modules/mob/living/carbon/human/species/station/alraune.dm
View File

@@ -459,7 +459,7 @@
if(ispath(to_copy)) if(ispath(to_copy))
to_copy = "[initial(to_copy.name)]" to_copy = "[initial(to_copy.name)]"
if(istext(to_copy)) if(istext(to_copy))
to_copy = all_species[to_copy] to_copy = GLOB.all_species[to_copy]
var/datum/species/alraune/new_copy = new() var/datum/species/alraune/new_copy = new()
@@ -495,5 +495,5 @@
return base_species return base_species
/datum/species/alraune/get_race_key() /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 return real.race_key

4
code/modules/mob/living/carbon/human/species/station/blank_vr.dm
View File

@@ -51,7 +51,7 @@
return base_species return base_species
/datum/species/custom/get_race_key() /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 return real.race_key
/datum/species/custom/proc/produceCopy(var/datum/species/to_copy,var/list/traits,var/mob/living/carbon/human/H) /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)) if(ispath(to_copy))
to_copy = "[initial(to_copy.name)]" to_copy = "[initial(to_copy.name)]"
if(istext(to_copy)) if(istext(to_copy))
to_copy = all_species[to_copy] to_copy = GLOB.all_species[to_copy]
var/datum/species/custom/new_copy = new() var/datum/species/custom/new_copy = new()

2
code/modules/mob/living/carbon/human/species/station/protean_vr/protean_powers.dm
View File

@@ -260,7 +260,7 @@
to_chat(src,"<span class='warning'>You must be awake and standing to perform this action!</span>") to_chat(src,"<span class='warning'>You must be awake and standing to perform this action!</span>")
return 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) if(new_species)
impersonate_bodytype = new_species impersonate_bodytype = new_species
regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing regenerate_icons() //Expensive, but we need to recrunch all the icons we're wearing

4
code/modules/mob/living/carbon/human/species/station/station_special_vr.dm
View File

@@ -276,7 +276,7 @@
if(ispath(to_copy)) if(ispath(to_copy))
to_copy = "[initial(to_copy.name)]" to_copy = "[initial(to_copy.name)]"
if(istext(to_copy)) if(istext(to_copy))
to_copy = all_species[to_copy] to_copy = GLOB.all_species[to_copy]
var/datum/species/xenochimera/new_copy = new() var/datum/species/xenochimera/new_copy = new()
@@ -312,7 +312,7 @@
return base_species return base_species
/datum/species/xenochimera/get_race_key() /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 return real.race_key

10
code/modules/mob/new_player/new_player.dm
View File

@@ -185,21 +185,13 @@
else if(ticker && ticker.mode && ticker.mode.explosion_in_progress) else if(ticker && ticker.mode && ticker.mode.explosion_in_progress)
usr << "<span class='danger'>The station is currently exploding. Joining would go poorly.</span>" usr << "<span class='danger'>The station is currently exploding. Joining would go poorly.</span>"
return 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])) if(!is_alien_whitelisted(src, GLOB.all_species[client.prefs.species]))
src << alert("You are currently not whitelisted to play [client.prefs.species].") src << alert("You are currently not whitelisted to play [client.prefs.species].")
return 0 return 0
var/datum/species/S = GLOB.all_species[client.prefs.species] 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)) if(!(S.spawn_flags & SPECIES_CAN_JOIN))
src << alert("Your current species, [client.prefs.species], is not available for play on the station.") src << alert("Your current species, [client.prefs.species], is not available for play on the station.")
return 0 return 0

2
code/modules/mob/new_player/new_player_vr.dm
View File

@@ -22,7 +22,7 @@
to_chat(src,"<span class='warning'>You have not set your scale yet. Do this on the VORE tab in character setup.</span>") to_chat(src,"<span class='warning'>You have not set your scale yet. Do this on the VORE tab in character setup.</span>")
//Can they play? //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 pass = FALSE
to_chat(src,"<span class='warning'>You are not allowed to spawn in as this species.</span>") to_chat(src,"<span class='warning'>You are not allowed to spawn in as this species.</span>")

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

@@ -68,11 +68,7 @@ var/list/organ_cache = list()
species = GLOB.all_species[SPECIES_HUMAN] species = GLOB.all_species[SPECIES_HUMAN]
if(holder.dna) if(holder.dna)
dna = holder.dna.Clone() dna = holder.dna.Clone()
<<<<<<< HEAD
species = holder.species //VOREStation Edit - For custom species species = holder.species //VOREStation Edit - For custom species
=======
species = GLOB.all_species[dna.species]
>>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies
else else
log_debug("[src] at [loc] spawned without a proper DNA.") log_debug("[src] at [loc] spawned without a proper DNA.")
var/mob/living/carbon/human/H = holder var/mob/living/carbon/human/H = holder

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

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

12
code/modules/research/prosfab_designs.dm
View File

@@ -15,9 +15,8 @@
var/newspecies = "Human" var/newspecies = "Human"
if(prosfab.manufacturer) if(prosfab.manufacturer)
var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer] var/datum/robolimb/manf = all_robolimbs[prosfab.manufacturer]
<<<<<<< HEAD
newspecies = manf.suggested_species newspecies = manf.suggested_species
O.species = all_species[newspecies] O.species = GLOB.all_species[newspecies]
if(istype(O,/obj/item/organ/external)) if(istype(O,/obj/item/organ/external))
var/obj/item/organ/external/EO = O var/obj/item/organ/external/EO = O
if(EO.species.base_color) if(EO.species.base_color)
@@ -26,11 +25,6 @@
var/b_skin = hex2num(copytext(EO.species.base_color,6,8)) var/b_skin = hex2num(copytext(EO.species.base_color,6,8))
EO.s_col = list(r_skin, g_skin, b_skin) EO.s_col = list(r_skin, g_skin, b_skin)
//VOREStation Edit End //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.robotize(prosfab.manufacturer)
O.dna = new/datum/dna() //Uuughhhh... why do I have to do this? O.dna = new/datum/dna() //Uuughhhh... why do I have to do this?
O.dna.ResetUI() O.dna.ResetUI()
@@ -60,11 +54,7 @@
EO.remove_rejuv() EO.remove_rejuv()
for(var/obj/item/organ/external/O in H.organs) 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] O.species = GLOB.all_species[newspecies]
>>>>>>> f14184f... Merge pull request #6558 from Mechoid/GlobSpecies
O.robotize(prosfab.manufacturer) O.robotize(prosfab.manufacturer)
O.dna = new/datum/dna() O.dna = new/datum/dna()
O.dna.ResetUI() O.dna.ResetUI()

6
code/modules/resleeving/designer.dm
View File

@@ -68,8 +68,8 @@
if(menu == "3") if(menu == "3")
var/stock_bodyrecords_list_ui[0] var/stock_bodyrecords_list_ui[0]
for (var/N in all_species) for (var/N in GLOB.all_species)
var/datum/species/S = all_species[N] var/datum/species/S = GLOB.all_species[N]
if((S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue if((S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) != SPECIES_CAN_JOIN) continue
stock_bodyrecords_list_ui += N stock_bodyrecords_list_ui += N
if(stock_bodyrecords_list_ui.len) if(stock_bodyrecords_list_ui.len)
@@ -172,7 +172,7 @@
temp = "ERROR: Record missing." temp = "ERROR: Record missing."
else if(href_list["view_stock_brec"]) 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) if(S && (S.spawn_flags & (SPECIES_IS_WHITELISTED|SPECIES_CAN_JOIN)) == SPECIES_CAN_JOIN)
// Generate body record from species! // Generate body record from species!
mannequin = new(null, S.name) mannequin = new(null, S.name)

2
code/modules/resleeving/infocore_records.dm
View File

@@ -108,7 +108,7 @@
locked = ckeylock locked = ckeylock
//Prevent people from printing restricted and whitelisted species //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) if(S)
toocomplex = (S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_IS_RESTRICTED) toocomplex = (S.spawn_flags & SPECIES_IS_WHITELISTED) || (S.spawn_flags & SPECIES_IS_RESTRICTED)