From 9bd56416f8e4c54038132c0cf3e0b163aa26fb7c Mon Sep 17 00:00:00 2001 From: oranges Date: Thu, 12 Oct 2017 11:09:48 +1300 Subject: [PATCH 1/2] Merge pull request #31500 from Armhulen/patch-7 sleeping carp grabs now put out a message --- code/datums/martial/sleeping_carp.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/martial/sleeping_carp.dm b/code/datums/martial/sleeping_carp.dm index 8fe8fcd366..ed46910148 100644 --- a/code/datums/martial/sleeping_carp.dm +++ b/code/datums/martial/sleeping_carp.dm @@ -112,6 +112,8 @@ D.stop_pulling() if(A.a_intent == INTENT_GRAB) add_logs(A, D, "grabbed", addition="aggressively") + D.visible_message("[A] violently grabs [D]!", \ + "[A] violently grabs you!") A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab else add_logs(A, D, "grabbed", addition="passively")