Merge remote-tracking branch 'upstream/master' into nukechickens_forge2

_maps/map_files/SyndicateStation/SyndicateBoxStation.dmm

@@ -2388,6 +2388,7 @@
 /obj/effect/turf_decal/tile/neutral{
 	dir = 1
 	},
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "afL" = (
@@ -3041,6 +3042,7 @@
 	dir = 4
 	},
 /obj/effect/turf_decal/tile/neutral,
+/obj/item/radio/headset/headset_brigdoc,
 /turf/open/floor/mineral/plastitanium/red,
 /area/security/brig)
 "aha" = (
@@ -10822,6 +10824,7 @@
 	dir = 1
 	},
 /obj/effect/turf_decal/stripes/line,
+/obj/machinery/vending/barkbox,
 /turf/open/floor/mineral/plastitanium,
 /area/hallway/secondary/entry)
 "aAI" = (
@@ -15484,13 +15487,13 @@
 /turf/open/floor/mineral/plastitanium/red,
 /area/hallway/secondary/exit)
 "aOe" = (
-/obj/item/beacon,
 /obj/machinery/camera{
 	c_tag = "Arrivals Bay 1 South"
 	},
 /obj/effect/turf_decal/stripes/line{
 	dir = 1
 	},
+/obj/machinery/vending/barkbox,
 /turf/open/floor/mineral/plastitanium,
 /area/hallway/secondary/entry)
 "aOf" = (
@@ -56924,6 +56927,10 @@
 	},
 /turf/open/floor/mineral/plastitanium,
 /area/commons/dorms)
+"lYM" = (
+/obj/item/beacon,
+/turf/open/floor/mineral/plastitanium,
+/area/hallway/secondary/entry)
 "lYR" = (
 /obj/structure/chair/comfy/black{
 	dir = 4
@@ -64880,6 +64887,10 @@
 	},
 /turf/open/floor/plating,
 /area/security/prison/upper)
+"xXf" = (
+/obj/machinery/vending/wallmed,
+/turf/closed/wall/r_wall/syndicate,
+/area/security/brig)
 "xYf" = (
 /obj/machinery/atmospherics/pipe/simple/supply/hidden{
 	dir = 10
@@ -75399,7 +75410,7 @@ aaa
 aaa
 awW
 aOe
-kMc
+lYM
 kMc
 aRY
 awW
@@ -91043,7 +91054,7 @@ afL
 ahu
 aie
 aiO
-aiX
+xXf
 xzv
 agL
 akT

_maps/map_files/TauStation/TauStation.dmm

@@ -15928,6 +15928,10 @@
 	},
 /turf/open/floor/engine,
 /area/engineering/main)
+"fyM" = (
+/obj/machinery/vending/wallmed,
+/turf/closed/wall/r_wall,
+/area/security/brig)
 "fza" = (
 /turf/open/space/basic,
 /area/space)
@@ -18075,8 +18079,8 @@
 /turf/open/floor/plasteel,
 /area/commons/dorms)
 "glJ" = (
-/obj/machinery/vending/coffee,
 /obj/effect/turf_decal/tile/neutral,
+/obj/machinery/vending/barkbox,
 /turf/open/floor/plasteel,
 /area/commons/dorms)
 "glW" = (
@@ -45134,6 +45138,7 @@
 	dir = 8;
 	pixel_y = -6
 	},
+/obj/item/stock_parts/cell/high,
 /turf/open/floor/plasteel/showroomfloor,
 /area/security/brig)
 "pJo" = (
@@ -98381,7 +98386,7 @@ nNA
 pRk
 ygt
 ygt
-ygt
+fyM
 ygt
 ygt
 sni

code/__SPLURTCODE/DEFINES/traits.dm

@@ -17,5 +17,7 @@
 #define TRAIT_PHARMA            "hepatic_pharmacokinesis"
 #define TRAIT_CHOKE_SLUT		"choke_slut"
 
+#define BLOODFLEDGE				"BloodFledge"//splurt change
+
 #define TRAIT_INCUBUS			"Incubus"
 #define TRAIT_SUCCUBUS			"Succubus"

code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -57,7 +57,7 @@
 
 /datum/reagent/blood/on_mob_life(mob/living/carbon/C)	//Because lethals are preferred over stamina. damnifino.
 	var/blood_id = C.get_blood_id()
-	if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW))
+	if((blood_id in GLOB.blood_reagent_types) && !HAS_TRAIT(C, TRAIT_NOMARROW) && !HAS_TRAIT(C, BLOODFLEDGE))
 		if(!data || !(data["blood_type"] in get_safe_blood(C.dna.blood_type)))	//we only care about bloodtype here because this is where the poisoning should be
 			C.adjustToxLoss(rand(2,8)*REAGENTS_EFFECT_MULTIPLIER, TRUE, TRUE)	//forced to ensure people don't use it to gain beneficial toxin as slime person
 	..()

