Merge branch 'master' into Fixes-Integration-Tests

code/modules/mob/living/carbon/human/_species.dm

@@ -116,7 +116,7 @@ GLOBAL_LIST_EMPTY(features_by_species)
 	///multiplier for stun durations
 	var/stunmod = 1
 	///multiplier for money paid at payday
-	var/payday_modifier = 1
+	var/payday_modifier = 0.75 // BUBBER DUMB SHIT REMOVAL
 	///Base electrocution coefficient.  Basically a multiplier for damage from electrocutions.
 	var/siemens_coeff = 1
 	///To use MUTCOLOR with a fixed color that's independent of the mcolor feature in DNA.

code/modules/mob/living/carbon/human/species_types/humans.dm

@@ -8,7 +8,7 @@
 	mutant_bodyparts = list("wings" = "None")
 	skinned_type = /obj/item/stack/sheet/animalhide/human
 	changesource_flags = MIRROR_BADMIN | WABBAJACK | MIRROR_MAGIC | MIRROR_PRIDE | ERT_SPAWN | RACE_SWAP | SLIME_EXTRACT
-	payday_modifier = 1
+//	payday_modifier = 1 // BUBBER DUMB SHIT REMOVAL
 
 /datum/species/human/prepare_human_for_preview(mob/living/carbon/human/human)
 	human.set_haircolor("#bb9966", update = FALSE) // brown

code/modules/mob/living/carbon/human/species_types/monkeys.dm

@@ -37,7 +37,7 @@
 	dust_anim = "dust-m"
 	gib_anim = "gibbed-m"
 
-	payday_modifier = 1.5
+//	payday_modifier = 1.5  BUBBER DUMB SHIT REMOVAL
 	ai_controlled_species = TRUE
 
 

html/changelogs/AutoChangeLog-pr-375.yml

@@ -0,0 +1,4 @@
+author: "nevimer"
+delete-after: True
+changes:
+  - balance: "soft removed the payday modifier"

html/changelogs/AutoChangeLog-pr-379.yml

@@ -0,0 +1,4 @@
+author: "Icarus-The-Sun"
+delete-after: True
+changes:
+  - qol: "Returns hemophage mutant Colors"

modular_skyrat/modules/customization/modules/mob/living/carbon/human/species/hemophage.dm

@@ -72,7 +72,7 @@
 		TRAIT_CAN_USE_FLIGHT_POTION,
 		TRAIT_LITERATE,
 		TRAIT_DRINKS_BLOOD,
-		TRAIT_USES_SKINTONES,
+		TRAIT_MUTANT_COLORS,
 	)
 	inherent_biotypes = MOB_HUMANOID | MOB_ORGANIC
 	default_mutant_bodyparts = list(