Merge remote-tracking branch 'refs/remotes/Citadel-Station-13/master' into syntheticbloods

modular_citadel/code/game/objects/ids.dm

@@ -49,7 +49,7 @@
 
 /obj/item/emagrecharge
 	name = "electromagnet charging device"
-	desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices."
+	desc = "A small cell with two prongs lazily jabbed into it. It looks like it's made for charging the small batteries found in electromagnetic devices, sadly this can't be recharged like a normal cell."
 	icon = 'icons/obj/module.dmi'
 	icon_state = "cell_mini"
 	item_flags = NOBLUDGEON
@@ -63,7 +63,7 @@
 		to_chat(user, "<span class='warning'>It has a small, red, blinking light coming from inside of it. It's spent.</span>")
 
 /obj/item/card/emag
-	var/uses = 10
+	var/uses = 15
 
 /obj/item/card/emag/examine(mob/user)
 	. = ..()

modular_citadel/code/game/objects/items/holy_weapons.dm

@@ -30,24 +30,16 @@
 		"<span class='info'>You kneel[M == user ? null : " next to [M]"] and begin a prayer to [deity_name].</span>")
 
 	praying = TRUE
-	if(do_after(user, 100, target = M))
+	if(do_after(user, 20, target = M))
 		if(istype(M, /mob/living/carbon/human)) // This probably should not work on catpeople. They're unholy abominations.
 			var/mob/living/carbon/human/target = M
-
-			if(iscultist(M) || is_servant_of_ratvar(M)) //ripped from holywater code.
-				if(iscultist(M))
-					SSticker.mode.remove_cultist(M.mind, FALSE, TRUE)
-				else if(is_servant_of_ratvar(M))
-					remove_servant_of_ratvar(M)
-
+			M.reagents.add_reagent("holywater", 5)
 			to_chat(target, "<span class='notice'>[user]'s prayer to [deity_name] has eased your pain!</span>")
 			target.adjustToxLoss(-5, TRUE, TRUE)
 			target.adjustOxyLoss(-5)
 			target.adjustBruteLoss(-5)
 			target.adjustFireLoss(-5)
-
 			praying = FALSE
-
 	else
 		to_chat(user, "<span class='notice'>Your prayer to [deity_name] was interrupted.</span>")
 		praying = FALSE

modular_citadel/code/game/objects/items/melee/eutactic_blades.dm

@@ -130,15 +130,6 @@
 	else
 		return ..()
 
-/obj/item/melee/transforming/energy/sword/cx/chaplain
-	name = "divine lightblade"
-	force_on = 20		//haha i'll regret this
-	block_chance = 50
-
-/obj/item/melee/transforming/energy/sword/cx/chaplain/Initialize()
-	. = ..()
-	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
-
 //OBLIGATORY TOY MEMES	/////////////////////////////////////
 
 /obj/item/toy/sword/cx
@@ -271,6 +262,21 @@
 	spinnable = FALSE
 	total_mass_on = 4
 
+/obj/item/twohanded/dualsaber/hypereutactic/chaplain
+	name = "\improper divine lightblade"
+	desc = "A giant blade of bright and holy light, said to cut down the wicked with ease."
+	force = 5
+	force_unwielded = 5
+	force_wielded = 20
+	block_chance = 50
+	armour_penetration = 0
+	var/chaplain_spawnable = TRUE
+	obj_flags = UNIQUE_RENAME
+
+/obj/item/twohanded/dualsaber/hypereutactic/chaplain/Initialize()
+	. = ..()
+	AddComponent(/datum/component/anti_magic, TRUE, TRUE)
+
 /obj/item/twohanded/dualsaber/hypereutactic/pre_altattackby(atom/A, mob/living/user, params)	//checks if it can do right click memes
 	altafterattack(A, user, TRUE, params)
 	return TRUE
@@ -380,4 +386,4 @@
 /obj/item/twohanded/dualsaber/hypereutactic/toy/rainbow
 	name = "\improper Hyper-Euclidean Reciprocating Trigonometric Zweihander"
 	desc = "A custom-built toy with fancy rainbow lights built-in."
-	hacked = TRUE
+	hacked = TRUE

modular_citadel/code/game/objects/items/melee/misc.dm

@@ -4,7 +4,7 @@
 	var/hardstun_ds = 1
 	var/softstun_ds = 0
 	var/stam_dmg = 30
-	cooldown = 20
+	cooldown = 0
 	total_mass = 3.75
 
 /obj/item/melee/classic_baton/attack(mob/living/target, mob/living/user)