html/changelogs/archive/2022-10.yml

@@ -30,3 +30,22 @@
 2022-10-05:
   BongaTheProto:
   - bugfix: fixes some dogborg guns not actually showing their sprite
+2022-10-07:
+  battlestar-gafraktika:
+  - rscadd: Stress Relief
+2022-10-08:
+  BongaTheProto:
+  - rscadd: Added a bunch of new hairs
+  - rscadd: Added a new snout and a new tail
+  - rscadd: Added a couple of new ears
+  Gr33d-y:
+  - rscadd: Cells, surgery tables and surgery computers to every brig medic area as
+      well as a bark box to every map minus box station for now.
+  Ldip999:
+  - rscadd: Bowlers hat, medical beret, and flowers added to loadout
+2022-10-09:
+  LonoferaRS:
+  - rscadd: Added new Halloween themed job titles
+2022-10-11:
+  Nukechickenu64:
+  - rscadd: Added bloodsucker fledgling quirk

modular_sand/code/modules/mob/living/simple_animal/hostile/mining_mobs/elites/drakeling.dm

@@ -103,7 +103,7 @@
 	ranged_cooldown = world.time + 25
 	visible_message("<span class='boldwarning'>[src] spews lava around themselves! Get back!</span>")
 	for(var/turf/T in oview(1, src))
-		new /obj/effect/temp_visual/lava_warning(T)
+		new /obj/effect/temp_visual/lava_warning/drakeling(T, 40)
 
 /mob/living/simple_animal/hostile/asteroid/elite/drakeling/proc/lava_around()
 	ranged_cooldown = world.time + 50
@@ -146,43 +146,9 @@
 /mob/living/simple_animal/hostile/asteroid/elite/drakeling/proc/lava_wall(dir, range)
 	var/turf/T = get_turf(src)
 	for(var/i in 1 to range)
-		new /obj/effect/temp_visual/lava_warning(T)
+		new /obj/effect/temp_visual/lava_warning/drakeling(T, 40)
 		T = get_step(T, dir)
 		sleep(2)
 
-/obj/effect/temp_visual/lava_warning
-	icon_state = "lavastaff_warn"
-	layer = BELOW_MOB_LAYER
-	light_range = 2
+/obj/effect/temp_visual/lava_warning/drakeling
 	duration = 7
-
-/obj/effect/temp_visual/lava_warning/ex_act()
-	return
-
-/obj/effect/temp_visual/lava_warning/Initialize(mapload, reset_time = 40)
-	. = ..()
-	INVOKE_ASYNC(src, .proc/fall, reset_time)
-	src.alpha = 63.75
-	animate(src, alpha = 255, time = duration)
-
-/obj/effect/temp_visual/lava_warning/proc/fall(var/reset_time)
-	var/turf/T = get_turf(src)
-	playsound(T,'sound/magic/fleshtostone.ogg', 80, TRUE)
-	sleep(duration)
-	playsound(T,'sound/magic/fireball.ogg', 200, TRUE)
-	for(var/mob/living/L in T.contents)
-		if(istype(L, /mob/living/simple_animal/hostile/asteroid/elite/drakeling))
-			continue
-		L.adjustFireLoss(10)
-		to_chat(L, "<span class='userdanger'>You fall directly into the pool of lava!</span>")
-
-	// deals damage to mechs
-	for(var/obj/vehicle/sealed/mecha/M in T.contents)
-		M.take_damage(45, BRUTE, "melee", 1)
-
-	// changes turf to lava temporarily
-	if(!istype(T, /turf/closed) && !istype(T, /turf/open/lava))
-		var/lava_turf = /turf/open/lava/smooth
-		var/reset_turf = T.type
-		T.ChangeTurf(lava_turf, flags = CHANGETURF_INHERIT_AIR)
-		addtimer(CALLBACK(T, /turf.proc/ChangeTurf, reset_turf, null, CHANGETURF_INHERIT_AIR), reset_time, TIMER_OVERRIDE|TIMER_UNIQUE)

modular_splurt/code/datums/traits/neutral.dm

