cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-08-21 19:19:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3282 from VOREStation/aro-MORElogs

Browse Source 
More logs
This commit is contained in:
Aronai Sieyes
2018-03-18 14:06:33 -04:00
committed by GitHub
parent dc0e7bb9fb ce4a5340b7
commit deac68004d
3 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/mob/living/say.dm
+2
View File
@@ -366,6 +366,8 @@ proc/get_radio_key_from_channel(var/channel)
qdel(I)
//Log the message to file
if(message_mode)
message = "([message_mode == "headset" ? "Common" : capitalize(message_mode)]) [message]" //Adds radio keys used if available
if(whispering)
log_whisper(message,src)
else
code/modules/vore/resizing/resize_vr.dm
+8 -7
View File
@@ -234,7 +234,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)
add_attack_logs(src,tmob,"Pinned underfoot")
add_attack_logs(src,tmob,"Pinned underfoot (run, no halloss)")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -256,7 +256,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)
add_attack_logs(src,tmob,"Pinned underfoot (+HALLOSS)")
add_attack_logs(src,tmob,"Pinned underfoot (walk, about [damage] halloss)")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -307,7 +307,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)
add_attack_logs(src,tmob,"Crushed underfoot")
add_attack_logs(src,tmob,"Crushed underfoot (run, about [calculated_damage] damage)")
//Walking on I_HURT
else
@@ -319,7 +319,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)
add_attack_logs(src,tmob,"Crushed underfoot")
add_attack_logs(src,tmob,"Crushed underfoot (walk, about [calculated_damage] damage)")
//Not a human, or not a taur, generic message only
if(!H || !isTaurTail(H.tail_style))
@@ -347,25 +347,25 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
tmob.resting = 1
forceMove(tmob.loc)
//Log it for admins (still a mechanical attack due to the pin)
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))
to_chat(src,"You step down onto [tmob], squishing them and forcing them down to the ground!")
to_chat(tmob,"[src] steps down and squishes you with their foot, forcing you down to the ground!")
add_attack_logs(src,tmob,"Grabbed underfoot (nontaur, shoes)")
//Human, not a taur, but not wearing shoes = yes grab
else if(H && (!isTaurTail(H.tail_style) && !H.shoes))
to_chat(src,"You pin [tmob] down onto the floor with your foot and curl your toes up around their body, trapping them inbetween them!")
to_chat(tmob,"[src] pins you down to the floor with their foot and curls their toes up around your body, trapping you inbetween them!")
equip_to_slot_if_possible(tmob.get_scooped(H), slot_shoes, 0, 1)
add_attack_logs(src,tmob,"Grabbed underfoot (nontaur, no shoes)")
//Human, taur, shoes = no grab, special message
else if(H.shoes)
var/datum/sprite_accessory/tail/taur/tail = H.tail_style
to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_grab_fail))
to_chat(tmob,STEP_TEXT_PREY(tail.msg_prey_grab_fail))
add_attack_logs(src,tmob,"Grabbed underfoot (taur, shoes)")
//Human, taur, no shoes = yes grab, special message
else
@@ -373,6 +373,7 @@ var/const/RESIZE_A_SMALLTINY = (RESIZE_SMALL + RESIZE_TINY) / 2
to_chat(src,STEP_TEXT_OWNER(tail.msg_owner_grab_success))
to_chat(tmob,STEP_TEXT_PREY(tail.msg_prey_grab_success))
equip_to_slot_if_possible(tmob.get_scooped(H), slot_shoes, 0, 1)
add_attack_logs(src,tmob,"Grabbed underfoot (taur, no shoes)")
//Return true, the sizediff was enough that we handled it.
return TRUE