Merge branch 'Bubberstation:master' into master

SPLURT-Station · Sep 4, 2024 · d99c43d · d99c43d
2 parents 8612b98 + e81bab3
commit d99c43d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/code/modules/mob/living/carbon/human/species_types/zombies.dm b/code/modules/mob/living/carbon/human/species_types/zombies.dm
@@ -2,7 +2,7 @@
 	// 1spooky
 	name = "High-Functioning Zombie"
 	id = SPECIES_ZOMBIE
-	sexes = FALSE
+	sexes = TRUE //BUBBER EDIT - WHY THE HELL WAS THIS SET TO FALSE???
 	meat = /obj/item/food/meat/slab/human/mutant/zombie
 	mutanttongue = /obj/item/organ/internal/tongue/zombie
 	inherent_traits = list(

diff --git a/html/changelogs/AutoChangeLog-pr-2038.yml b/html/changelogs/AutoChangeLog-pr-2038.yml
@@ -0,0 +1,4 @@
+author: "plsleavemealon"
+delete-after: True
+changes:
+  - bugfix: "lets zombies be gendered"
diff --git a/html/changelogs/AutoChangeLog-pr-2049.yml b/html/changelogs/AutoChangeLog-pr-2049.yml
@@ -0,0 +1,4 @@
+author: "StrangeWeirdKitten"
+delete-after: True
+changes:
+  - qol: "Divides Jukebox volume by 2"
diff --git a/modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm b/modular_skyrat/modules/jukebox/code/jukebox_subsystem.dm
@@ -35,7 +35,7 @@ SUBSYSTEM_DEF(jukeboxes)
 		if(!(M.client.prefs.read_preference(/datum/preference/toggle/sound_instruments)))
 			continue
 
-		M.playsound_local(M, null, jukebox.volume, channel = youvegotafreejukebox[2], sound_to_use = song_to_init)
+		M.playsound_local(M, null, (jukebox.volume / 2), channel = youvegotafreejukebox[2], sound_to_use = song_to_init) // BUBBER EDIT - Halves the volume
 	return activejukeboxes.len
 
 /datum/controller/subsystem/jukeboxes/proc/removejukebox(IDtoremove)