@@ -428,3 +428,221 @@
 	. = ..()
 	var/mob/living/carbon/human/H = quirk_holder
 	H.adjust_nutrition(-0.09)//increases their nutrition loss rate to encourage them to gain a partner they can essentially leech off of
+
+/datum/quirk/vampire//splurt change start
+	name = "Bloodsucker Fledgeling"
+	desc = "you need blood for nutriment, you have fangs to aid with this, the church harms you"
+	value = 0
+	medical_record_text = "this person was partially infected by a bloodsucker"
+	mob_trait = BLOODFLEDGE
+	gain_text = "<span class='notice'>You feel an otherworldly thirst.</span>"
+	lose_text = "<span class='notice'>you feel an otherworldy burden remove itself</span>"
+	processing_quirk = TRUE
+
+/datum/quirk/vampire/add()
+	. = ..()
+	var/mob/living/carbon/human/H = quirk_holder
+	ADD_TRAIT(H,TRAIT_NO_PROCESS_FOOD,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_COLDBLOODED,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_NOBREATH,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_NOTHIRST,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT)//these two make the vampire fast and enables some sexy "bet you didnt think i could do this" romance
+	if(!H.dna.skin_tone_override)
+		H.skin_tone = "albino"
+	var/datum/action/vbite/B = new
+	B.Grant(H)
+
+/datum/quirk/vampire/on_process()
+	. = ..()
+	var/mob/living/carbon/C = quirk_holder
+	var/area/A = get_area(C)
+	if(istype(A, /area/service/chapel) && C.mind?.assigned_role != "Chaplain")
+		C.adjustStaminaLoss(2)
+		C.adjust_nutrition(-0.3)//changed these to be less deadly and more of an inconvinience
+		C.adjust_disgust(1)
+	if(istype(C.loc, /obj/structure/closet/crate/coffin))//heals the vampire if in a coffin, except burn which fire can be considered holy
+		C.heal_overall_damage(4,4)
+		C.adjust_disgust(-7)
+		C.adjustOxyLoss(-4)
+		C.adjustCloneLoss(-4)
+		C.adjustBruteLoss(-0.3)
+		return
+
+/datum/quirk/vampire/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/datum/action/vbite/B = locate() in H.actions
+	REMOVE_TRAIT(H, TRAIT_NO_PROCESS_FOOD, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_COLDBLOODED, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NOBREATH, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NOTHIRST, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT)
+
+	B.Remove(H)
+	. = ..()
+
+/// quirk actions ///
+
+//vampire bite
+
+#define BLOOD_DRAIN_NUM 50
+
+/datum/action/vbite
+	name = "Bite Victim"
+	button_icon_state = "power_feed"
+	icon_icon = 'icons/mob/actions/bloodsucker.dmi'
+	desc = "bite the person you are grabbing with your fangs"
+	var/drain_cooldown = 0
+
+/datum/action/vbite/Trigger()
+	. = ..()
+	if(iscarbon(owner))
+		var/mob/living/carbon/H = owner
+		if(H.nutrition >= 500)
+			to_chat(H, "<span class='notice'>You are too full to drain any more.</span>")
+			return
+		if(drain_cooldown >= world.time)
+			to_chat(H, "<span class='notice'>You just drained blood, wait a few seconds.</span>")
+			return
+		if(!H.pulling || !iscarbon(H.pulling))
+			if(H.getStaminaLoss() >= 80 && H.nutrition > 20)//prevents being stunlocked in the chapel
+				to_chat(H,("<span class='notice'>you use some of your power to energize</span>"))
+				H.adjustStaminaLoss(-20)
+				H.adjust_nutrition(-20)
+				H.resting = TRUE
+		if(H.pulling && iscarbon(H.pulling))
+			var/mob/living/carbon/victim = H.pulling
+			drain_cooldown = world.time + 25
+			if(victim.anti_magic_check(FALSE, TRUE, FALSE, 0))
+				to_chat(victim, "<span class='warning'>[H] tries to bite you, but stops before touching you!</span>")
+				to_chat(H, "<span class='warning'>[victim] is blessed! You stop just in time to avoid catching fire.</span>")
+				return
+			//Here we check now for both the garlic cloves on the neck and for blood in the victims bloodstream.
+			if(!blood_sucking_checks(victim, TRUE, TRUE))
+				return
+			H.visible_message("<span class='danger'>[H] Bites down on [victim]'s neck!</span>")
+			if(!do_after(H, 30, target = victim))
+				return
+			var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM - H.blood_volume //How much capacity we have left to absorb blood
+			var/drained_blood = min(victim.blood_volume, BLOOD_DRAIN_NUM, blood_volume_difference)
+			H.reagents.add_reagent(/datum/reagent/blood/, drained_blood)
+			to_chat(victim, "<span class='danger'>[H] is draining your blood!</span>")
+			to_chat(H, "<span class='notice'>You drain some blood!</span>")
+			playsound(H, 'sound/items/drink.ogg', 30, 1, -2)
+			victim.blood_volume = clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
+			log_combat(H,victim,"vampire bit")//logs the biting action for admins
+			if(!victim.blood_volume)
+				to_chat(H, "<span class='warning'>You finish off [victim]'s blood supply!</span>")
+
+//splurt change end
+//put next quirk action here
+
+/datum/quirk/vampire//splurt change start
+	name = "Bloodsucker Fledgeling"
+	desc = "you need blood for nutriment, you have fangs to aid with this, the church harms you"
+	value = 0
+	medical_record_text = "this person was partially infected by a bloodsucker"
+	mob_trait = BLOODFLEDGE
+	gain_text = "<span class='notice'>You feel an otherworldly thirst.</span>"
+	lose_text = "<span class='notice'>you feel an otherworldy burden remove itself</span>"
+	processing_quirk = TRUE
+
+/datum/quirk/vampire/add()
+	. = ..()
+	var/mob/living/carbon/human/H = quirk_holder
+	ADD_TRAIT(H,TRAIT_NO_PROCESS_FOOD,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_COLDBLOODED,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_NOBREATH,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_NOTHIRST,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT)
+	ADD_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT)//these two make the vampire fast and enables some sexy "bet you didnt think i could do this" romance
+	if(!H.dna.skin_tone_override)
+		H.skin_tone = "albino"
+	var/datum/action/vbite/B = new
+	B.Grant(H)
+
+/datum/quirk/vampire/on_process()
+	. = ..()
+	var/mob/living/carbon/C = quirk_holder
+	var/area/A = get_area(C)
+	if(istype(A, /area/service/chapel) && C.mind?.assigned_role != "Chaplain")
+		C.adjustStaminaLoss(2)
+		C.adjust_nutrition(-0.3)//changed these to be less deadly and more of an inconvinience
+		C.adjust_disgust(1)
+	if(istype(C.loc, /obj/structure/closet/crate/coffin))//heals the vampire if in a coffin, except burn which fire can be considered holy
+		C.heal_overall_damage(4,4)
+		C.adjust_disgust(-7)
+		C.adjustOxyLoss(-4)
+		C.adjustCloneLoss(-4)
+		C.adjustBruteLoss(-0.3)
+		return
+
+/datum/quirk/vampire/remove()
+	var/mob/living/carbon/human/H = quirk_holder
+	var/datum/action/vbite/B = locate() in H.actions
+	REMOVE_TRAIT(H, TRAIT_NO_PROCESS_FOOD, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_COLDBLOODED, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NOBREATH, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H, TRAIT_NOTHIRST, ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H,TRAIT_QUICKER_CARRY,ROUNDSTART_TRAIT)
+	REMOVE_TRAIT(H,TRAIT_AUTO_CATCH_ITEM,ROUNDSTART_TRAIT)
+
+	B.Remove(H)
+	. = ..()
+
+/// quirk actions ///
+
+//vampire bite
+
+#define BLOOD_DRAIN_NUM 50
+
+/datum/action/vbite
+	name = "Bite Victim"
+	button_icon_state = "power_feed"
+	icon_icon = 'icons/mob/actions/bloodsucker.dmi'
+	desc = "bite the person you are grabbing with your fangs"
+	var/drain_cooldown = 0
+
+/datum/action/vbite/Trigger()
+	. = ..()
+	if(iscarbon(owner))
+		var/mob/living/carbon/H = owner
+		if(H.nutrition >= 500)
+			to_chat(H, "<span class='notice'>You are too full to drain any more.</span>")
+			return
+		if(drain_cooldown >= world.time)
+			to_chat(H, "<span class='notice'>You just drained blood, wait a few seconds.</span>")
+			return
+		if(!H.pulling || !iscarbon(H.pulling))
+			if(H.getStaminaLoss() >= 80 && H.nutrition > 20)//prevents being stunlocked in the chapel
+				to_chat(H,("<span class='notice'>you use some of your power to energize</span>"))
+				H.adjustStaminaLoss(-20)
+				H.adjust_nutrition(-20)
+				H.resting = TRUE
+		if(H.pulling && iscarbon(H.pulling))
+			var/mob/living/carbon/victim = H.pulling
+			drain_cooldown = world.time + 25
+			if(victim.anti_magic_check(FALSE, TRUE, FALSE, 0))
+				to_chat(victim, "<span class='warning'>[H] tries to bite you, but stops before touching you!</span>")
+				to_chat(H, "<span class='warning'>[victim] is blessed! You stop just in time to avoid catching fire.</span>")
+				return
+			//Here we check now for both the garlic cloves on the neck and for blood in the victims bloodstream.
+			if(!blood_sucking_checks(victim, TRUE, TRUE))
+				return
+			H.visible_message("<span class='danger'>[H] Bites down on [victim]'s neck!</span>")
+			if(!do_after(H, 30, target = victim))
+				return
+			var/blood_volume_difference = BLOOD_VOLUME_MAXIMUM - H.blood_volume //How much capacity we have left to absorb blood
+			var/drained_blood = min(victim.blood_volume, BLOOD_DRAIN_NUM, blood_volume_difference)
+			H.reagents.add_reagent(/datum/reagent/blood/, drained_blood)
+			to_chat(victim, "<span class='danger'>[H] is draining your blood!</span>")
+			to_chat(H, "<span class='notice'>You drain some blood!</span>")
+			playsound(H, 'sound/items/drink.ogg', 30, 1, -2)
+			victim.blood_volume = clamp(victim.blood_volume - drained_blood, 0, BLOOD_VOLUME_MAXIMUM)
+			log_combat(H,victim,"vampire bit")//logs the biting action for admins
+			if(!victim.blood_volume)
+				to_chat(H, "<span class='warning'>You finish off [victim]'s blood supply!</span>")
+
+//splurt change end
+//put next quirk action here

