The Boomerang Update (feat. Castlevania: Rondo of Blood, and Gurren Lagann) (#36993)

* Castlevania and Boomerangs

* GURREN BOOMERANG

* Alright

* failsafe

* better boomerang protection

Author: DeityLink

__DEFINES/_macros.dm

@@ -206,7 +206,11 @@
 
 #define isgripper(G) (istype(G, /obj/item/weapon/gripper))
 
-#define isholyweapon(I) (istype(I, /obj/item/weapon/nullrod) || istype(I, /obj/item/weapon/gun/hookshot/whip/vampkiller))
+#define isholyweapon(I) (istype(I, /obj/item/weapon/storage/bible)\
+						 || istype(I, /obj/item/weapon/nullrod)\
+						 || istype(I, /obj/item/weapon/gun/hookshot/whip/vampkiller/true)\
+						 || istype(I, /obj/item/projectile/hookshot/whip/vampkiller/true)\
+						 || istype(I, /obj/item/weapon/boomerang/cross))
 
 #define isholyprotection(I) (istype(I, /obj/item/weapon/nullrod))
 

__DEFINES/reagents.dm

@@ -38,6 +38,7 @@
 #define STOXIN 			"stoxin"
 #define INAPROVALINE 			"inaprovaline"
 #define HOLYWATER 			"holywater"
+#define SACREDWATER 		"sacredwater"
 #define SEROTROTIUM 			"serotrotium"
 #define SILICATE 			"silicate"
 #define OXYGEN 			"oxygen"

__DEFINES/setup.dm

@@ -1977,6 +1977,11 @@ var/list/weekend_days = list("Friday", "Saturday", "Sunday")
 #define PS_NARSIEHASRISEN3	"Nar-SieHasRisen3"
 #define PS_ZAS_DUST			"ZAS Dust"
 #define PS_DANDELIONS		"Dandelions"
+#define PS_CROSS_DUST		"Cross Dust"
+#define PS_CROSS_ORB		"Cross Orb"
+#define PS_SACRED_FLAME		"Sacred Flame"
+#define PS_SACRED_FLAME2	"Sacred Flame2"
+#define PS_BIBLE_PAGE		"Bible Page"
 
 //Particles variable defines
 #define PVAR_SPAWNING	"spawning"

code/datums/gamemode/factions/bloodcult/bloodcult_effects.dm

@@ -110,17 +110,23 @@
 /obj/effect/afterimage/black
 	image_color = "black"
 
-/obj/effect/afterimage/New(var/turf/loc, var/atom/model, var/fadout = 5)
+/obj/effect/afterimage/richter_tackle/New()
+	..()
+	transform = matrix()
+	pixel_x = 0
+	pixel_y = 0
+
+/obj/effect/afterimage/New(var/turf/loc, var/atom/model, var/fadout = 5, var/initial_alpha = 255, var/lay = NARSIE_GLOW, var/pla = ABOVE_LIGHTING_PLANE)
 	..()
 	if(model)
-		src.appearance = model.appearance
+		appearance = model.appearance
 		invisibility = 0
-		alpha = 255
+		alpha = initial_alpha
 		dir = model.dir
 		if (image_color)
 			color = image_color
-		layer = NARSIE_GLOW
-		plane = ABOVE_LIGHTING_PLANE
+		layer = lay
+		plane = pla
 	animate(src,alpha = 0, time = fadout)
 	spawn(fadout)
 		qdel(src)

code/datums/gamemode/factions/bloodcult/bloodcult_mobs_and_constructs.dm

@@ -13,6 +13,13 @@
 	var/turf/crashing = null
 	spell_on_use_inhand = /spell/juggerdash //standard jug gets forcewall, but this seems better for perfect
 
+/mob/living/simple_animal/construct/armoured/perfect/special_thrown_behaviour()
+	dash_dir = dir
+	throwing = 2//dashing through windows and grilles
+
+/mob/living/simple_animal/construct/armoured/perfect/get_afterimage()
+	return "red"
+
 /mob/living/simple_animal/construct/armoured/perfect/to_bump(var/atom/obstacle)
 	if(src.throwing)
 		var/breakthrough = 0

code/datums/gamemode/role/cultist.dm

@@ -552,7 +552,7 @@
 		H.stuttering = max(H.stuttering, 12)
 		H.Jitter(12)
 
-/datum/role/cultist/handle_splashed_reagent(var/reagent_id)//also proc'd when holy water is drinked or ingested in any way
+/datum/role/cultist/handle_splashed_reagent(var/reagent_id, var/method, var/volume)//also proc'd when holy water is drinked or ingested in any way
 	var/mob/living/carbon/human/H = antag.current
 	if (!istype(H))
 		return
@@ -561,11 +561,17 @@
 			holywarning_cooldown = 5
 			to_chat(H, "<span class='danger'>The cold touch of holy water makes your head spin, you're having trouble walking straight.</span>")
 
-	if (reagent_id == HOLYWATER || reagent_id == INCENSE_HAREBELLS)
-		H.eye_blurry = max(H.eye_blurry, 12)
-		H.Dizzy(12)
-		H.stuttering = max(H.stuttering, 12)
-		H.Jitter(12)
+	if (reagent_id == SACREDWATER)
+		if (holywarning_cooldown <= 0)
+			holywarning_cooldown = 5
+			to_chat(H, "<span class='danger'>The burning touch of sacred water sears your skin.</span>")
+
+	switch(reagent_id)
+		if (HOLYWATER,INCENSE_HAREBELLS,SACREDWATER)
+			H.eye_blurry = max(H.eye_blurry, 12)
+			H.Dizzy(12)
+			H.stuttering = max(H.stuttering, 12)
+			H.Jitter(12)
 
 /datum/role/cultist/proc/write_rune(var/word_to_draw)
 	var/mob/living/user = antag.current

