From 6ca741f3653850b21d9bed1079bcaaa96e0d444f Mon Sep 17 00:00:00 2001 From: Casper3667 Date: Wed, 7 Jul 2021 03:28:37 +0200 Subject: [PATCH] Changes aggressive grab text size (#12125) Co-authored-by: TheGreyWolf --- code/modules/mob/mob_grab.dm | 6 +++--- html/changelogs/GrabChange.yml | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 html/changelogs/GrabChange.yml diff --git a/code/modules/mob/mob_grab.dm b/code/modules/mob/mob_grab.dm index c0a3fada1ed..866bc2af492 100644 --- a/code/modules/mob/mob_grab.dm +++ b/code/modules/mob/mob_grab.dm @@ -272,9 +272,9 @@ if(!allow_upgrade) return if(!affecting.lying) - assailant.visible_message(SPAN_WARNING("[assailant] grabs [affecting] aggressively by the hands!"), SPAN_WARNING("You grab [affecting] aggressively by the hands!")) + assailant.visible_message(SPAN_DANGER("[assailant] grabs [affecting] aggressively by the hands!"), SPAN_DANGER("You grab [affecting] aggressively by the hands!")) else - assailant.visible_message(SPAN_WARNING("[assailant] pins [affecting] down to the ground by the hands!"), SPAN_WARNING("You pin [affecting] down to the ground by the hands!")) + assailant.visible_message(SPAN_DANGER("[assailant] pins [affecting] down to the ground by the hands!"), SPAN_DANGER("You pin [affecting] down to the ground by the hands!")) apply_pinning(affecting, assailant) state = GRAB_AGGRESSIVE @@ -285,7 +285,7 @@ assailant.visible_message(SPAN_WARNING("[assailant] tries to squeeze [affecting], but [assailant.get_pronoun("his")] hands sink right through!"), SPAN_WARNING("You try to squeeze [affecting], but your hands sink right through!")) return playsound(loc, /decl/sound_category/grab_sound, 50, FALSE, -1) - assailant.visible_message(SPAN_WARNING("[assailant] reinforces [assailant.get_pronoun("his")] grip on [affecting]'s neck!"), SPAN_WARNING("You reinforce your grip on [affecting]'s neck!")) + assailant.visible_message(SPAN_DANGER("[assailant] reinforces [assailant.get_pronoun("his")] grip on [affecting]'s neck!"), SPAN_DANGER("You reinforce your grip on [affecting]'s neck!")) state = GRAB_NECK icon_state = "grabbed+1" affecting.attack_log += "\[[time_stamp()]\] Has had their neck grabbed by [assailant.name] ([assailant.ckey])" diff --git a/html/changelogs/GrabChange.yml b/html/changelogs/GrabChange.yml new file mode 100644 index 00000000000..1b2f19117a5 --- /dev/null +++ b/html/changelogs/GrabChange.yml @@ -0,0 +1,6 @@ +author: TheGreyWolf + +delete-after: True + +changes: + - tweak: "Grabbing someone aggressively, neck grabs and forcing someone to the ground now uses the same text type as attacking someone."