removes alignment system

code/datums/mind.dm

@@ -60,8 +60,7 @@
 
 	var/isholy = FALSE // is this person a chaplain or admin role allowed to use bibles
 	var/isblessed = FALSE // is this person blessed by a chaplain?
-	var/alignment // for chaplains
-	var/religious_favor = 0 // for prayers
+	var/num_blessed = 0 // for prayers
 
 	// the world.time since the mob has been brigged, or -1 if not at all
 	var/brigged_since = -1

code/datums/spells/chaplain.dm

@@ -69,5 +69,5 @@
 				user.visible_message("[user] has blessed [target] in the name of [ticker.Bible_deity_name].", "<span class='notice'>You have blessed [target] in the name of [ticker.Bible_deity_name].</span>")
 				if(!target.mind.isblessed)
 					target.mind.isblessed = TRUE
-					user.mind.religious_favor++
+					user.mind.num_blessed++
 

code/game/jobs/job/support_chaplain.dm

@@ -1,7 +1,3 @@
-#define ALIGNMENT_GOOD "light"
-#define ALIGNMENT_NEUTRAL "neutral"
-#define ALIGNMENT_EVIL "dark"
-
 //Due to how large this one is it gets its own file
 /datum/job/chaplain
 	title = "Chaplain"
@@ -42,15 +38,11 @@
 
 	spawn()
 
-		var/religion_type = input(H,"What flavor of religion do you have?") in list(ALIGNMENT_GOOD, ALIGNMENT_NEUTRAL, ALIGNMENT_EVIL)
-		if(H.mind)
-			H.mind.alignment = religion_type
-
 		var/obj/item/storage/bible/B = new /obj/item/storage/bible(H)
 		H.equip_to_slot_or_del(B, slot_l_hand)
 
 		var/religion_name = "Christianity"
-		var/new_religion = sanitize(copytext(input(H, "What name do you give your beliefs? Default is Christianity.", "Name change", religion_name),1,MAX_NAME_LEN))
+		var/new_religion = sanitize(copytext(input(H, "You are the Chaplain. What name do you give your beliefs? Default is Christianity.", "Name change", religion_name),1,MAX_NAME_LEN))
 
 		if(!new_religion)
 			new_religion = religion_name
@@ -92,15 +84,6 @@
 
 		H.AddSpell(new /obj/effect/proc_holder/spell/targeted/chaplain_bless(null))
 
-		if(religion_type == ALIGNMENT_GOOD)
-			H.equip_to_slot_or_del(new /obj/item/flashlight/holy_torch(H), slot_in_backpack)
-		else if(religion_type == ALIGNMENT_NEUTRAL)
-			H.equip_to_slot_or_del(new /obj/item/clothing/head/helmet/riot/knight/templar(H), slot_in_backpack)
-			H.equip_to_slot_or_del(new /obj/item/clothing/suit/armor/riot/knight/templar(H), slot_in_backpack)
-		else if(religion_type == ALIGNMENT_EVIL)
-			H.equip_to_slot_or_del(new /obj/item/soulstone/anybody/chaplain(H), slot_in_backpack)
-
-
 		var/accepted = 0
 		var/outoftime = 0
 		spawn(200) // 20 seconds to choose

code/game/objects/items/devices/flashlight.dm

@@ -123,14 +123,6 @@
 	materials = list()
 	on = 1
 
-/obj/item/flashlight/holy_torch
-	name = "blessed torch"
-	desc = "A high-power, blessed, electric torch with a built-in power source. Modeled to look like an ancient torch."
-	icon_state = "torch"
-	item_state = "torch"
-	brightness_on = 9 // High power.
-	light_color = "#ffffb3" // Yellow tint.
-
 // green-shaded desk lamp
 /obj/item/flashlight/lamp/green
 	desc = "A classic green-shaded desk lamp."

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

@@ -11,10 +11,7 @@
 	var/reskinned = FALSE
 	var/reskin_selectable = TRUE			//set to FALSE if a subtype is meant to not normally be available as a reskin option (fluff ones will get re-added through their list)
 	var/list/fluff_transformations = list() //does it have any special transformations only accessible to it? Should only be subtypes of /obj/item/nullrod
