Skip to content

Commit

Permalink
[MIRROR] Fixes Summon Simian spell killing you as a monkey (#1104)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
2 people authored and StealsThePRs committed Feb 23, 2024
1 parent 2834330 commit 1eb3054
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 1 deletion.
1 change: 0 additions & 1 deletion code/modules/mob/living/carbon/human/monkey.dm
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down

0 comments on commit 1eb3054

Please sign in to comment.