From f2e0e5a1932d8ce5ef637dfc974245cba2d05116 Mon Sep 17 00:00:00 2001 From: Razharas Date: Sun, 15 Dec 2013 20:58:28 +0400 Subject: [PATCH] Fixed minor typos and more use of new proc Removed previously added ling logging proc, replaced with new one Fixed some language Fixed help and grab intent logging when you do it to yourself --- .../gamemodes/changeling/changeling_powers.dm | 17 ++++++----------- .../mob/living/carbon/human/human_attackhand.dm | 10 ++++++---- 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/code/game/gamemodes/changeling/changeling_powers.dm b/code/game/gamemodes/changeling/changeling_powers.dm index c909f9ec6bc..eb336d00c50 100644 --- a/code/game/gamemodes/changeling/changeling_powers.dm +++ b/code/game/gamemodes/changeling/changeling_powers.dm @@ -532,11 +532,6 @@ var/list/datum/dna/hivemind_bank = list() //STINGS// //They get a pretty header because there's just so fucking many of them ;_; ////////// -/mob/living/carbon/proc/add_sting_logs(mob/T, sting_name, datum/dna/DNA) - src.attack_log += "\[[time_stamp()]\] Stung [T.name] ([T.ckey]) with [sting_name] sting[!DNA ? "." : ", giving him [DNA.real_name] appearance."]" - T.attack_log += "\[[time_stamp()]\] Was stung by [src.name] ([src.ckey]) with [sting_name] sting[!DNA ? "." : ", and took [DNA.real_name] appearance."]" - log_attack("[src.name] ([src.ckey]) stung [T.name] ([T.ckey]) with [sting_name] sting[!DNA ? "." : ", giving him [DNA.real_name] appearance."]" ) - /mob/living/carbon/proc/set_sting(A, icon, dna=null) //setting the sting and ui icon for it src << "We prepare our sting, use alt+click on target to sting them." src.mind.changeling.chosen_sting = A @@ -585,7 +580,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_trasnform, "sting_transform", D) /mob/living/carbon/proc/sting_effect_trasnform(mob/living/carbon/T) - add_sting_logs(T, "transformation", src.mind.changeling.chosen_dna) + add_logs(src, T, "stinged", "transformation sting", "new identity is [src.mind.changeling.chosen_dna.real_name]") if(!sting_can_reach(T, 40)) return 0 if((HUSK in T.mutations) || !check_dna_integrity(T)) @@ -607,7 +602,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_extract, "sting_extract") /mob/living/carbon/proc/sting_effect_extract(mob/living/carbon/T) - add_sting_logs(T, "extracting") + add_logs(src, T, "stinged", "extraction sting") if(!sting_can_reach(T, 25)) return 0 if(src.mind.changeling.can_absorb_dna(T, usr)) @@ -626,7 +621,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_mute, "sting_mute") /mob/living/carbon/proc/sting_effect_mute(mob/living/carbon/T) - add_sting_logs(T, "mute") + add_logs(src, T, "stinged", "mute sting") if(!sting_can_reach(T, 20)) return 0 T.silent += 30 @@ -641,7 +636,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_blind, "sting_blind") /mob/living/carbon/proc/sting_effect_blind(mob/living/carbon/T) - add_sting_logs(T, "blind") + add_logs(src, T, "stinged", "blind sting") if(!sting_can_reach(T, 25)) return 0 T << "Your eyes burn horrifically!" @@ -659,7 +654,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_lsd, "sting_lsd") /mob/living/carbon/proc/sting_effect_lsd(mob/living/carbon/T) - add_sting_logs(T, "LSD") + add_logs(src, T, "stinged", "LSD sting") if(!sting_can_reach(T, 5)) return 0 spawn(rand(300,600)) @@ -675,7 +670,7 @@ var/list/datum/dna/hivemind_bank = list() set_sting(/mob/living/carbon/proc/sting_effect_cryo, "sting_cryo") /mob/living/carbon/proc/sting_effect_cryo(mob/living/carbon/T) - add_sting_logs(T, "cryo") + add_logs(src, T, "stinged", "cryo sting") if(!sting_can_reach(T, 15)) return 0 if(T.reagents) diff --git a/code/modules/mob/living/carbon/human/human_attackhand.dm b/code/modules/mob/living/carbon/human/human_attackhand.dm index 859da7eab32..940ce1091c4 100644 --- a/code/modules/mob/living/carbon/human/human_attackhand.dm +++ b/code/modules/mob/living/carbon/human/human_attackhand.dm @@ -3,7 +3,7 @@ return if((M != src) && check_shields(0, M.name)) - add_logs(M, src, "attenmped to touch") + add_logs(M, src, "attempted to touch") visible_message("[M] attempted to touch [src]!") return 0 @@ -11,7 +11,8 @@ if("help") if(health >= 0) help_shake_act(M) - add_logs(M, src, "shaked") + if(src != M) + add_logs(M, src, "shaked") return 1 //CPR @@ -36,10 +37,11 @@ src << "You feel a breath of fresh air enter your lungs. It feels good." if("grab") - add_logs(M, src, "grabbed", addition="passively") - if(M == src || anchored) return 0 + + add_logs(M, src, "grabbed", addition="passively") + if(w_uniform) w_uniform.add_fingerprint(M)