From a169fcc1d984c39ab4fa89da9b9a28a02eac437c Mon Sep 17 00:00:00 2001 From: SkyratBot <59378654+SkyratBot@users.noreply.github.com> Date: Fri, 23 Feb 2024 05:33:04 +0100 Subject: [PATCH] [MIRROR] Fixes Summon Simian spell killing you as a monkey (#26610) * Fixes Summon Simian spell killing you as a monkey (#81619) ## About The Pull Request The old logic worked like this: It checked for monkey faction (good), however, monkey faction is given to roundstart monkey human subtypes (bad) instead of using the inherent_factions variable on the species. ## Why It's Good For The Game A spell advertised as not backfiring if you're a monkey should probably not backfire if you're a monkey ## Changelog :cl: fix: The Summon Simians spell will now properly check for monkey faction, allowing people who are monkeys to not be mauled. /:cl: * Fixes Summon Simian spell killing you as a monkey --------- Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com> --- code/modules/mob/living/carbon/human/monkey.dm | 1 - code/modules/mob/living/carbon/human/species_types/monkeys.dm | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/mob/living/carbon/human/monkey.dm b/code/modules/mob/living/carbon/human/monkey.dm index d11e4f5208b..7a2e7bb7474 100644 --- a/code/modules/mob/living/carbon/human/monkey.dm +++ b/code/modules/mob/living/carbon/human/monkey.dm @@ -2,7 +2,6 @@ icon_state = "monkey" //for mapping race = /datum/species/monkey ai_controller = /datum/ai_controller/monkey - faction = list(FACTION_NEUTRAL, FACTION_MONKEY) /mob/living/carbon/human/species/monkey/Initialize(mapload, cubespawned = FALSE, mob/spawner) if (cubespawned) diff --git a/code/modules/mob/living/carbon/human/species_types/monkeys.dm b/code/modules/mob/living/carbon/human/species_types/monkeys.dm index b67f3efb3ef..4de716fe953 100644 --- a/code/modules/mob/living/carbon/human/species_types/monkeys.dm +++ b/code/modules/mob/living/carbon/human/species_types/monkeys.dm @@ -22,6 +22,7 @@ ) no_equip_flags = ITEM_SLOT_OCLOTHING | ITEM_SLOT_GLOVES | ITEM_SLOT_FEET | ITEM_SLOT_SUITSTORE changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_PRIDE | MIRROR_MAGIC | ERT_SPAWN | SLIME_EXTRACT + inherent_factions = list(FACTION_MONKEY) sexes = FALSE species_language_holder = /datum/language_holder/monkey