cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-10 09:42:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

[NO GBP] fish infusion and other mutant feature fixes (#92161)

Browse Source 
## About The Pull Request

fixes #92156

<img width="72" height="74" alt="image"
src="https://github.com/user-attachments/assets/607384a8-b0d1-4cdf-ac42-fdf071df1789"
/>

## Why It's Good For The Game

Fix bug

## Changelog

🆑
fix: Fish tails now correctly show up
fix: Mutant colors and other features now apply correctly in some cases
where they previously didn't
/🆑
This commit is contained in:
Waterpig
2025-07-15 19:59:23 +02:00
committed by GitHub
parent 4cb9ca9d54
commit 9197e23f98
6 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/__DEFINES/DNA.dm
View File

@@ -59,7 +59,7 @@
#define FEATURE_EARS "ears"
#define FEATURE_TAIL "tail_cat"
#define FEATURE_TAIL_LIZARD "tail_lizard"
#define FEATURE_TAIL_FISH "tail_fish"
#define FEATURE_TAIL_FISH "fish_tail"
#define FEATURE_SNOUT "snout"
#define FEATURE_LIZARD_MARKINGS "marking_lizard"
#define FEATURE_HORNS "horns"

2
code/datums/dna/dna.dm
View File

@@ -275,7 +275,7 @@ GLOBAL_LIST_INIT(total_uf_len_by_block, populate_total_uf_len_by_block())
CRASH("UF block type is null")
if(!ishuman(holder))
CRASH("Non-human mobs shouldn't have DNA")
var/datum/dna_block/feature/block = GLOB.dna_identity_blocks[blocktype]
var/datum/dna_block/feature/block = GLOB.dna_feature_blocks[blocktype]
unique_features = block.modified_hash(unique_features, block.unique_block(holder))
/**

2
code/game/machinery/dna_infuser/organ_sets/fish_organs.dm
View File

@@ -290,7 +290,7 @@
//This isn't tied to any species, but I kinda want it to be mutable instead of having a fixed sprite accessory.
if(imprint_on_next_insertion && !receiver.dna.features[FEATURE_TAIL_FISH])
receiver.dna.features[FEATURE_TAIL_FISH] = pick(SSaccessories.tails_list_fish)
receiver.dna.update_uf_block(FEATURE_TAIL_FISH)
receiver.dna.update_uf_block(/datum/dna_block/feature/tail_fish)
return ..()

2
code/game/objects/structures/mirror.dm
View File

@@ -207,7 +207,7 @@ MAPPING_DIRECTIONAL_HELPERS(/obj/structure/mirror/broken, 28)
if(mutant_hsv[3] >= 50) // mutantcolors must be bright
race_changer.dna.features[FEATURE_MUTANT_COLOR] = sanitize_hexcolor(new_mutantcolor)
race_changer.dna.update_uf_block(FEATURE_MUTANT_COLOR)
race_changer.dna.update_uf_block(/datum/dna_block/feature/mutant_color)
else
to_chat(race_changer, span_notice("Invalid color. Your color is not bright enough."))
return TRUE

2
code/modules/mob/living/carbon/human/species_types/jellypeople.dm
View File

@@ -305,7 +305,7 @@
spare.underwear = "Nude"
H.dna.copy_dna(spare.dna, COPY_DNA_SE|COPY_DNA_SPECIES|COPY_DNA_MUTATIONS)
spare.dna.features[FEATURE_MUTANT_COLOR] = "#[pick("7F", "FF")][pick("7F", "FF")][pick("7F", "FF")]"
spare.dna.update_uf_block(FEATURE_MUTANT_COLOR)
spare.dna.update_uf_block(/datum/dna_block/feature/mutant_color)
spare.real_name = spare.dna.real_name
spare.name = spare.dna.real_name
spare.updateappearance(mutcolor_update=1)

2
code/modules/research/xenobiology/xenobiology.dm
View File

@@ -607,7 +607,7 @@
switch(activation_type)
if(SLIME_ACTIVATE_MINOR)
user.dna.features[FEATURE_MUTANT_COLOR] = "#[pick("7F", "FF")][pick("7F", "FF")][pick("7F", "FF")]"
user.dna.update_uf_block(FEATURE_MUTANT_COLOR)
user.dna.update_uf_block(/datum/dna_block/feature/mutant_color)
user.updateappearance(mutcolor_update=1)
species.update_glow(user)
to_chat(user, span_notice("You feel different..."))