This commit is contained in:
Tastyfish
2016-04-09 16:00:59 -04:00
parent 2d521ac64e
commit 632595ce38
3 changed files with 3 additions and 7 deletions
+2 -2
View File
@@ -130,13 +130,13 @@ var/global/wcCommon = pick(list("#379963", "#0d8395", "#58b5c3", "#49e46e", "#8f
else if (user.a_intent == I_HARM)
user.changeNext_move(CLICK_CD_MELEE)
playsound(get_turf(src), 'sound/effects/glassknock.ogg', 80, 1)
usr.visible_message("\red [usr.name] bangs against the [src.name]!", \
user.visible_message("\red [user.name] bangs against the [src.name]!", \
"\red You bang against the [src.name]!", \
"You hear a banging sound.")
else
user.changeNext_move(CLICK_CD_MELEE)
playsound(src.loc, 'sound/effects/glassknock.ogg', 80, 1)
user.visible_message("[usr.name] knocks on the [src.name].", \
user.visible_message("[user.name] knocks on the [src.name].", \
"You knock on the [src.name].", \
"You hear a knocking sound.")
return
@@ -49,7 +49,7 @@
for(var/i = 0; i < 5; i++)
curse_words = pick_list(speak_file, "curse_words")
toSay += "[curse_words] "
chatmsg += "Hey [nouns_generic], why dont you go [copytext(toSay, 1, length(toSay))], you [nouns_insult]!"
chatmsg += "Hey [nouns_generic], why don't you go [copytext(toSay, 1, length(toSay))], you [nouns_insult]!"
else if(prob(chattyness))
chatmsg += pick(knownStrings)
if(prob(25)) // cut out some phrases now and then to make sure we're fresh and new
@@ -2,10 +2,6 @@
..(loc, "Tajaran")
rename_character(name, "Tigercat")
/mob/living/carbon/human/interactive/tigercat/random()
..()
gender = "male"
/mob/living/carbon/human/interactive/tigercat/Life()
reagents.add_reagent("sodiumchloride", 1)
..()