diff --git a/code/game/objects/structures/window.dm b/code/game/objects/structures/window.dm index 5615ffff507..e078fa2295e 100644 --- a/code/game/objects/structures/window.dm +++ b/code/game/objects/structures/window.dm @@ -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 diff --git a/code/modules/mob/living/carbon/human/interactive/functions.dm b/code/modules/mob/living/carbon/human/interactive/functions.dm index c61bb1eb21c..0a220accc98 100644 --- a/code/modules/mob/living/carbon/human/interactive/functions.dm +++ b/code/modules/mob/living/carbon/human/interactive/functions.dm @@ -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 diff --git a/code/modules/mob/living/carbon/human/interactive/thisisdumb.dm b/code/modules/mob/living/carbon/human/interactive/thisisdumb.dm index 12effaa0826..fb628c61ac7 100644 --- a/code/modules/mob/living/carbon/human/interactive/thisisdumb.dm +++ b/code/modules/mob/living/carbon/human/interactive/thisisdumb.dm @@ -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) ..()