cyberpresidentvanellope/CHOMPstation
1
0
Fork 0
mirror of https://github.com/CHOMPstation/CHOMPstation.git synced 2026-07-20 19:42:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

VS: Consistent logging changes to match polaris commit

Browse Source
This commit is contained in:
Arokha Sieyes
2018-03-10 15:52:33 -05:00
parent 2c9bdf3ae4
commit 46f4022852
9 changed files with 25 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/carbon/human/species/station/station_special_abilities_vr.dm
+5 -15
View File
@@ -437,9 +437,7 @@
C.absorbing_prey = 0
to_chat(C, "<span class='notice'>You have completely drained [T], causing them to pass out.</span>")
to_chat(T, "<span class='danger'>You feel weak, as if you have no control over your body whatsoever as [C] finishes draining you.!</span>")
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was drained by [key_name(C)]</font>")
C.attack_log += text("\[[time_stamp()]\] <font color='orange'> Drained [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was completely drained of all nutrition by [key_name(C)]")
add_attack_logs(C,T,"Succubus drained")
return
if(!do_mob(src, T, 50) || G.state != GRAB_NECK) //One drain tick every 5 seconds.
@@ -516,9 +514,7 @@
absorbing_prey = 0
to_chat(src, "<span class='notice'>You have completely drained [T], killing them.</span>")
to_chat(T, "<span class='danger'size='5'>You feel... So... Weak...</span>")
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was drained by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Drained [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was completely drained of all nutrition by [key_name(src)]")
add_attack_logs(src,T,"Succubus drained (almost lethal)")
return
if(drain_finalized == 1 || T.getBrainLoss() < 55) //Let's not kill them with this unless the drain is finalized. This will still stack up to 55, since 60 is lethal.
T.adjustBrainLoss(5) //Will kill them after a short bit!
@@ -533,9 +529,7 @@
to_chat(src, "<span class='notice'>You have completely drained [T], killing them in the process.</span>")
to_chat(T, "<span class='danger'><font size='7'>You... Feel... So... Weak...</font></span>")
visible_message("<span class='danger'>[src] seems to finish whatever they were doing to [T].</span>")
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was drained by [key_name(src)]</font>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'> Drained [key_name(T)]</font>")
msg_admin_attack("[key_name(T)] was completely drained of all nutrition by [key_name(src)]")
add_attack_logs(src,T,"Succubus drained (lethal)")
return
if(!do_mob(src, T, 50) || G.state != GRAB_NECK) //One drain tick every 5 seconds.
@@ -595,9 +589,7 @@
C.absorbing_prey = 0
to_chat(C, "<span class='danger'>You have completely fed [T] every part of your body!</span>")
to_chat(T, "<span class='notice'>You feel quite strong and well fed, as [C] finishes feeding \himself to you!</span>")
T.attack_log += text("\[[time_stamp()]\] <font color='red'>Was fed via slime feed by [key_name(C)]</font>")
C.attack_log += text("\[[time_stamp()]\] <font color='orange'> Fed via slime feed [key_name(T)]</font>")
msg_admin_attack("[key_name(C)] fed [key_name(T)] via slime feed, resulting in them being eaten!")
add_attack_logs(C,T,"Slime fed")
C.feed_grabbed_to_self_falling_nom(T,C) //Reused this proc instead of making a new one to cut down on code usage.
return
@@ -740,9 +732,7 @@
T.apply_damage(25, BRUTE, T_ext)
visible_message("<span class='danger'>[src] severely damages [T]'s [T_ext.name]!</span>")
src.attack_log += text("\[[time_stamp()]\] <font color='orange'>Shred_limb'd [T.real_name] ([T.ckey])</font>")
T.attack_log += text("\[[time_stamp()]\] <font color='red'>[src.real_name] ([src.ckey]) shred_limb'd me</font>")
msg_admin_attack("[src.real_name] ([src.ckey]) shredded (shred_limb) [T.real_name] ([T.ckey]) (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
add_attack_logs(src,T,"Shredded (hardvore)")
/mob/living/proc/flying_toggle()
set name = "Toggle Flight"
code/modules/mob/say_vr.dm
+1 -2
View File
@@ -36,13 +36,12 @@
input = message
if(input)
log_subtle(message,src)
message = "<B>[src]</B> <I>[input]</I>"
else
return
if (message)
log_subtle("[name]/[key] : [message]")
var/list/vis = get_mobs_and_objs_in_view_fast(get_turf(src),1,2) //Turf, Range, and type 2 is emote
var/list/vis_mobs = vis["mobs"]
var/list/vis_objs = vis["objs"]
code/modules/nifsoft/software/13_soulcatcher.dm
+4 -3
View File
@@ -77,7 +77,6 @@
proc/say_into(var/message, var/mob/living/sender, var/mob/eyeobj)
var/sender_name = eyeobj ? eyeobj.name : sender.name
log_nsay("[sender_name]/[sender.key] : [message]",nif.human)
//AR Projecting
if(eyeobj)
@@ -85,15 +84,15 @@
//Not AR Projecting
else
log_nsay("[sender_name]/[sender.key] : [message]",nif.human)
to_chat(nif.human,"<b>\[\icon[nif.big_icon]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"")
for(var/brainmob in brainmobs)
var/mob/living/carbon/brain/caught_soul/CS = brainmob
to_chat(CS,"<b>\[\icon[nif.big_icon]NIF\]</b> <b>[sender_name]</b> speaks, \"[message]\"")
log_nsay(message,nif.human.real_name,src)
proc/emote_into(var/message, var/mob/living/sender, var/mob/eyeobj)
var/sender_name = eyeobj ? eyeobj.name : sender.name
log_nme("[sender_name]/[sender.key] : [message]",nif.human)
//AR Projecting
if(eyeobj)
@@ -106,6 +105,8 @@
var/mob/living/carbon/brain/caught_soul/CS = brainmob
to_chat(CS,"<b>\[\icon[nif.big_icon]NIF\]</b> <b>[sender_name]</b> [message]")
log_nme(message,nif.human.real_name,src)
proc/show_settings(var/mob/living/carbon/human/H)
set waitfor = FALSE
var/settings_list = list(
code/modules/vehicles/Securitrain_vr.dm
+1 -1
View File
@@ -183,8 +183,8 @@
var/mob/living/carbon/human/D = load
to_chat(D, "<span class='danger'>You ran over \the [H]!</span>"
visible_message("<span class='danger'>\The [src] ran over \the [H]!</span>")
add_attack_logs(D,H,"Ran over with [src.name]")
attack_log += text("\[[time_stamp()]\] <font color='red'>ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])</font>")
msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
else
attack_log += text("\[[time_stamp()]\] <font color='red'>ran over [H.name] ([H.ckey])</font>")
code/modules/vehicles/rover_vr.dm
+1 -1
View File
@@ -182,8 +182,8 @@
var/mob/living/carbon/human/D = load
to_chat(D, "<span class='danger'>You ran over \the [H]!</span>")
visible_message("<span class='danger'>\The [src] ran over \the [H]!</span>")
add_attack_logs(D,H,"Ran over with [src.name]")
attack_log += text("\[[time_stamp()]\] <font color='red'>ran over [H.name] ([H.ckey]), driven by [D.name] ([D.ckey])</font>")
msg_admin_attack("[D.name] ([D.ckey]) ran over [H.name] ([H.ckey]). (<A HREF='?_src_=holder;adminplayerobservecoodjump=1;X=[src.x];Y=[src.y];Z=[src.z]'>JMP</a>)")
else
attack_log += text("\[[time_stamp()]\] <font color='red'>ran over [H.name] ([H.ckey])</font>")
code/modules/vore/eating/living_vr.dm
+2 -2
View File
@@ -414,9 +414,9 @@
// Inform Admins
if (pred == user)
msg_admin_attack("[key_name(pred)] ate [key_name(prey)]. ([pred ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[pred.x];Y=[pred.y];Z=[pred.z]'>JMP</a>" : "null"])")
add_attack_logs(pred,prey,"Eaten via [belly.name]")
else
msg_admin_attack("[key_name(user)] forced [key_name(pred)] to eat [key_name(prey)]. ([pred ? "<a href='?_src_=holder;adminplayerobservecoodjump=1;X=[pred.x];Y=[pred.y];Z=[pred.z]'>JMP</a>" : "null"])")
add_attack_logs(user,pred,"Forced to eat [key_name(prey)]")
return 1
//
code/modules/vore/resizing/resize_vr.dm
+5 -5
View File
@@ -233,7 +233,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
tmob.resting = 1 //Force them down to the ground.
//Log it for admins (as opposed to walk which logs damage)
admin_attack_log(src, tmob, "Pinned [tmob.name] under foot.", "Was pinned under foot by [src.name].", "Pinned [tmob.name] under foot.")
add_attack_logs(src,tmob,"Pinned underfoot")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -255,7 +255,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
tmob.resting = 1
//Log it for admins (as opposed to run which logs no damage)
admin_attack_log(src, tmob, "Pinned [tmob.name] under foot for [damage] HALLOSS.", "Was pinned under foot by [src.name] for [damage] HALLOSS.", "Pinned [tmob.name] under foot for [damage] HALLOSS.")
add_attack_logs(src,tmob,"Pinned underfoot (+HALLOSS)")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -306,7 +306,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
for(var/obj/item/organ/external/I in Ht.organs)
I.take_damage(calculated_damage, 0) // 5 damage min, 26.25 damage max, depending on size & RNG. If they're only stepped on once, the damage will (probably not...) heal over time.
Ht.drip(0.1)
admin_attack_log(src, Ht, "crushed [Ht] under foot for [calculated_damage * 11] damage.", "Was crushed under foot by [Ht] for [calculated_damage * 11] damage.", "Crushed [Ht] for [damage * 10] damage.")
add_attack_logs(src,tmob,"Crushed underfoot")
//Walking on I_HURT
else
@@ -318,7 +318,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
for(var/obj/item/organ/I in Ht.organs)
I.take_damage(calculated_damage, 0)
Ht.drip(3)
admin_attack_log(src, Ht, "Crushed [Ht] under foot for [calculated_damage * 11] damage.", "Was crushed under foot by [Ht] for [calculated_damage * 11] damage.", "Crushed [Ht] for [calculated_damage * 11] damage.")
add_attack_logs(src,tmob,"Crushed underfoot")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -347,7 +347,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
forceMove(tmob.loc)
//Log it for admins (still a mechanical attack due to the pin)
admin_attack_log(src, tmob, "Pinned (grab w/ shoes) [tmob.name] under foot.", "Was pinned (grab w/ shoes) under foot by [src.name].", "Pinned (grab w/ shoes) [tmob.name] under foot.")
add_attack_logs(src,tmob,"Pinned (grab w/ shoes) underfoot")
//Not a human, or not a taur while wearing shoes = no grab
if(!H || (!isTaurTail(H.tail_style) && H.shoes))