From 2290823ace31c53373f2cf52e593e0b39a540d42 Mon Sep 17 00:00:00 2001 From: Timothy Teakettle <59849408+timothyteakettle@users.noreply.github.com> Date: Thu, 23 Jul 2020 14:40:36 +0100 Subject: [PATCH] fixes hat removal --- code/modules/mob/living/simple_animal/bot/secbot.dm | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/bot/secbot.dm b/code/modules/mob/living/simple_animal/bot/secbot.dm index e0d65b13da..351bf10d7d 100644 --- a/code/modules/mob/living/simple_animal/bot/secbot.dm +++ b/code/modules/mob/living/simple_animal/bot/secbot.dm @@ -227,9 +227,12 @@ Auto Patrol: []"}, if(special_retaliate_after_attack(H)) return if(H.a_intent == INTENT_HELP && bot_accessory) + to_chat(H, "You knock [bot_accessory] off of [src]'s head!") bot_accessory.forceMove(get_turf(src)) - //reset all emotes/sounds + //reset all emotes/sounds and name/desc + name = initial(name) + desc = initial(desc) death_emote = initial(death_emote) capture_one = initial(capture_one) capture_two = initial(capture_two) @@ -240,8 +243,11 @@ Auto Patrol: []"}, arrest_texts = initial(arrest_texts) arrest_emote = initial(arrest_emote) patrol_emote = initial(patrol_emote) + arrest_texts = initial(arrest_texts) + arrest_emote = initial(arrest_emote) bot_accessory = null qdel(stored_fashion) + regenerate_icons() return return ..()