-	var/alignment_required
-	var/alignment_prohibited
 	var/sanctify_force = 0
-	var/sound_played = FALSE
 
 /obj/item/nullrod/suicide_act(mob/user)
 	user.visible_message("<span class='suicide'>[user] is killing [user.p_them()]self with \the [src.name]! It looks like [user.p_theyre()] trying to get closer to god!</span>")
@@ -41,12 +38,6 @@
 			"<span class='warning'>[src] slips out of your grip as you pick it up, bouncing upwards and smacking you in the face!</span>")
 			playsound(get_turf(user), 'sound/effects/hit_punch.ogg', 50, 1, -1)
 			throw_at(get_edge_target_turf(user, pick(alldirs)), rand(1, 3), 5)
-		else
-			if(!sound_played)
-				sound_played = TRUE
-				SEND_SOUND(user, 'sound/effects/hallelujah.ogg')
-			user.visible_message("<span class='warning'>[src] glows with power as [user] picks it up!</span>", \
-			"<span class='userdanger'>[src] glows with power as you pick it up!</span>")
 
 
 /obj/item/nullrod/attack_self(mob/user)
@@ -64,10 +55,6 @@
 		var/obj/item/nullrod/variant = entry
 		if(!initial(variant.reskin_selectable))
 			holy_weapons_list -= variant
-		else if(initial(variant.alignment_required) && M.mind.alignment != initial(variant.alignment_required))
-			holy_weapons_list -= variant
-		else if(initial(variant.alignment_prohibited) && M.mind.alignment == initial(variant.alignment_prohibited))
-			holy_weapons_list -= variant
 	if(fluff_transformations.len)
 		for(var/thing in fluff_transformations)
 			holy_weapons_list += thing
@@ -132,7 +119,6 @@
 	force = 5
 	slot_flags = SLOT_BACK
 	block_chance = 50
-	alignment_required = ALIGNMENT_NEUTRAL
 
 /obj/item/nullrod/staff/blue
 	name = "blue holy staff"
@@ -163,7 +149,6 @@
 	desc = "Spread the glory of the dark gods!"
 	slot_flags = SLOT_BELT
 	hitsound = 'sound/hallucinations/growl1.ogg'
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/claymore/chainsaw_sword
 	name = "sacred chainsaw sword"
@@ -208,7 +193,6 @@
 	icon_state = "swordred"
 	item_state = "swordred"
 	desc = "Woefully ineffective when used on steep terrain."
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/claymore/saber/pirate
 	name = "nautical energy cutlass"
@@ -238,7 +222,6 @@
 	sharp = 1
 	attack_verb = list("chopped", "sliced", "cut", "reaped")
 	hitsound = 'sound/weapons/rapierhit.ogg'
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/scythe/vibro
 	name = "high frequency blade"
@@ -317,7 +300,6 @@
 	sharp = 1
 	attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
 	hitsound = 'sound/weapons/chainsaw.ogg'
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/clown
 	name = "clown dagger"
@@ -337,11 +319,10 @@
 	slot_flags = SLOT_BELT
 	attack_verb = list("whipped", "lashed")
 	hitsound = 'sound/weapons/slash.ogg'
-	alignment_required = ALIGNMENT_GOOD
 
 /obj/item/nullrod/whip/New()
 	..()
-	desc = " What a terrible night to be on the [station_name()]."
+	desc = "What a terrible night to be on the [station_name()]."
 
 /obj/item/nullrod/whip/afterattack(atom/movable/AM, mob/user, proximity)
 	if(!proximity)
@@ -373,7 +354,6 @@
 	flags = ABSTRACT | NODROP
 	w_class = WEIGHT_CLASS_HUGE
 	sharp = 1
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/carp
 	name = "carp-sie plushie"
@@ -440,7 +420,6 @@
 	attack_verb = list("poked", "impaled", "pierced", "jabbed")
 	hitsound = 'sound/weapons/bladeslice.ogg'
 	sharp = 1
