cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

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

@@ -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

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

@@ -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 @@
. += "<b>Custom Species Name:</b> "
. += "<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)
. += "<b>Icon Base: </b> "
. += "<a href='?src=\ref[src];custom_base=1'>[pref.custom_base ? pref.custom_base : "Human"]</a><br>"