From 0a8a7b61914cd076c0dd986d631d9397282f7828 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Sun, 16 Oct 2016 20:40:25 -0500 Subject: [PATCH 1/2] Ling stings and absorb are logged --- code/game/gamemodes/changeling/powers/absorb.dm | 3 +++ code/game/gamemodes/changeling/powers/blind_sting.dm | 5 ++++- code/game/gamemodes/changeling/powers/cryo_sting.dm | 3 +++ code/game/gamemodes/changeling/powers/deaf_sting.dm | 3 +++ code/game/gamemodes/changeling/powers/death_sting.dm | 3 +++ .../changeling/powers/delayed_toxin_sting.dm | 3 +++ .../gamemodes/changeling/powers/enfeebling_string.dm | 5 +++++ .../gamemodes/changeling/powers/extract_dna_sting.dm | 4 ++++ code/game/gamemodes/changeling/powers/lsd_sting.dm | 3 +++ code/game/gamemodes/changeling/powers/para_sting.dm | 3 +++ code/game/gamemodes/changeling/powers/shriek.dm | 12 +++++++++++- .../gamemodes/changeling/powers/silence_sting.dm | 3 +++ .../gamemodes/changeling/powers/transform_sting.dm | 3 +++ code/game/gamemodes/changeling/powers/unfat_sting.dm | 3 +++ 14 files changed, 54 insertions(+), 2 deletions(-) diff --git a/code/game/gamemodes/changeling/powers/absorb.dm b/code/game/gamemodes/changeling/powers/absorb.dm index a9219e8746..417fb339e0 100644 --- a/code/game/gamemodes/changeling/powers/absorb.dm +++ b/code/game/gamemodes/changeling/powers/absorb.dm @@ -53,6 +53,9 @@ src << "We stab [T] with the proboscis." src.visible_message("[src] stabs [T] with the proboscis!") T << "You feel a sharp stabbing pain!" + T.attack_log += text("\[[time_stamp()]\] Was absorbed by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Absorbed [key_name(T)]") + msg_admin_attack("[key_name(T)] was absorbed by [key_name(src)]") var/obj/item/organ/external/affecting = T.get_organ(src.zone_sel.selecting) if(affecting.take_damage(39,0,1,0,"large organic needle")) T:UpdateDamageIcon() diff --git a/code/game/gamemodes/changeling/powers/blind_sting.dm b/code/game/gamemodes/changeling/powers/blind_sting.dm index a9f9d2346e..e098c98f03 100644 --- a/code/game/gamemodes/changeling/powers/blind_sting.dm +++ b/code/game/gamemodes/changeling/powers/blind_sting.dm @@ -2,7 +2,7 @@ name = "Blind Sting" desc = "We silently sting a human, completely blinding them for a short time." enhancedtext = "Duration is extended." - ability_icon_state = " ling_sting_blind" + ability_icon_state = "ling_sting_blind" genomecost = 2 allowduringlesserform = 1 verbpath = /mob/proc/changeling_blind_sting @@ -15,6 +15,9 @@ var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_blind_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was blind stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used blind sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was blind stung by [key_name(src)]") T << "Your eyes burn horrificly!" T.disabilities |= NEARSIGHTED var/duration = 300 diff --git a/code/game/gamemodes/changeling/powers/cryo_sting.dm b/code/game/gamemodes/changeling/powers/cryo_sting.dm index 681e46e737..e3e401e2ff 100644 --- a/code/game/gamemodes/changeling/powers/cryo_sting.dm +++ b/code/game/gamemodes/changeling/powers/cryo_sting.dm @@ -16,6 +16,9 @@ var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_cryo_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was cryo stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used cryo sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was cryo stung by [key_name(src)]") var/inject_amount = 10 if(src.mind.changeling.recursive_enhancement) inject_amount = inject_amount * 1.5 diff --git a/code/game/gamemodes/changeling/powers/deaf_sting.dm b/code/game/gamemodes/changeling/powers/deaf_sting.dm index fcf5bfab7d..24c1e5d260 100644 --- a/code/game/gamemodes/changeling/powers/deaf_sting.dm +++ b/code/game/gamemodes/changeling/powers/deaf_sting.dm @@ -15,6 +15,9 @@ var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_deaf_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was deaf stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used deaf sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was deaf stung by [key_name(src)]") var/duration = 300 if(src.mind.changeling.recursive_enhancement) duration = duration + 100 diff --git a/code/game/gamemodes/changeling/powers/death_sting.dm b/code/game/gamemodes/changeling/powers/death_sting.dm index 705c1269a3..52412a4282 100644 --- a/code/game/gamemodes/changeling/powers/death_sting.dm +++ b/code/game/gamemodes/changeling/powers/death_sting.dm @@ -13,6 +13,9 @@ var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_DEATHsting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was death stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used death sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was death stung by [key_name(src)]") T << "You feel a small prick and your chest becomes tight." T.silent = 10 T.Paralyse(10) diff --git a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm index 4a50140003..fd72524e5a 100644 --- a/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm +++ b/code/game/gamemodes/changeling/powers/delayed_toxin_sting.dm @@ -16,6 +16,9 @@ var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_delayed_toxic_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was delayed toxic stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used delayed toxic sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was delayed toxic stung by [key_name(src)]") var/i = rand(20,30) if(src.mind.changeling.recursive_enhancement) i = i * 2 diff --git a/code/game/gamemodes/changeling/powers/enfeebling_string.dm b/code/game/gamemodes/changeling/powers/enfeebling_string.dm index 9584da1e55..5370a68200 100644 --- a/code/game/gamemodes/changeling/powers/enfeebling_string.dm +++ b/code/game/gamemodes/changeling/powers/enfeebling_string.dm @@ -19,6 +19,11 @@ if(ishuman(T)) var/mob/living/carbon/human/H = T + T.attack_log += text("\[[time_stamp()]\] Was enfeebling stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used enfeebling sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was enfeebling stung by [key_name(src)]") + + var/effect = 30 //percent if(src.mind.changeling.recursive_enhancement) effect = effect + 20 diff --git a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm index c4f5aca088..6198e409a6 100644 --- a/code/game/gamemodes/changeling/powers/extract_dna_sting.dm +++ b/code/game/gamemodes/changeling/powers/extract_dna_sting.dm @@ -35,6 +35,10 @@ src << "This creature's DNA is ruined beyond useability!" return 0 + T.attack_log += text("\[[time_stamp()]\] Had DNA extracted via sting by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used DNA extraction sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was DNA extraction stung by [key_name(src)]") + var/datum/absorbed_dna/newDNA = new(T.real_name, T.dna, T.species.name, T.languages) absorbDNA(newDNA) diff --git a/code/game/gamemodes/changeling/powers/lsd_sting.dm b/code/game/gamemodes/changeling/powers/lsd_sting.dm index 275ebf5bad..9adb4acd09 100644 --- a/code/game/gamemodes/changeling/powers/lsd_sting.dm +++ b/code/game/gamemodes/changeling/powers/lsd_sting.dm @@ -13,6 +13,9 @@ var/mob/living/carbon/T = changeling_sting(15,/mob/proc/changeling_lsdsting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was hallucination stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used hallucination sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was hallucination stung by [key_name(src)]") spawn(rand(300,600)) if(T) T.hallucination += 400 feedback_add_details("changeling_powers","HS") diff --git a/code/game/gamemodes/changeling/powers/para_sting.dm b/code/game/gamemodes/changeling/powers/para_sting.dm index 37c31f5d00..efe6fe8f79 100644 --- a/code/game/gamemodes/changeling/powers/para_sting.dm +++ b/code/game/gamemodes/changeling/powers/para_sting.dm @@ -12,6 +12,9 @@ var/mob/living/carbon/T = changeling_sting(30,/mob/proc/changeling_paralysis_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was paralysis stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used paralysis sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was paralysis stung by [key_name(src)]") T << "Your muscles begin to painfully tighten." T.Weaken(20) feedback_add_details("changeling_powers","PS") diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index b9303a3a81..314202caf3 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -41,6 +41,10 @@ range = range * 2 src << "We are extra loud." + src.attack_log += text("\[[time_stamp()]\] Used Resonant Shriek.") + message_admins("[key_name(src)] used Resonant Shriek ([src.x],[src.y],[src.z]) (JMP).") + log_game("[key_name(src)] used Resonant Shriek.") + for(var/mob/living/M in range(range, src)) if(iscarbon(M)) if(!M.mind || !M.mind.changeling) @@ -51,6 +55,7 @@ M.adjustEarDamage(0,30) M.confused += 20 M << sound('sound/effects/screech.ogg') + M.attack_log += text("\[[time_stamp()]\] Was affected by [key_name(src)]'s Resonant Shriek.") else if(M != src) M << "You hear a familiar screech from nearby. It has no effect on you." @@ -60,6 +65,7 @@ M << sound('sound/weapons/flash.ogg') M << "Auditory input overloaded. Reinitializing..." M.Weaken(rand(5,10)) + M.attack_log += text("\[[time_stamp()]\] Was affected by [key_name(src)]'s Resonant Shriek.") for(var/obj/machinery/light/L in range(range, src)) L.on = 1 @@ -97,8 +103,12 @@ src << "We are extra loud." src.mind.changeling.recursive_enhancement = 0 + src.attack_log += text("\[[time_stamp()]\] Used Dissonant Shriek.") + message_admins("[key_name(src)] used Dissonant Shriek ([src.x],[src.y],[src.z]) (JMP).") + log_game("[key_name(src)] used Dissonant Shriek.") + for(var/obj/machinery/light/L in range(5, src)) L.on = 1 L.broken() - empulse(get_turf(src), range_heavy, range_light, 1) + empulse(get_turf(src), range_heavy, range_light, 0) return 1 \ No newline at end of file diff --git a/code/game/gamemodes/changeling/powers/silence_sting.dm b/code/game/gamemodes/changeling/powers/silence_sting.dm index 9ebe8adf7c..1ab25278a4 100644 --- a/code/game/gamemodes/changeling/powers/silence_sting.dm +++ b/code/game/gamemodes/changeling/powers/silence_sting.dm @@ -15,6 +15,9 @@ var/mob/living/carbon/T = changeling_sting(10,/mob/proc/changeling_silence_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was silence stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used silence sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was silence stung by [key_name(src)]") var/duration = 30 if(src.mind.changeling.recursive_enhancement) duration = duration + 10 diff --git a/code/game/gamemodes/changeling/powers/transform_sting.dm b/code/game/gamemodes/changeling/powers/transform_sting.dm index b96b87288a..797eec92d2 100644 --- a/code/game/gamemodes/changeling/powers/transform_sting.dm +++ b/code/game/gamemodes/changeling/powers/transform_sting.dm @@ -36,6 +36,9 @@ if((HUSK in T.mutations) || (!ishuman(T) && !issmall(T))) src << "Our sting appears ineffective against its DNA." return 0 + T.attack_log += text("\[[time_stamp()]\] Was transform stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used transform sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was transform stung by [key_name(src)]") T.visible_message("[T] transforms!") T.dna = chosen_dna.Clone() T.real_name = chosen_dna.real_name diff --git a/code/game/gamemodes/changeling/powers/unfat_sting.dm b/code/game/gamemodes/changeling/powers/unfat_sting.dm index d0248cf94e..4b42f55e30 100644 --- a/code/game/gamemodes/changeling/powers/unfat_sting.dm +++ b/code/game/gamemodes/changeling/powers/unfat_sting.dm @@ -11,6 +11,9 @@ var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_unfat_sting) if(!T) return 0 + T.attack_log += text("\[[time_stamp()]\] Was unfat stung by [key_name(src)]") + src.attack_log += text("\[[time_stamp()]\] Used unfat sting on [key_name(T)]") + msg_admin_attack("[key_name(T)] was unfat stung by [key_name(src)]") T << "you feel a small prick as stomach churns violently and you become to feel skinnier." T.overeatduration = 0 T.nutrition -= 100 From 521a79450b296d6902aa9769d7370f9ab9b49d95 Mon Sep 17 00:00:00 2001 From: Anewbe Date: Mon, 7 Nov 2016 21:40:50 -0600 Subject: [PATCH 2/2] Shriek emp is logged again --- code/game/gamemodes/changeling/powers/shriek.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/gamemodes/changeling/powers/shriek.dm b/code/game/gamemodes/changeling/powers/shriek.dm index 314202caf3..2bfd0bf7d6 100644 --- a/code/game/gamemodes/changeling/powers/shriek.dm +++ b/code/game/gamemodes/changeling/powers/shriek.dm @@ -110,5 +110,5 @@ for(var/obj/machinery/light/L in range(5, src)) L.on = 1 L.broken() - empulse(get_turf(src), range_heavy, range_light, 0) + empulse(get_turf(src), range_heavy, range_light, 1) return 1 \ No newline at end of file