-	alignment_required = ALIGNMENT_EVIL
 
 /obj/item/nullrod/rosary
 	name = "prayer beads"
@@ -449,7 +428,6 @@
 	desc = "A set of prayer beads used by many of the more traditional religions in space.<br>Vampires and other unholy abominations have learned to fear these."
 	force = 0
 	throwforce = 0
-	alignment_required = ALIGNMENT_GOOD
 	var/praying = 0
 
 /obj/item/nullrod/rosary/New()
@@ -545,7 +523,6 @@
 	icon = 'icons/obj/food/food.dmi'
 	icon_state = "baguette"
 	desc = "a staple of worshipers of the Silentfather, this holy mime artifact has an odd effect on clowns."
-	alignment_required = null
 
 /obj/item/nullrod/rosary/bread/process()
 	if(ishuman(loc))

code/game/objects/structures/crates_lockers/closets/secure/chaplain.dm

@@ -20,7 +20,10 @@
 	new /obj/item/clothing/head/witchhunter_hat(src)
 	new /obj/item/clothing/suit/holidaypriest(src)
 	new /obj/item/clothing/under/wedding/bride_white(src)
-	new /obj/item/storage/backpack/cultpack (src)
+	new /obj/item/storage/backpack/cultpack(src)
+	new /obj/item/clothing/head/helmet/riot/knight/templar(src)
+	new /obj/item/clothing/suit/armor/riot/knight/templar(src)
+	new /obj/item/soulstone/anybody/chaplain(src)
 	new /obj/item/storage/fancy/candle_box/eternal(src)
 	new /obj/item/storage/fancy/candle_box/eternal(src)
 	new /obj/item/storage/fancy/candle_box/eternal(src)

code/modules/admin/verbs/pray.dm

@@ -30,7 +30,7 @@
 		deity = ticker.cultdat.entity_name
 
 	log_say("(PRAYER) [msg]", usr)
-	msg = "<span class='notice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""][mind && mind.alignment ? " (alignment: [mind.alignment])" : ""][mind && mind.isholy ? " (blessings: [mind.religious_favor])" : ""]:</font> [key_name(src, 1)] ([ADMIN_QUE(src,"?")]) ([ADMIN_PP(src,"PP")]) ([ADMIN_VV(src,"VV")]) ([ADMIN_SM(src,"SM")]) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_SC(src,"SC")]) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]</span>"
+	msg = "<span class='notice'>[bicon(cross)]<b><font color=[font_color]>[prayer_type][deity ? " (to [deity])" : ""][mind && mind.isholy ? " (blessings: [mind.num_blessed])" : ""]:</font> [key_name(src, 1)] ([ADMIN_QUE(src,"?")]) ([ADMIN_PP(src,"PP")]) ([ADMIN_VV(src,"VV")]) ([ADMIN_SM(src,"SM")]) ([admin_jump_link(src)]) (<A HREF='?_src_=holder;secretsadmin=check_antagonist'>CA</A>) ([ADMIN_SC(src,"SC")]) (<A HREF='?_src_=holder;Bless=[UID()]'>BLESS</A>) (<A HREF='?_src_=holder;Smite=[UID()]'>SMITE</A>):</b> [msg]</span>"
 
 	for(var/client/X in GLOB.admins)
 		if(check_rights(R_EVENT,0,X.mob))

code/modules/response_team/ert.dm

@@ -280,7 +280,6 @@ var/ert_request_answered = FALSE
 			M.equipOutfit(paranormal_outfit)
 			M.job = "ERT Paranormal"
 			M.mind.isholy = TRUE
-			M.mind.alignment = ALIGNMENT_GOOD
 
 		if("Commander")
 			command_slots = 0

code/modules/response_team/ert_outfits.dm

@@ -379,8 +379,7 @@
 	pda = /obj/item/pda/centcom
 	backpack_contents = list(
 		/obj/item/clothing/mask/gas/sechailer/swat = 1,
-		/obj/item/storage/box/zipties = 1,
-		/obj/item/flashlight/holy_torch = 1
+		/obj/item/storage/box/zipties = 1
 		)
 
 /datum/outfit/job/centcom/response_team/paranormal/amber