diff --git a/code/game/gamemodes/cult/ritual.dm b/code/game/gamemodes/cult/ritual.dm
index 3785d882b62..6e236db2154 100644
--- a/code/game/gamemodes/cult/ritual.dm
+++ b/code/game/gamemodes/cult/ritual.dm
@@ -349,6 +349,12 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
if(!iscultist(user))
return ..()
if(iscultist(M))
+ if(M.reagents && M.reagents.has_reagent("holywater")) //allows cultists to be rescued from the clutches of ordained religion
+ user << "You remove the taint from [M]."
+ var/holy2unholy = M.reagents.get_reagent_amount("holywater")
+ M.reagents.del_reagent("holywater")
+ M.reagents.add_reagent("unholywater",holy2unholy)
+ add_logs(M, user, "smacked", src, " removing the holy water from them")
return
M.take_organ_damage(0,rand(5,20)) //really lucky - 5 hits for a crit
for(var/mob/O in viewers(M, null))
diff --git a/code/game/gamemodes/cult/runes.dm b/code/game/gamemodes/cult/runes.dm
index a4c41cb07ce..18883600ad4 100644
--- a/code/game/gamemodes/cult/runes.dm
+++ b/code/game/gamemodes/cult/runes.dm
@@ -558,14 +558,14 @@ var/list/sacrificed = list()
else
usr.whisper("[input]")
- log_say("Cult Message: [key_name(usr)]: [input]")
+ log_say("Cult Message: [key_name(usr)]: [input]")
for(var/datum/mind/H in ticker.mode.cult)
if (H.current)
H.current << "[cultName]: [input]"
for(var/mob/spirit/spirit in spirits)
spirit << "[displayName]: [input]"
-
+
for(var/mob/dead/observer/G in player_list)
G.show_message("[displayName] ([cultName]) ([ghost_follow_link(usr, ghost=G)]): [input]")
@@ -699,7 +699,7 @@ var/list/sacrificed = list()
if (istype(W,/obj/item/weapon/paper/talisman))
rad = 4
go = 1
- if (istype(W,/obj/item/weapon/nullrod))
+ if (istype(W,/obj/item/weapon/storage/bible))
rad = 1
go = 1
if(go)
@@ -708,7 +708,7 @@ var/list/sacrificed = list()
R:visibility=15
S=1
if(S)
- if(istype(W,/obj/item/weapon/nullrod))
+ if(istype(W,/obj/item/weapon/storage/bible))
usr << "\red Arcane markings suddenly glow from underneath a thin layer of dust!"
return
if(istype(W,/obj/effect/rune))
diff --git a/code/game/objects/items/weapons/storage/bible.dm b/code/game/objects/items/weapons/storage/bible.dm
index 6237792040f..b0106cd1f93 100644
--- a/code/game/objects/items/weapons/storage/bible.dm
+++ b/code/game/objects/items/weapons/storage/bible.dm
@@ -94,24 +94,24 @@
return
/obj/item/weapon/storage/bible/afterattack(atom/A, mob/user as mob, proximity)
- if(!proximity) return
-/* if (istype(A, /turf/simulated/floor))
- user << "\blue You hit the floor with the bible."
+ if(!proximity)
+ return
+ if (istype(A, /turf/simulated/floor))
+ user << "You hit the floor with the bible."
if(user.mind && (user.mind.assigned_role == "Chaplain"))
- call(/obj/effect/rune/proc/revealrunes)(src)*/
+ call(/obj/effect/rune/proc/revealrunes)(src)
if(user.mind && (user.mind.assigned_role == "Chaplain"))
if(A.reagents && A.reagents.has_reagent("water")) //blesses all the water in the holder
- user << "\blue You bless [A]."
+ user << "You bless [A]."
var/water2holy = A.reagents.get_reagent_amount("water")
A.reagents.del_reagent("water")
A.reagents.add_reagent("holywater",water2holy)
+ if(A.reagents && A.reagents.has_reagent("unholywater")) //yeah yeah, copy pasted code - sue me
+ user << "You purify [A]."
+ var/unholy2clean = A.reagents.get_reagent_amount("unholywater")
+ A.reagents.del_reagent("unholywater")
+ A.reagents.add_reagent("holywater",unholy2clean)
/obj/item/weapon/storage/bible/attackby(obj/item/weapon/W as obj, mob/user as mob, params)
playsound(src.loc, "rustle", 50, 1, -5)
- ..()
-
- if(W.reagents && W.reagents.has_reagent("water"))
- user << "You feel [deity_name] blessing \the [W] as you insert it into \the [src]."
- var/water2holy = W.reagents.get_reagent_amount("water")
- W.reagents.del_reagent("water")
- W.reagents.add_reagent("holywater",water2holy)
+ ..()
\ No newline at end of file
diff --git a/code/game/objects/items/weapons/weaponry.dm b/code/game/objects/items/weapons/weaponry.dm
index ee6fb876f05..1b2fd892ea1 100644
--- a/code/game/objects/items/weapons/weaponry.dm
+++ b/code/game/objects/items/weapons/weaponry.dm
@@ -57,12 +57,6 @@
M.mind.vampire.nullified = max(5, M.mind.vampire.nullified + 2)
..()
-
-/obj/item/weapon/nullrod/afterattack(atom/A, mob/user as mob)
- if (istype(A, /turf/simulated/floor))
- user << "\blue You hit the floor with the [src]."
- call(/obj/effect/rune/proc/revealrunes)(src)
-
/obj/item/weapon/sord
name = "\improper SORD"
desc = "This thing is so unspeakably shitty you are having a hard time even holding it."
diff --git a/code/modules/reagents/Chemistry-Reagents.dm b/code/modules/reagents/Chemistry-Reagents.dm
index 6e247c334a0..238724c0b09 100644
--- a/code/modules/reagents/Chemistry-Reagents.dm
+++ b/code/modules/reagents/Chemistry-Reagents.dm
@@ -1074,23 +1074,35 @@ datum
return
if(method == TOUCH)
M.adjust_fire_stacks(volume / 10)
- return
- /*
- reaction_obj(var/obj/O, var/volume)
- var/turf/the_turf = get_turf(O)
- if(!the_turf)
- return //No sense trying to start a fire if you don't have a turf to set on fire. --NEO
- new /obj/effect/decal/cleanable/liquid_fuel(the_turf, volume)
- reaction_turf(var/turf/T, var/volume)
- new /obj/effect/decal/cleanable/liquid_fuel(T, volume)
- return
- */
+ return
+ ..()
+
on_mob_life(var/mob/living/M as mob)
if(!M) M = holder.my_atom
M.adjustToxLoss(1)
..()
return
+ unholywater //if you somehow managed to extract this from someone, dont splash it on yourself and have a smoke
+ name = "Unholy Water"
+ id = "unholywater"
+ description = "Something that shouldn't exist on this plane of existance."
+ process_flags = ORGANIC | SYNTHETIC //ethereal means everything processes it.
+
+ on_mob_life(mob/living/M)
+ M.adjustBrainLoss(3)
+ if(iscultist(M))
+ M.status_flags |= GOTTAGOFAST
+ M.drowsyness = max(M.drowsyness-5, 0)
+ M.AdjustParalysis(-2)
+ M.AdjustStunned(-2)
+ M.AdjustWeakened(-2)
+ else
+ M.adjustToxLoss(2)
+ M.adjustFireLoss(2)
+ M.adjustOxyLoss(2)
+ M.adjustBruteLoss(2)
+ holder.remove_reagent(src.id, 1)
incendiary_fuel //copy-pasta of welding fuel; allow incendiary grenades to function better without the headache of people spraying fuel everywhere with regular welding fuel.
name = "Incendiary fuel"