Tweaks to previous commits.

This commit is contained in:
Zuhayr
2015-12-03 22:56:19 -08:00
committed by NullSnapshot
parent d94ece66f1
commit 5561964204
6 changed files with 26 additions and 20 deletions
+3 -2
View File
@@ -1184,8 +1184,9 @@ datum/preferences
var/raw_name = input(user, "Choose your character's name:", "Character Preference") as text|null
if (!isnull(raw_name)) // Check to ensure that the user entered text (rather than cancel.)
var/new_name
if(species == "Machine")
new_name = sanitizeName(raw_name,,1)
var/datum/species/S = all_species[species]
if(istype(S))
new_name = S.sanitize_name(raw_name)
else
new_name = sanitizeName(raw_name)
if(new_name)
+2 -4
View File
@@ -107,12 +107,10 @@
space_chance = 10
/datum/language/machine/get_random_name()
var/new_name
if(prob(70))
new_name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
return "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
else
new_name = pick(ai_names)
return new_name
return pick(ai_names)
//Syllable Lists
/*
@@ -154,6 +154,9 @@
for(var/u_type in unarmed_types)
unarmed_attacks += new u_type()
/datum/species/proc/sanitize_name(var/new_name)
return sanitizeName(new_name)
/datum/species/proc/get_station_variant()
return name
@@ -266,7 +266,7 @@
cold_level_2 = -1
cold_level_3 = -1
heat_level_1 = 398.15 // Start taking damage above ~125 Degrees C
heat_level_1 = 500 // Gives them about 25 seconds in space before taking damage
heat_level_2 = 1000
heat_level_3 = 2000
@@ -312,3 +312,6 @@
H.h_style = ""
spawn(100)
if(H) H.update_hair()
/datum/species/machine/sanitize_name(var/new_name)
return sanitizeName(new_name,allow_numbers=1)