From 2dd605cd6f2361eb6ead7963ae31c23f8e7e652e Mon Sep 17 00:00:00 2001
From: Arturlang <24881678+Arturlang@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:59:21 +0300
Subject: [PATCH 1/4] Nerfs bloodsucker blood gain from the blood reagent
 (#1684)

## About The Pull Request
Bloodsuckers can only reach up to 560 blood using the blood reagent,
bloodsuckers above level 4 will get further 30% less blood from each
sip, and be disgusted as well.

## Why It's Good For The Game
Nobody likes bloodsuckers bypassing the blood drinking mechanics by
simply eating 50u duplicated blood pills. If this solution is not too
great, a alternative could be to make duplicated blood simply unusable
for bloodsuckers, but I think this is alright compromise

## Proof Of Testing
went ingame, tested if it worked.

## Changelog

:cl:
balance: Bloodsuckers can only reach 560 max blood via drinking blood
bags or the blood reagent, and bloodsuckers above level 4 will get 30%
less blood and be disgusted by it.
/:cl:

---------

Co-authored-by: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
Co-authored-by: Waterpig <49160555+Majkl-J@users.noreply.github.com>
---
 .../antagonists/bloodsucker/bloodsuckers/integration.dm  | 9 +++++++--
 .../code/modules/antagonists/bloodsucker/clans/clan.dm   | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm
index e50e1d3cbcec3..b5ab59e326faf 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/bloodsuckers/integration.dm
@@ -8,10 +8,15 @@
 	var/datum/antagonist/bloodsucker/bloodsuckerdatum = IS_BLOODSUCKER(exposed_mob)
 	if(!bloodsuckerdatum)
 		return ..()
+	if(!(methods & (INJECT|INGEST)))
+		return ..()
 
-	if(istype(bloodsuckerdatum.my_clan, /datum/bloodsucker_clan/ventrue) && bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_SAFE)
+	if(bloodsuckerdatum.my_clan && istype(bloodsuckerdatum.my_clan, /datum/bloodsucker_clan/ventrue) && bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_SAFE)
 		return ..()
-	if(bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_MAXIMUM)
+	if(bloodsuckerdatum.GetRank() >= BLOODSUCKER_HIGH_LEVEL)
+		exposed_mob.adjust_disgust(5 SECONDS, DISGUST_LEVEL_GROSS)
+		reac_volume = reac_volume * 0.3
+	if(bloodsuckerdatum.GetBloodVolume() >= BLOOD_VOLUME_NORMAL)
 		return ..()
 	bloodsuckerdatum.AdjustBloodVolume(round(reac_volume, 0.1))
 
diff --git a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm
index 454318b242fce..04f0616e10c7d 100644
--- a/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm
+++ b/modular_zubbers/code/modules/antagonists/bloodsucker/clans/clan.dm
@@ -211,7 +211,7 @@
 
 	// Ranked up enough to get your true Reputation?
 	if(bloodsuckerdatum.GetRank() == BLOODSUCKER_HIGH_LEVEL)
-		to_chat(bloodsuckerdatum.owner.current, span_warning("Drinking from mindless humans is now much more less effective."))
+		to_chat(bloodsuckerdatum.owner.current, span_warning("Drinking from mindless humans and blood bags is now much more less effective."))
 		bloodsuckerdatum.SelectReputation(am_fledgling = FALSE, forced = TRUE)
 
 

From feac87decaa8df57759dbabeb408440e7e86b593 Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:00:05 +0200
Subject: [PATCH 2/4] Automatic changelog for PR #1684 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1684.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1684.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1684.yml b/html/changelogs/AutoChangeLog-pr-1684.yml
new file mode 100644
index 0000000000000..fc8df6021b837
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1684.yml
@@ -0,0 +1,4 @@
+author: "Arturlang"
+delete-after: True
+changes:
+  - balance: "Bloodsuckers can only reach 560 max blood via drinking blood bags or the blood reagent, and bloodsuckers above level 4 will get 30% less blood and be disgusted by it."
\ No newline at end of file

From c373c12b061a75e1db0ff905b5e90a16d533e1b7 Mon Sep 17 00:00:00 2001
From: nikothedude <59709059+nikothedude@users.noreply.github.com>
Date: Tue, 23 Jul 2024 08:30:54 -0400
Subject: [PATCH 3/4] You can now milk mothroaches for moth milk (#1795)

<!-- 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

Title.

<!-- 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

I stared into the abyss, and it stared back.

For real though, theres no in-lore source of moth milk. To avoid the
unholy suggestion (oily and salty? oh god), we should probably put it on
an animal to avoid thinking we're marketing moth... _stuff_

<!-- 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

<!-- 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. -->

## Changelog

<!-- 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 it's 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. -->

:cl:
add: Mothroaches can now be milked for moth milk
/:cl:

<!-- 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: projectkepler-RU <99981766+projectkepler-ru@users.noreply.github.com>
---
 modular_zubbers/code/modules/reagents/drink_reagents.dm | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/modular_zubbers/code/modules/reagents/drink_reagents.dm b/modular_zubbers/code/modules/reagents/drink_reagents.dm
index 0b21c250b4c60..94b556fe55076 100644
--- a/modular_zubbers/code/modules/reagents/drink_reagents.dm
+++ b/modular_zubbers/code/modules/reagents/drink_reagents.dm
@@ -11,3 +11,9 @@
 	if(!ismoth(M))
 		M.adjust_disgust(10 * REM * delta_time,DISGUST_LEVEL_DISGUSTED)
 		return UPDATE_MOB_HEALTH
+
+
+/mob/living/basic/mothroach/Initialize(mapload)
+	. = ..()
+
+	AddComponent(/datum/component/udder, reagent_produced_override = /datum/reagent/consumable/moth_milk)

From 07a088fe83f3774ec200a6f91de38b221e43dabb Mon Sep 17 00:00:00 2001
From: Bubberbot <151680451+Bubberbot@users.noreply.github.com>
Date: Tue, 23 Jul 2024 14:45:08 +0200
Subject: [PATCH 4/4] Automatic changelog for PR #1795 [ci skip]

---
 html/changelogs/AutoChangeLog-pr-1795.yml | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 html/changelogs/AutoChangeLog-pr-1795.yml

diff --git a/html/changelogs/AutoChangeLog-pr-1795.yml b/html/changelogs/AutoChangeLog-pr-1795.yml
new file mode 100644
index 0000000000000..5b815d817f1d2
--- /dev/null
+++ b/html/changelogs/AutoChangeLog-pr-1795.yml
@@ -0,0 +1,4 @@
+author: "nikothedude"
+delete-after: True
+changes:
+  - rscadd: "Mothroaches can now be milked for moth milk"
\ No newline at end of file