modular_splurt/code/modules/client/loadout/head.dm

@@ -42,3 +42,38 @@
 	path = /obj/item/clothing/head/helmet/goner/officer/fake/poly
 	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION | LOADOUT_CAN_COLOR_POLYCHROMIC
 	loadout_initial_colors = list("#F2F2F2")
+
+//Adds bowler hats
+/datum/gear/head/bowler
+	name = "Bowler-hat"
+	cost = 1
+	path = /obj/item/clothing/head/bowler
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+
+//Adds medical beret
+/datum/gear/head/medberet
+	name = "Medical officer's beret"
+	cost = 1
+	path = /obj/item/clothing/head/beret/med
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+	restricted_roles = list("Chief Medical Officer", "Medical Doctor", "Chemist", "Virologist", "Paramedic", "Geneticist", "Brig Physician")
+	subcategory = LOADOUT_SUBCATEGORY_HEAD_JOBS
+
+//Adds the three basic flowers that can be pinned into the hair
+/datum/gear/head/poppy
+	name = "Poppy"
+	cost = 2
+	path = /obj/item/reagent_containers/food/snacks/grown/poppy
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+
+/datum/gear/head/lily
+	name = "Lily"
+	cost = 2
+	path = /obj/item/reagent_containers/food/snacks/grown/poppy/lily
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION
+
+/datum/gear/head/geranium
+	name = "Geranium"
+	cost = 2
+	path = /obj/item/reagent_containers/food/snacks/grown/poppy/geranium
+	loadout_flags = LOADOUT_CAN_NAME | LOADOUT_CAN_DESCRIPTION

