From 7ebb9f5776d141406744d4bd03e8e721f702d232 Mon Sep 17 00:00:00 2001
From: Kingsley-95 <dttmspam@gmail.com>
Date: Mon, 16 Jun 2025 18:40:28 -0500
Subject: [PATCH] Bugfix for dragonblood (#3903)

<!-- Write **BELOW** The Headers and **ABOVE** The comments else it may
not be viewable. -->
<!-- You can view Contributing.MD for a detailed description of the pull
request process. -->

## About The Pull Request
Right now, dragons blood will make people invisible if a 1 is rolled due
to how features is overwritten instead of just adding to the existing
list for the mob. Also.. seems those parts are tracked elsewhere?
Removed the list overwrite and have it updating mutant parts now
<!-- Describe The Pull Request. Please be sure every change is
documented or this can delay review and even discourage maintainers from
merging your PR! -->

<!-- Please make sure to actually test your PRs. If you have not tested
your PR mention it. -->

## Why It's Good For The Game
Bug fixes are cool, being fully invisible is silly
<!-- Argue for the merits of your changes and how they benefit the game,
especially if they are controversial and/or far reaching. If you can't
actually explain WHY what you are doing will improve the game, then it
probably isn't good for the game in the first place. -->

## Proof Of Testing

![image](https://github.com/user-attachments/assets/05fbffd2-615a-4610-a0ef-d4bfcdb11e52)

<!-- Compile and run your code locally. Make sure it works. This is the
place to show off your changes! We are not responsible for testing your
features. -->
<details>
<summary>Screenshots/Videos</summary>

</details>

## Changelog
:cl:
fix: dragons blood now has chance of turning into lizard person rather
than fully invisible
/:cl:
<!-- If your PR modifies aspects of the game that can be concretely
observed by players or admins you should add a changelog. If your change
does NOT meet this description, remove this section. Be sure to properly
mark your PRs to prevent unnecessary GBP loss. You can read up on GBP
and its effects on PRs in the tgstation guides for contributors. Please
note that maintainers freely reserve the right to remove and add tags
should they deem it appropriate. You can attempt to finagle the system
all you want, but it's best to shoot for clear communication right off
the bat. -->




<!-- Both :cl:'s are required for the changelog to work! You can put
your name to the right of the first :cl: if you want to overwrite your
GitHub username as author ingame. -->
<!-- You can use multiple of the same prefix (they're only used for the
icon ingame) and delete the unneeded ones. Despite some of the tags,
changelogs should generally represent how a player might be affected by
the changes rather than a summary of the PR's contents. -->

<!-- By opening a pull request. You have read and understood the
repository rules located on the main README.md on this project. -->

---------

Co-authored-by: The Sharkening <95130227+StrangeWeirdKitten@users.noreply.github.com>
---
 .../mining_loot/megafauna/ash_drake.dm        | 58 +++++++++++++++----
 1 file changed, 46 insertions(+), 12 deletions(-)

diff --git a/code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm b/code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
index 2e5812f10de..cd4d355cb2f 100644
--- a/code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
+++ b/code/modules/mining/lavaland/mining_loot/megafauna/ash_drake.dm
@@ -170,19 +170,53 @@
 	switch(random)
 		if(1)
 			to_chat(user, span_danger("Your appearance morphs to that of a very small humanoid ash dragon! You get to look like a freak without the cool abilities."))
-			consumer.dna.features = list(
-				"mcolor" = "#A02720",
-				"tail_lizard" = "Dark Tiger",
-				"tail_human" = "None",
-				"snout" = "Sharp",
-				"horns" = "Curled",
-				"ears" = "None",
-				"wings" = "None",
-				"frills" = "None",
-				"spines" = "Long",
-				"lizard_markings" = "Dark Tiger Body",
-				"legs" = DIGITIGRADE_LEGS,
+
+			// BUBBER EDIT CHANGE BEGIN 
+			// consumer.dna.features = list(
+			// 	"mcolor" = "#A02720",
+			// 	"tail_lizard" = "Dark Tiger",
+			// 	"tail_human" = "None",
+			// 	"snout" = "Sharp",
+			// 	"horns" = "Curled",
+			// 	"ears" = "None",
+			// 	"wings" = "None",
+			// 	"frills" = "None",
+			// 	"spines" = "Long",
+			// 	"lizard_markings" = "Dark Tiger Body",
+			// 	"legs" = DIGITIGRADE_LEGS,
+			consumer.dna.features["mcolor"] = "#A02720"
+			consumer.dna.mutant_bodyparts["tail"] = list(
+				"name" = "Dark Tiger",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
 			)
+			consumer.dna.mutant_bodyparts["snout"] = list(
+				"name" = "Sharp",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+			consumer.dna.mutant_bodyparts["horns"] = list(
+				"name" = "Curled",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+			consumer.dna.mutant_bodyparts["ears"] = list(
+				"name" = "None",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+			consumer.dna.mutant_bodyparts["wings"] = list(
+				"name" = "None",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+			consumer.dna.mutant_bodyparts["frills"] = list(
+				"name" = "None",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+			consumer.dna.mutant_bodyparts["spines"] = list(
+				"name" = "Long",
+				"color" = list(1 = "#A02720", 2 = "#A02720", 3 = "#A02720")
+			)
+
+			consumer.dna.features["legs"] = DIGITIGRADE_LEGS
+			//BUBBER EDIT CHANGE END
+
 			consumer.set_eye_color("#FEE5A3")
 			consumer.set_species(/datum/species/lizard)
 		if(2)