Resolve conflicts, fix compile errors

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