This commit is contained in:
ZomgPonies
2013-10-22 03:41:32 -04:00
parent 6a073828f5
commit 0d42f95633
25 changed files with 9194 additions and 9188 deletions
+1 -1
View File
@@ -56,7 +56,7 @@
desc = "Languages of slimes, a mixture of bubbling noises and pops. Almost impossible to speak without mechanical aid for non slime people."
speech_verb = "bubbles and pops"
colour = "slime"
key = "sl"
key = "f"
flags = RESTRICTED
/datum/language/human
+1 -1
View File
@@ -149,7 +149,7 @@ var/list/ai_list = list()
//if(icon_state == initial(icon_state))
var/icontype = ""
if (custom_sprite == 1) icontype = ("Custom")//automagically selects custom sprite if one is available
else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
else icontype = input("Select an icon!", "AI", null, null) in list("Monochrome", "Blue", "Clown", "Inverted", "Text", "Smiley", "Angry", "Dorf", "Matrix", "Bliss", "Firewall", "Green", "Red", "Static", "Triumvirate", "Triumvirate Static")
switch(icontype)
if("Custom") icon_state = "[src.ckey]-ai"
if("Clown") icon_state = "ai-clown2"
@@ -51,7 +51,7 @@
name = "Bald"
icon_state = "bald"
gender = MALE
species_allowed = list("Human","Unathi")
species_allowed = list("Human","Unathi","Vox","Diona","Skellington","Kidan")
short
name = "Short Hair" // try to capatilize the names please~
@@ -288,10 +288,6 @@
icon_state = "hair_e"
gender = MALE // turnoff!
bald
name = "Bald"
icon_state = "bald"
/*
///////////////////////////////////
/ =---------------------------= /
+2
View File
@@ -90,6 +90,8 @@
return 1
else if (istype(other, src.type) || istype(src, other.type))
return 1
else if (istype(other, /mob/living/carbon/human) && istype(src, /mob/living/carbon/human))
return 1
return 0
/mob/proc/say_quote(var/text,var/datum/language/speaking)