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

Fix logging for tabling and disposal shoving (#76017)

Browse Source 
## About The Pull Request
fixes #69837  
## Why It's Good For The Game
accurate combat logs
## Changelog
🆑
admin: fix combat logs for tabling and disposal shoving
/🆑
This commit is contained in:
Couls
2023-06-14 00:09:48 -06:00
committed by GitHub
parent bc38acb206
commit fe8670f62c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/structures/tables_racks.dm
+1 -1
View File
@@ -324,7 +324,7 @@
span_userdanger("You're shoved onto \the [src] by [shover.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src)
to_chat(shover, span_danger("You shove [target.name] onto \the [src]!"))
target.throw_at(src, 1, 1, null, FALSE) //1 speed throws with no spin are basically just forcemoves with a hard collision check
log_combat(src, target, "shoved", "onto [src] (table)")
log_combat(shover, target, "shoved", "onto [src] (table)")
return COMSIG_CARBON_SHOVE_HANDLED
/obj/structure/table/greyscale
code/modules/recycling/disposal/bin.dm
+1 -1
View File
@@ -560,7 +560,7 @@
target.visible_message(span_danger("[shover.name] shoves [target.name] into \the [src]!"),
span_userdanger("You're shoved into \the [src] by [target.name]!"), span_hear("You hear aggressive shuffling followed by a loud thud!"), COMBAT_MESSAGE_RANGE, src)
to_chat(src, span_danger("You shove [target.name] into \the [src]!"))
log_combat(src, target, "shoved", "into [src] (disposal bin)")
log_combat(shover, target, "shoved", "into [src] (disposal bin)")
return COMSIG_CARBON_SHOVE_HANDLED
///Called when a push broom is trying to sweep items onto the turf this object is standing on. Garbage will be moved inside.