mirror of
https://github.com/Bubberstation/Bubberstation.git
synced 2026-08-30 00:29:02 +01:00
[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 🆑 fix: The Summon Simians spell will now properly check for monkey faction, allowing people who are monkeys to not be mauled. /🆑 * Fixes Summon Simian spell killing you as a monkey --------- Co-authored-by: SgtHunk <68669754+SgtHunk@users.noreply.github.com>
This commit is contained in:
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in New Issue
Block a user