modular_splurt/code/modules/jobs/job_types/_job_alt_titles.dm

@@ -35,6 +35,8 @@
 		"Security Commander",
 		"Head of Slutcurity"
 	)
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		LAZYADD(extra_titles, "Head of Spookcurity")
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 
@@ -93,7 +95,8 @@
 		"Cumdump",
 		"Greytider",
 		"Bard",
-		"Snack"
+		"Snack",
+		"Stress Relief"
 	)
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
@@ -262,6 +265,8 @@
 		"Gumshoe",
 		"Slutective"
 	)
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		LAZYADD(extra_titles, "Spookective")
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 
@@ -274,6 +279,8 @@
 		"Rookie",
 		"Slutcurity Officer"
 	)
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		LAZYADD(extra_titles, "Spookcurity Officer")
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 
@@ -286,6 +293,8 @@
 		"Brig Superintendent",
 		"Voreden"
 	)
+	if(SSevents.holidays && SSevents.holidays[HALLOWEEN])
+		LAZYADD(extra_titles, "Spookden")
 	LAZYADD(alt_titles, extra_titles)
 	. = ..()
 

modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/ears.dm

@@ -99,3 +99,25 @@
 	icon_state = "noodledragon"
 	matrixed_sections = MATRIX_RED_BLUE
 	icon = 'modular_splurt/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/mam_ears/bunny/alt
