Merge pull request #11376 from NullSnapshot/dev-freeze

Bunch of IPC fixes.
This commit is contained in:
Chinsky
2015-12-04 11:28:25 +03:00
7 changed files with 62 additions and 27 deletions
+6 -1
View File
@@ -1183,7 +1183,12 @@ datum/preferences
if("name")
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 = sanitizeName(raw_name)
var/new_name
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)
real_name = new_name
else
+6 -1
View File
@@ -188,11 +188,16 @@
//Sanitize
metadata = sanitize_text(metadata, initial(metadata))
real_name = sanitizeName(real_name)
if(isnull(species) || !(species in playable_species))
species = "Human"
var/datum/species/cur_species = all_species[species]
if(istype(cur_species))
real_name = cur_species.sanitize_name(real_name)
else
real_name = sanitizeName(real_name)
if(isnum(underwear))
var/list/undies = gender == MALE ? underwear_m : underwear_f
underwear = undies[undies[underwear]]
+2 -3
View File
@@ -108,10 +108,9 @@
/datum/language/machine/get_random_name()
if(prob(70))
name = "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
return "[pick(list("PBU","HIU","SINA","ARMA","OSI"))]-[rand(100, 999)]"
else
name = pick(ai_names)
return name
return pick(ai_names)
//Syllable Lists
/*
@@ -157,6 +157,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
@@ -250,7 +250,7 @@
halloss_message_self = "ERROR: Unrecoverable machine check exception.<BR>System halted, rebooting..."
warning_low_pressure = 50
hazard_low_pressure = 0
hazard_low_pressure = -1
cold_level_1 = 50
cold_level_2 = -1
@@ -292,8 +292,17 @@
"r_foot" = list("path" = /obj/item/organ/external/foot/right/ipc)
)
heat_discomfort_level = 373.15
heat_discomfort_strings = list(
"Your CPU temperature probes warn you that you are approaching critical heat levels!"
)
/datum/species/machine/handle_death(var/mob/living/carbon/human/H)
..()
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)