Merge pull request #2651 from Anewbe/sting_log

Ling stings and absorb are logged
This commit is contained in:
Anewbe
2016-11-08 19:28:09 -06:00
committed by GitHub
14 changed files with 53 additions and 1 deletions

View File

@@ -53,6 +53,9 @@
src << "<span class='notice'>We stab [T] with the proboscis.</span>" src << "<span class='notice'>We stab [T] with the proboscis.</span>"
src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>") src.visible_message("<span class='danger'>[src] stabs [T] with the proboscis!</span>")
T << "<span class='danger'>You feel a sharp stabbing pain!</span>" T << "<span class='danger'>You feel a sharp stabbing pain!</span>"
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was absorbed by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Absorbed [key_name(T)]</font>")
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) var/obj/item/organ/external/affecting = T.get_organ(src.zone_sel.selecting)
if(affecting.take_damage(39,0,1,0,"large organic needle")) if(affecting.take_damage(39,0,1,0,"large organic needle"))
T:UpdateDamageIcon() T:UpdateDamageIcon()

View File

@@ -2,7 +2,7 @@
name = "Blind Sting" name = "Blind Sting"
desc = "We silently sting a human, completely blinding them for a short time." desc = "We silently sting a human, completely blinding them for a short time."
enhancedtext = "Duration is extended." enhancedtext = "Duration is extended."
ability_icon_state = " ling_sting_blind" ability_icon_state = "ling_sting_blind"
genomecost = 2 genomecost = 2
allowduringlesserform = 1 allowduringlesserform = 1
verbpath = /mob/proc/changeling_blind_sting verbpath = /mob/proc/changeling_blind_sting
@@ -15,6 +15,9 @@
var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_blind_sting) var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_blind_sting)
if(!T) if(!T)
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was blind stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used blind sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was blind stung by [key_name(src)]")
T << "<span class='danger'>Your eyes burn horrificly!</span>" T << "<span class='danger'>Your eyes burn horrificly!</span>"
T.disabilities |= NEARSIGHTED T.disabilities |= NEARSIGHTED
var/duration = 300 var/duration = 300

View File

@@ -16,6 +16,9 @@
var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_cryo_sting) var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_cryo_sting)
if(!T) if(!T)
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was cryo stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used cryo sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was cryo stung by [key_name(src)]")
var/inject_amount = 10 var/inject_amount = 10
if(src.mind.changeling.recursive_enhancement) if(src.mind.changeling.recursive_enhancement)
inject_amount = inject_amount * 1.5 inject_amount = inject_amount * 1.5

View File

@@ -15,6 +15,9 @@
var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_deaf_sting) var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_deaf_sting)
if(!T) return 0 if(!T) return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was deaf stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used deaf sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was deaf stung by [key_name(src)]")
var/duration = 300 var/duration = 300
if(src.mind.changeling.recursive_enhancement) if(src.mind.changeling.recursive_enhancement)
duration = duration + 100 duration = duration + 100

View File

@@ -13,6 +13,9 @@
var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_DEATHsting) var/mob/living/carbon/T = changeling_sting(40,/mob/proc/changeling_DEATHsting)
if(!T) if(!T)
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was death stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used death sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was death stung by [key_name(src)]")
T << "<span class='danger'>You feel a small prick and your chest becomes tight.</span>" T << "<span class='danger'>You feel a small prick and your chest becomes tight.</span>"
T.silent = 10 T.silent = 10
T.Paralyse(10) T.Paralyse(10)

View File

@@ -16,6 +16,9 @@
var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_delayed_toxic_sting) var/mob/living/carbon/T = changeling_sting(20,/mob/proc/changeling_delayed_toxic_sting)
if(!T) if(!T)
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was delayed toxic stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used delayed toxic sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was delayed toxic stung by [key_name(src)]")
var/i = rand(20,30) var/i = rand(20,30)
if(src.mind.changeling.recursive_enhancement) if(src.mind.changeling.recursive_enhancement)
i = i * 2 i = i * 2

View File

@@ -19,6 +19,11 @@
if(ishuman(T)) if(ishuman(T))
var/mob/living/carbon/human/H = T var/mob/living/carbon/human/H = T
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was enfeebling stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used enfeebling sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was enfeebling stung by [key_name(src)]")
var/effect = 30 //percent var/effect = 30 //percent
if(src.mind.changeling.recursive_enhancement) if(src.mind.changeling.recursive_enhancement)
effect = effect + 20 effect = effect + 20

View File

@@ -35,6 +35,10 @@
src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>" src << "<span class='warning'>This creature's DNA is ruined beyond useability!</span>"
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Had DNA extracted via sting by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used DNA extraction sting on [key_name(T)]</font>")
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) var/datum/absorbed_dna/newDNA = new(T.real_name, T.dna, T.species.name, T.languages)
absorbDNA(newDNA) absorbDNA(newDNA)

View File

@@ -13,6 +13,9 @@
var/mob/living/carbon/T = changeling_sting(15,/mob/proc/changeling_lsdsting) var/mob/living/carbon/T = changeling_sting(15,/mob/proc/changeling_lsdsting)
if(!T) return 0 if(!T) return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was hallucination stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used hallucination sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was hallucination stung by [key_name(src)]")
spawn(rand(300,600)) spawn(rand(300,600))
if(T) T.hallucination += 400 if(T) T.hallucination += 400
feedback_add_details("changeling_powers","HS") feedback_add_details("changeling_powers","HS")