+	name = "Bunny (Alt)"
+	color_src = MUTCOLORS
+	matrixed_sections = MATRIX_NONE
+	icon = 'modular_splurt/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/mam_ears/bunny/alt/two
+	name = "Bunny (Alt 2)"
+	icon_state = "bunny2"
+
+/datum/sprite_accessory/ears/mam_ears/mouse
+	name = "Mouse"
+	icon_state = "mouse"
+	color_src = MUTCOLORS
+	icon = 'modular_splurt/icons/mob/mam_ears.dmi'
+
+/datum/sprite_accessory/ears/mam_ears/pointy
+	name = "Pointy"
+	icon_state = "pointy"
+	color_src = MUTCOLORS
+	icon = 'modular_splurt/icons/mob/mam_ears.dmi'

modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/hair_head.dm

@@ -1,4 +1,3 @@
-//Hyper stuff
 /datum/sprite_accessory/hair/hyenamane
 	name = "Hyena Mane"
 	icon_state = "hair_hyenamane"
@@ -121,3 +120,38 @@
 	name = "Damsel"
 	icon = 'modular_splurt/icons/mob/hair.dmi'
 	icon_state = "hair_damsel"
+
+/datum/sprite_accessory/hair/wavylong
+	name = "Long Wavy"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_wavylong"
+
+/datum/sprite_accessory/hair/wavyovereye
+	name = "Wavy over eye"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_wavyovereye"
+
+/datum/sprite_accessory/hair/straightovereye
+	name = "Straight over eye"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_straightovereye"
+
+/datum/sprite_accessory/hair/straightside
+	name = "Side Straight"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_straightside"
+
+/datum/sprite_accessory/hair/straightshort
+	name = "Straight Long"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_straightshort"
+
+/datum/sprite_accessory/hair/straightlong
+	name = "Straight Long"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_straightlong"
+
+/datum/sprite_accessory/hair/straightfloorlength
+	name = "Straight Long (Very)"
+	icon = 'modular_splurt/icons/mob/hair.dmi'
+	icon_state = "hair_straightfloorlength"

modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/snouts.dm

@@ -214,3 +214,9 @@
 	icon_state = "owl"
 	icon = 'modular_splurt/icons/mob/mam_snouts.dmi'
 	matrixed_sections = MATRIX_RED
+
+/datum/sprite_accessory/snouts/mam_snouts/beaktiny
+	name = "Tiny beak"
+	icon_state = "beaktiny"
+	icon = 'modular_splurt/icons/mob/mam_snouts.dmi'
+	color_src = MUTCOLORS

modular_splurt/code/modules/mob/dead/new_player/sprite_accesories/tails.dm

@@ -225,6 +225,18 @@
 	icon = 'modular_splurt/icons/mob/mam_tails.dmi'
 	color_src = MUTCOLORS
 
+/datum/sprite_accessory/tails/mam_tails/fluffy
+	name = "Fluffy tail"
+	icon = 'modular_splurt/icons/mob/mam_tails.dmi'
+	icon_state = "fluffy"
+	color_src = MUTCOLORS
+
+/datum/sprite_accessory/tails_animated/mam_tails_animated/fluffy
+	name = "Fluffy tail"
+	icon = 'modular_splurt/icons/mob/mam_tails.dmi'
+	icon_state = "fluffy"
+	color_src = MUTCOLORS
+
 //Lizard tails
 /datum/sprite_accessory/tails/lizard/tailmaw
 	name = "Tailmaw"

modular_splurt/code/modules/reagents/chemistry/reagents/other_reagents.dm

@@ -15,3 +15,15 @@
 	. = ..()
 	if(HAS_TRAIT(M,TRAIT_INCUBUS))
 		M.adjust_nutrition(0.5)
+
+/datum/reagent/blood/on_mob_life(mob/living/carbon/C)
+	. = ..()
+	if(HAS_TRAIT(C,BLOODFLEDGE))
+		C.adjust_nutrition(6) //3/4ed this, felt it was a bit too much
+		C.adjust_disgust(-3) //makes the churches effects easily negated
+
+/datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)//makes holy water slightly disgusting and hungering for vampires
+	. = ..()
+	if(HAS_TRAIT(M,BLOODFLEDGE))
+		M.adjust_disgust(1)
+		M.adjust_nutrition(-0.1)