code/datums/gamemode/role/role.dm

@@ -579,7 +579,7 @@
 /datum/role/proc/handle_reagent(var/reagent_id)
 	return
 
-/datum/role/proc/handle_splashed_reagent(var/reagent_id)
+/datum/role/proc/handle_splashed_reagent(var/reagent_id, var/method, var/volume)
 	return
 
 //Does the role have special clothing restrictions?

code/datums/gamemode/role/vampire_role.dm

@@ -424,7 +424,7 @@
 
 /datum/role/vampire/handle_reagent(var/reagent_id)
 	switch(reagent_id)
-		if (HOLYWATER,INCENSE_HAREBELLS)
+		if (HOLYWATER,INCENSE_HAREBELLS,SACREDWATER)
 			var/mob/living/carbon/human/H = antag.current
 			if (!istype(H))
 				return
@@ -436,12 +436,9 @@
 				to_chat(H, "<span class='warning'>A freezing liquid permeates your bloodstream. You're still too human to be smited!</span>")
 				smitecounter += 2 //Basically nothing, unless you drank multiple bottles of holy water (250 units to catch on fire !)
 
-/*
-	Commented out for now.
-
-/datum/role/vampire/handle_splashed_reagent(var/reagent_id)
+/datum/role/vampire/handle_splashed_reagent(var/reagent_id, var/method, var/volume)
 	switch (reagent_id)
-		if (HOLYWATER)
+		if (HOLYWATER,SACREDWATER)
 			var/mob/living/carbon/human/H = antag.current
 			if (!istype(H))
 				return
@@ -483,8 +480,6 @@
 						H.take_organ_damage(min(15, volume * 2))
 						smitecounter += 5
 
-*/
-
 /*
 -- Helpers --
 */

code/datums/religions.dm

@@ -67,12 +67,15 @@ var/list/tgui_religion_data
 			var/datum/religion/religion = new path
 			var/obj/item/weapon/storage/fancy/incensebox/incensebox_path = religion.preferred_incense
 			var/incense_fragrance = initial(incensebox_path.fragrance)
+			var/list/bible_style = all_bible_styles[religion.bookstyle]
+			if (islist(bible_style))
+				bible_style = bible_style["icon"]
 			data_religions += list(list(
 				"name" = religion.name,
 				"keywords" = religion.keys,
 				"deityName" = religion.deity_name,
 				"bibleStyle" = religion.bookstyle,
-				"bibleStyleIcon" = all_bible_styles[religion.bookstyle],
+				"bibleStyleIcon" = bible_style,
 				"bibleName" = religion.bible_name,
 				"maleAdept" = religion.male_adept,
 				"femaleAdept" = religion.female_adept,
@@ -82,7 +85,6 @@ var/list/tgui_religion_data
 				"preferredIncense" = incense_fragrance,
 				"notes" = religion.ui_notes(),
 			))
-
 		var/list/data_bible_styles = data["bibleStyles"]
 		for(var/name in all_bible_styles)
 			var/icon_name = all_bible_styles[name]
@@ -1429,8 +1431,10 @@ var/list/all_bible_styles = list(
 	bookstyle = "Holy Grimoire"
 
 /datum/religion/belmont/equip_chaplain(var/mob/living/carbon/human/H)
-	H.equip_or_collect(new /obj/item/clothing/suit/vamphunter, slot_w_uniform)
-	H.equip_or_collect(new /obj/item/clothing/head/vamphunter, slot_shoes)
+	H.collect_in_backpack(new /obj/item/clothing/suit/vamphunter)
+	H.collect_in_backpack(new /obj/item/clothing/head/vamphunter)
+	H.collect_in_backpack(new /obj/item/weapon/storage/box/castlevania(H))
+	H.equip_or_collect(new /obj/item/weapon/reagent_containers/food/drinks/bottle/holywater/sacredwater, slot_r_store)
 
 /datum/religion/esports
 	name = "E-Sports"

code/game/atoms.dm

@@ -156,8 +156,10 @@ var/global/list/ghdel_profiling = list()
 /atom/proc/throw_impact(atom/hit_atom, var/speed, mob/user, var/list/impact_whitelist)
 	if(istype(hit_atom,/mob/living))
 		var/mob/living/M = hit_atom
-		playsound(src, src.throw_impact_sound, 80, 1)
-		M.hitby(src,speed,src.dir,impact_whitelist)
+		if (M.hitby(src,speed,src.dir,impact_whitelist))
+			playsound(loc,'sound/effects/slap2.ogg', 15, 1)//grabbed the item
+		else
+			playsound(src, src.throw_impact_sound, 80, 1)
 		log_attack("<font color='red'>[hit_atom] ([M ? M.ckey : "what"]) was hit by [src] thrown by [user] ([user ? user.ckey : "what"])</font>")
 
 	else if(isobj(hit_atom))
@@ -170,8 +172,9 @@ var/global/list/ghdel_profiling = list()
 	else if(isturf(hit_atom) && !istype(src,/obj/mecha))//heavy mechs don't just bounce off walls, also it can fuck up rocket dashes
 		var/turf/T = hit_atom
 		if(T.density)
-			spawn(2)
-				step(src, turn(src.dir, 180))
+			if (isturf(loc))
+				spawn(2)
+					step(src, turn(src.dir, 180))
 			if(istype(src,/mob/living))
 				var/mob/living/M = src
 				M.take_organ_damage(10)