Merge pull request #3317 from Citadel-Station-13/upstream-merge-31500

[MIRROR] sleeping carp grabs now put out a message
2017-10-12 07:18:27 -04:00
parent d82459ae45 5a2423d7f1
commit 3ad9f5dc1e
1 changed files with 2 additions and 0 deletions
@@ -112,6 +112,8 @@
 			D.stop_pulling()
 			if(A.a_intent == INTENT_GRAB)
 				add_logs(A, D, "grabbed", addition="aggressively")
+				D.visible_message("<span class='warning'>[A] violently grabs [D]!</span>", \
+				  "<span class='userdanger'>[A] violently grabs you!</span>")
 				A.grab_state = GRAB_AGGRESSIVE //Instant aggressive grab
 			else
 				add_logs(A, D, "grabbed", addition="passively")