From a24ce2722e7a872ed818766ad3af2550bbca4e11 Mon Sep 17 00:00:00 2001 From: Halonexus Date: Wed, 24 Jan 2024 05:30:40 +0300 Subject: [PATCH] Making shepherd abnormality friendly on r corp map (#1893) --- .../living/simple_animal/abnormality/he/blue_shepherd.dm | 6 +++++- .../mob/living/simple_animal/abnormality/he/red_buddy.dm | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm b/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm index 0807cf62a2b2..67aa5781248c 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/blue_shepherd.dm @@ -66,6 +66,7 @@ var/list/people_list = list() //list of people shepperd can mention var/buddy_hit = FALSE var/red_hit = FALSE // Controls Little Red Riding Hooded Mercenary's ability to be "hit" by slash attacks + var/combat_map = FALSE //lines said during combat var/list/combat_lines = list( "Have at you!", @@ -126,6 +127,9 @@ /mob/living/simple_animal/hostile/abnormality/blue_shepherd/Initialize() . = ..() + if(IsCombatMap()) + combat_map = TRUE + faction |= "hostile" RegisterSignal(SSdcs, COMSIG_GLOB_MOB_DEATH, .proc/OnMobDeath) // Alright, here we go again RegisterSignal(SSdcs, COMSIG_GLOB_CREWMEMBER_JOINED, .proc/OnNewCrew) //makes a list of people and abno to shit talk @@ -290,7 +294,7 @@ if(stat == DEAD) return new /obj/effect/temp_visual/smash_effect(T) - for(var/mob/living/L in HurtInTurf(T, list(), slash_damage, BLACK_DAMAGE, hurt_mechs = TRUE, hurt_structure = TRUE, break_not_destroy = TRUE)) + for(var/mob/living/L in HurtInTurf(T, list(), slash_damage, BLACK_DAMAGE, check_faction = combat_map, hurt_mechs = TRUE, hurt_structure = TRUE, break_not_destroy = TRUE)) if(L == awakened_buddy && !buddy_hit) buddy_hit = TRUE //sometimes buddy get hit twice so we check if it got hit in this slash awakened_buddy.adjustHealth(700) //it would take approximatively 9 slashes to take buddy down diff --git a/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm b/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm index e209a5605f4e..6391a4a8aad1 100644 --- a/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm +++ b/code/modules/mob/living/simple_animal/abnormality/he/red_buddy.dm @@ -72,6 +72,8 @@ /mob/living/simple_animal/hostile/abnormality/red_buddy/Initialize() . = ..() + if(IsCombatMap()) + faction |= "hostile" if(LAZYLEN(SSlobotomy_corp.all_abnormality_datums)) for(var/datum/abnormality/A in SSlobotomy_corp.all_abnormality_datums) if(A.name == "Blue Smocked Shepherd")