Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

More attack logs for choking and fence/window slamming #6809

Merged
merged 1 commit into from
Aug 5, 2024
Merged

More attack logs for choking and fence/window slamming #6809

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions code/game/objects/structures/fence.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,10 @@
M.apply_damage(20)
health -= 50

M.attack_log += text("\[[time_stamp()]\] <font color='orange'>was slammed against [src] by [key_name(user)]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>slammed [key_name(M)] against [src]</font>")
msg_admin_attack("[key_name(user)] slammed [key_name(M)] against [src] at [get_area_name(M)]", M.loc.x, M.loc.y, M.loc.z)

healthcheck(1, 1, M) //The person thrown into the window literally shattered it
return

Expand Down
4 changes: 4 additions & 0 deletions code/game/objects/structures/window.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -247,6 +247,10 @@
if(!not_damageable) //Impossible to destroy
health -= 50

M.attack_log += text("\[[time_stamp()]\] <font color='orange'>was slammed against [src] by [key_name(user)]</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>slammed [key_name(M)] against [src]</font>")
msg_admin_attack("[key_name(user)] slammed [key_name(M)] against [src] at [get_area_name(M)]", M.loc.x, M.loc.y, M.loc.z)

healthcheck(1, 1, 1, M) //The person thrown into the window literally shattered it
return

Expand Down
4 changes: 4 additions & 0 deletions code/modules/mob/living/carbon/human/life/handle_grabbed.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,7 @@
if(pulledby.grab_level >= GRAB_CHOKE)
apply_damage(3, OXY)
apply_stamina_damage(5)

log_attack("[key_name(pulledby)] choked [key_name(src)] at [get_area_name(src)]")
attack_log += text("\[[time_stamp()]\] <font color='orange'>was choked by [key_name(pulledby)]</font>")
pulledby.attack_log += text("\[[time_stamp()]\] <font color='red'>choked [key_name(src)]</font>")
3 changes: 2 additions & 1 deletion code/modules/mob/mob_grab.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,9 @@

/obj/item/grab/proc/progress_aggressive(mob/living/carbon/human/user, mob/living/victim)
user.grab_level = GRAB_CHOKE
playsound(src.loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7)
playsound(loc, 'sound/weapons/thudswoosh.ogg', 25, 1, 7)
user.visible_message(SPAN_WARNING("[user] holds [victim] by the neck and starts choking them!"), null, null, 5)
msg_admin_attack("[key_name(user)] started to choke [key_name(victim)] at [get_area_name(victim)]", victim.loc.x, victim.loc.y, victim.loc.z)
victim.Move(user.loc, get_dir(victim.loc, user.loc))
victim.update_transform(TRUE)

Expand Down
Loading