Merge pull request #8860 from Trilbyspaceclone/Zelus_oil

Zelus oil - CWC gear

code/modules/antagonists/clockcult/clock_items/clockwork_armor.dm

@@ -69,7 +69,7 @@
 	heat_protection = CHEST|GROIN|LEGS
 	resistance_flags = FIRE_PROOF | ACID_PROOF
 	armor = list("melee" = 60, "bullet" = 70, "laser" = -25, "energy" = 0, "bomb" = 60, "bio" = 0, "rad" = 0, "fire" = 100, "acid" = 100)
-	allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel)
+	allowed = list(/obj/item/clockwork, /obj/item/clothing/glasses/wraith_spectacles, /obj/item/clothing/glasses/judicial_visor, /obj/item/mmi/posibrain/soul_vessel, /obj/item/reagent_containers/food/drinks/holyoil)
 
 /obj/item/clothing/suit/armor/clockwork/Initialize()
 	. = ..()

code/modules/food_and_drinks/drinks/drinks/bottle.dm

@@ -202,6 +202,19 @@
 	desc = "A flask of holy water...it's been sitting in the Necropolis a while though."
 	list_reagents = list("hell_water" = 100)
 
+/obj/item/reagent_containers/food/drinks/holyoil
+	name = "flask of zelus oil"
+	desc = "A brass flask of Zelus oil, a viscous fluid with a scenting of brass - this flask may be sipped or thrown."
+	icon_state = "zelusflask"
+	list_reagents = list("holyoil" = 30) //Powerfull
+	volume = 30
+	foodtype = NONE
+	force = 12 //Same as a toolbox
+	throwforce = 18
+
+/obj/item/reagent_containers/food/drinks/holyoil/null
+	list_reagents = list("holyoil" = 0)
+
 /obj/item/reagent_containers/food/drinks/bottle/vermouth
 	name = "Goldeneye vermouth"
 	desc = "Sweet, sweet dryness~"

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

@@ -206,7 +206,12 @@
 
 /datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
 	if(is_servant_of_ratvar(M))
-		to_chat(M, "<span class='userdanger'>A darkness begins to spread its unholy tendrils through your mind, purging the Justiciar's influence!</span>")
+		to_chat(M, "<span class='userdanger'>A fog spreads through your mind, purging the Justiciar's influence!</span>")
+	..()
+
+/datum/reagent/water/holywater/reaction_mob(mob/living/M, method=TOUCH, reac_volume)
+	if(iscultist(M))
+		to_chat(M, "<span class='userdanger'>A fog spreads through your mind, weakening your connection to the veil and purging Nar-sie's influence</span>")
 	..()
 
 /datum/reagent/water/holywater/on_mob_life(mob/living/carbon/M)
@@ -309,6 +314,45 @@
 	M.adjustBrainLoss(5, 150)
 	holder.remove_reagent(id, 1)
 
+/datum/reagent/fuel/holyoil		//Its oil
+	name = "Zelus Oil"
+	id = "holyoil"
+	description = "Oil blessed by a greater being."
+	taste_description = "metallic oil"
+
+/datum/reagent/fuel/holyoil/on_mob_life(mob/living/carbon/M)
+	if(is_servant_of_ratvar(M))
+		M.drowsyness = max(M.drowsyness-5, 0)
+		M.AdjustUnconscious(-60, 0)
+		M.AdjustStun(-30, 0)
+		M.AdjustKnockdown(-70, 0)
+		M.adjustStaminaLoss(-15, 0)
+		M.adjustToxLoss(-5, 0, TRUE)
+		M.adjustOxyLoss(-3, 0)
+		M.adjustBruteLoss(-3, 0)
+		M.adjustFireLoss(-5, 0)
+	if(iscultist(M))
+		M.AdjustUnconscious(1, 0)
+		M.AdjustStun(10, 0)
+		M.AdjustKnockdown(20, 0)
+		M.adjustStaminaLoss(15, 0)
+	else
+		M.adjustToxLoss(3, 0)
+		M.adjustOxyLoss(2, 0)
+		M.adjustStaminaLoss(10, 0)
+		holder.remove_reagent(id, 1)
+	return TRUE
+
+//We only get 30u to start with...
+
+/datum/reagent/fuel/holyoil/reaction_obj(obj/O, reac_volume)
+	. = ..() 
+	if(istype(O, /obj/item/stack/sheet/metal))
+		var/obj/item/stack/sheet/metal/M = O
+		reac_volume = min(reac_volume, M.amount)
+		new/obj/item/stack/tile/brass(get_turf(M), reac_volume)
+		M.use(reac_volume)
+
 /datum/reagent/medicine/omnizine/godblood
 	name = "Godblood"
 	id = "godblood"