Merge branch 'Bubberstation:master' into master

SPLURT-Station · Jul 23, 2024 · 5d6c627 · 5d6c627
2 parents 7a2984a + 07a088f
commit 5d6c627
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 3 deletions.
diff --git a/html/changelogs/AutoChangeLog-pr-1684.yml 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."
diff --git a/html/changelogs/AutoChangeLog-pr-1795.yml 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"
diff --git 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
@@ -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)
 
 

diff --git 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)