Merge remote-tracking branch 'upstream/master' into dev-freeze

This commit is contained in:
GinjaNinja32
2015-08-22 15:28:49 +01:00
7 changed files with 680 additions and 620 deletions
+1 -1
View File
@@ -420,7 +420,7 @@
var/datum/species/chosen_species
if(client.prefs.species)
chosen_species = all_species[client.prefs.species]
use_species_name = all_species[chosen_species.get_station_variant()] //Only used by pariahs atm.
use_species_name = chosen_species.get_station_variant() //Only used by pariahs atm.
if(chosen_species && use_species_name)
// Have to recheck admin due to no usr at roundstart. Latejoins are fine though.