From 61df175fea9c2ed7b5ac37457fa47d0982c0e089 Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Sat, 4 Feb 2023 02:11:33 +0100 Subject: [PATCH] [MIRROR] Removes friendly fire from space dragon [MDB IGNORE] (#18998) Removes friendly fire from space dragon (#72990) ## About The Pull Request Space dragon fire breath no longer oneshots allied space carps, now it doesn't damage them at all. Carps that aren't dragon minions are unaffected. Closes https://github.com/tgstation/tgstation/issues/72985 ## Why It's Good For The Game It is fun to play as a dragon's carp minion, but it is very hard to normally work in a team with the dragon due to the fact that dragon's fire breath oneshots you. This PR makes playing as a dragon's carp more sane and allows carps to actually defend the carp rifts as they should, while not being instakilled by their master. ## Changelog :cl: balance: Space dragon fire breath no longer damages allied space carps /:cl: --------- Co-authored-by: SuperSlayer <91609255+SuperSlayer0@users.noreply.github.com> Co-authored-by: ShizCalev Co-authored-by: MrMelbert <51863163+MrMelbert@users.noreply.github.com> --- code/modules/mob/living/simple_animal/hostile/space_dragon.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm index 510acb9371a..b00ca3f85f0 100644 --- a/code/modules/mob/living/simple_animal/hostile/space_dragon.dm +++ b/code/modules/mob/living/simple_animal/hostile/space_dragon.dm @@ -306,6 +306,8 @@ for(var/mob/living/L in T.contents) if(L in hit_list) continue + if(L.mind?.has_antag_datum(/datum/antagonist/space_carp)) + continue hit_list += L L.adjustFireLoss(30) to_chat(L, span_userdanger("You're hit by [src]'s fire breath!"))