View File

@@ -12,6 +12,9 @@
var/mob/living/carbon/T = changeling_sting(30,/mob/proc/changeling_paralysis_sting) var/mob/living/carbon/T = changeling_sting(30,/mob/proc/changeling_paralysis_sting)
if(!T) if(!T)
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was paralysis stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used paralysis sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was paralysis stung by [key_name(src)]")
T << "<span class='danger'>Your muscles begin to painfully tighten.</span>" T << "<span class='danger'>Your muscles begin to painfully tighten.</span>"
T.Weaken(20) T.Weaken(20)
feedback_add_details("changeling_powers","PS") feedback_add_details("changeling_powers","PS")

View File

@@ -41,6 +41,10 @@
range = range * 2 range = range * 2
src << "<span class='notice'>We are extra loud.</span>" src << "<span class='notice'>We are extra loud.</span>"
src.attack_log += text("\[[time_stamp()]\] <font color='red'>Used Resonant Shriek.</font>")
message_admins("[key_name(src)] used Resonant Shriek ([src.x],[src.y],[src.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>).")
log_game("[key_name(src)] used Resonant Shriek.")
for(var/mob/living/M in range(range, src)) for(var/mob/living/M in range(range, src))
if(iscarbon(M)) if(iscarbon(M))
if(!M.mind || !M.mind.changeling) if(!M.mind || !M.mind.changeling)
@@ -51,6 +55,7 @@
M.adjustEarDamage(0,30) M.adjustEarDamage(0,30)
M.confused += 20 M.confused += 20
M << sound('sound/effects/screech.ogg') M << sound('sound/effects/screech.ogg')
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Was affected by [key_name(src)]'s Resonant Shriek.</font>")
else else
if(M != src) if(M != src)
M << "<span class='notice'>You hear a familiar screech from nearby. It has no effect on you.</span>" M << "<span class='notice'>You hear a familiar screech from nearby. It has no effect on you.</span>"
@@ -60,6 +65,7 @@
M << sound('sound/weapons/flash.ogg') M << sound('sound/weapons/flash.ogg')
M << "<span class='notice'>Auditory input overloaded. Reinitializing...</span>" M << "<span class='notice'>Auditory input overloaded. Reinitializing...</span>"
M.Weaken(rand(5,10)) M.Weaken(rand(5,10))
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Was affected by [key_name(src)]'s Resonant Shriek.</font>")
for(var/obj/machinery/light/L in range(range, src)) for(var/obj/machinery/light/L in range(range, src))
L.on = 1 L.on = 1
@@ -97,6 +103,10 @@
src << "<span class='notice'>We are extra loud.</span>" src << "<span class='notice'>We are extra loud.</span>"
src.mind.changeling.recursive_enhancement = 0 src.mind.changeling.recursive_enhancement = 0
src.attack_log += text("\[[time_stamp()]\] <font color='red'>Used Dissonant Shriek.</font>")
message_admins("[key_name(src)] used Dissonant Shriek ([src.x],[src.y],[src.z]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>).")
log_game("[key_name(src)] used Dissonant Shriek.")
for(var/obj/machinery/light/L in range(5, src)) for(var/obj/machinery/light/L in range(5, src))
L.on = 1 L.on = 1
L.broken() L.broken()

View File

@@ -15,6 +15,9 @@
var/mob/living/carbon/T = changeling_sting(10,/mob/proc/changeling_silence_sting) var/mob/living/carbon/T = changeling_sting(10,/mob/proc/changeling_silence_sting)
if(!T) return 0 if(!T) return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was silence stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used silence sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was silence stung by [key_name(src)]")
var/duration = 30 var/duration = 30
if(src.mind.changeling.recursive_enhancement) if(src.mind.changeling.recursive_enhancement)
duration = duration + 10 duration = duration + 10

View File

@@ -36,6 +36,9 @@
if((HUSK in T.mutations) || (!ishuman(T) && !issmall(T))) if((HUSK in T.mutations) || (!ishuman(T) && !issmall(T)))
src << "<span class='warning'>Our sting appears ineffective against its DNA.</span>" src << "<span class='warning'>Our sting appears ineffective against its DNA.</span>"
return 0 return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was transform stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used transform sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was transform stung by [key_name(src)]")
T.visible_message("<span class='warning'>[T] transforms!</span>") T.visible_message("<span class='warning'>[T] transforms!</span>")
T.dna = chosen_dna.Clone() T.dna = chosen_dna.Clone()
T.real_name = chosen_dna.real_name T.real_name = chosen_dna.real_name

View File

@@ -11,6 +11,9 @@
var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_unfat_sting) var/mob/living/carbon/T = changeling_sting(5,/mob/proc/changeling_unfat_sting)
if(!T) return 0 if(!T) return 0
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was unfat stung by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Used unfat sting on [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was unfat stung by [key_name(src)]")
T << "<span class='danger'>you feel a small prick as stomach churns violently and you become to feel skinnier.</span>" T << "<span class='danger'>you feel a small prick as stomach churns violently and you become to feel skinnier.</span>"
T.overeatduration = 0 T.overeatduration = 0
T.nutrition -= 100 T.nutrition -= 100