Набор маленьких фиксов (BlueMoon-Labs#832)

* fix: удалены солнцезащитные авиаторы из лодаута и вендоров, совместимость трейтов, восстановительный метаболизм пофикшен * Update goodies.dm --------- Co-authored-by: Марк <[email protected]>
Kush1Push1 · Mar 21, 2024 · 9c59b12 · 9c59b12
1 parent 6436439
commit 9c59b12
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 10 deletions.
diff --git a/code/controllers/subsystem/processing/quirks.dm b/code/controllers/subsystem/processing/quirks.dm
@@ -33,6 +33,8 @@ PROCESSING_SUBSYSTEM_DEF(quirks)
 						  list("Святой Дух","Проклятая Кровь"),
 						  list("Святой Дух","Отпрыск Кровопийцы"),
 						  list("Жаждущий","Отпрыск Кровопийцы"),
+						  list("Жаждущий","Инкуб"),
+						  list("Жаждущий","Суккуб"),
 						  list("Булки Грома","Стальные Булки")
 						  )
 		//BLUEMOON ADD END

diff --git a/code/datums/traits/good.dm b/code/datums/traits/good.dm
@@ -218,7 +218,7 @@
 
 /datum/quirk/bloodpressure/add()
 	quirk_holder.blood_ratio = 1.2
-	quirk_holder.blood_volume += 150
+	quirk_holder.blood_volume += BLOOD_VOLUME_NORMAL * (quirk_holder.blood_ratio - 1)
 
 /datum/quirk/bloodpressure/remove()
 	if(quirk_holder)

diff --git a/code/modules/cargo/packs/goodies.dm b/code/modules/cargo/packs/goodies.dm
@@ -18,7 +18,7 @@
 
 /datum/supply_pack/goody/sunglasses_single
 	name = "Sunglasses Single-Pack"
-	desc = "Стильные очки, что защитят вас от вас от палящих лучшей слонца и флешеров СБ"
+	desc = "Стильные очки, что защитят вас от палящих лучей Солнца и флешеров."
 	cost = 500
 	contains = list(/obj/item/clothing/glasses/sunglasses)
 

diff --git a/code/modules/mob/living/blood.dm b/code/modules/mob/living/blood.dm
@@ -51,7 +51,7 @@
 			if(HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM))
 				blood_volume = min(BLOOD_VOLUME_NORMAL, blood_volume)
 			// BLUEMOON ADD END
-			else if(blood_volume < BLOOD_VOLUME_NORMAL) // BLUEMOON EDIT - в начале добавлено else
+			else if(blood_volume < BLOOD_VOLUME_NORMAL * blood_ratio) // BLUEMOON EDIT - в начале добавлено else
 				var/nutrition_ratio = 0
 				if(!HAS_TRAIT(src, TRAIT_NOHUNGER))
 					switch(nutrition)
@@ -68,7 +68,7 @@
 					if(satiety > 80)
 						nutrition_ratio *= 1.25
 					adjust_nutrition(-nutrition_ratio * HUNGER_FACTOR)
-					blood_volume = min(BLOOD_VOLUME_NORMAL, blood_volume + 0.5 * nutrition_ratio)
+					blood_volume = min(BLOOD_VOLUME_NORMAL * blood_ratio, blood_volume + 0.5 * nutrition_ratio * blood_ratio)
 				var/thirst_ratio = 0
 				if(!HAS_TRAIT(src, TRAIT_NOTHIRST))
 					switch(thirst)
@@ -83,7 +83,7 @@
 						else
 							thirst_ratio = 1
 					adjust_thirst(-thirst_ratio * THIRST_FACTOR)
-					blood_volume = min(BLOOD_VOLUME_NORMAL, blood_volume + 0.5 * thirst_ratio)
+					blood_volume = min(BLOOD_VOLUME_NORMAL * blood_ratio, blood_volume + 0.5 * thirst_ratio * blood_ratio)
 
 			//Effects of bloodloss
 			if(!HAS_TRAIT(src, TRAIT_ROBOTIC_ORGANISM))	//Synths are immune to direct consequences of bloodloss, instead suffering penalties to heat exchange.

diff --git a/modular_splurt/code/modules/client/loadout/glasses.dm b/modular_splurt/code/modules/client/loadout/glasses.dm
@@ -33,9 +33,9 @@
 	path = /obj/item/clothing/glasses/hud/blueshield/aviators/prescription
 	restricted_roles = list("Blueshield")
 
-/datum/gear/glasses/aviators
-	name = "Aviators"
-	path = /obj/item/clothing/glasses/aviators
+// /datum/gear/glasses/aviators убираем очередную защиту от флешек
+// 	name = "Aviators"
+// 	path = /obj/item/clothing/glasses/aviators
 
 /datum/gear/glasses/blueshield/holo
 	name = "Holo Blueshield HUD Glasses"
@@ -57,7 +57,7 @@
 	path = /obj/item/clothing/glasses/hud/security/sunglasses/holo/prescription
 	restricted_roles = list("Security Officer", "Warden", "Head of Security")
 
-//NON-RESTRICTED 
+//NON-RESTRICTED
 
 /datum/gear/glasses/contact
 	name = "Contact Lenses"

diff --git a/modular_splurt/code/modules/vending/clothesmate.dm b/modular_splurt/code/modules/vending/clothesmate.dm
@@ -3,7 +3,7 @@
 		/obj/item/clothing/suit/assu_suit = 16,
 		/obj/item/clothing/head/assu_helmet = 16,
 		/obj/item/clothing/head/hoodcowl = 4,
-		/obj/item/clothing/glasses/aviators = 10,
+		///obj/item/clothing/glasses/aviators = 10, удаляем защиту от флешек (опять)
 		/obj/item/clothing/suit/toggle/rp_jacket = 3,
 		/obj/item/clothing/suit/toggle/rp_jacket/orange = 3,
 		/obj/item/clothing/suit/toggle/rp_jacket/purple = 3,