mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-23 03:57:13 +01:00
changes alignments to light/neutral/dark, removes atheism
This commit is contained in:
@@ -60,7 +60,6 @@
|
||||
|
||||
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/canpray = TRUE // is this person allowed to use the PRAY verb? Atheist chaplains lose this
|
||||
var/alignment // for chaplains
|
||||
var/religious_favor = 0 // for prayers
|
||||
|
||||
|
||||
@@ -1,7 +1,6 @@
|
||||
#define ALIGNMENT_GOOD "good"
|
||||
#define ALIGNMENT_GOOD "light"
|
||||
#define ALIGNMENT_NEUTRAL "neutral"
|
||||
#define ALIGNMENT_EVIL "evil"
|
||||
#define ALIGNMENT_GODLESS "godless"
|
||||
#define ALIGNMENT_EVIL "dark"
|
||||
|
||||
//Due to how large this one is it gets its own file
|
||||
/datum/job/chaplain
|
||||
@@ -43,7 +42,7 @@
|
||||
|
||||
spawn()
|
||||
|
||||
var/religion_type = input(H,"What type of religion do you have?") in list(ALIGNMENT_GOOD, ALIGNMENT_NEUTRAL, ALIGNMENT_EVIL, ALIGNMENT_GODLESS)
|
||||
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
|
||||
|
||||
@@ -91,16 +90,7 @@
|
||||
new_deity = deity_name
|
||||
B.deity_name = new_deity
|
||||
|
||||
if(religion_type == ALIGNMENT_GODLESS)
|
||||
// Atheist chaplain. Give mindshield instead of blessing power.
|
||||
var/obj/item/implant/mindshield/L = new/obj/item/implant/mindshield(H)
|
||||
L.implant(H, null, 1)
|
||||
if(H.mind)
|
||||
H.mind.isholy = FALSE
|
||||
H.mind.canpray = FALSE
|
||||
else
|
||||
// Otherwise, grant the ability to bless people, incrementing their religious_favor and showing up in prayers.
|
||||
H.AddSpell(new /obj/effect/proc_holder/spell/targeted/chaplain_bless(null))
|
||||
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)
|
||||
@@ -118,8 +108,9 @@
|
||||
var/new_book_style = "Bible"
|
||||
|
||||
while(!accepted)
|
||||
if(!B) break // prevents possible runtime errors
|
||||
new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "Athiest", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon", "Greentext")
|
||||
if(!B)
|
||||
break // prevents possible runtime errors
|
||||
new_book_style = input(H,"Which bible style would you like?") in list("Bible", "Koran", "Scrapbook", "Creeper", "White Bible", "Holy Light", "PlainRed", "Tome", "The King in Yellow", "Ithaqua", "Scientology", "the bible melts", "Necronomicon", "Greentext")
|
||||
switch(new_book_style)
|
||||
if("Koran")
|
||||
B.icon_state = "koran"
|
||||
@@ -140,13 +131,9 @@
|
||||
if("Holy Light")
|
||||
B.icon_state = "holylight"
|
||||
B.item_state = "syringe_kit"
|
||||
if("Athiest")
|
||||
if("PlainRed")
|
||||
B.icon_state = "athiest"
|
||||
B.item_state = "syringe_kit"
|
||||
for(var/area/chapel/main/A in world)
|
||||
for(var/turf/T in A.contents)
|
||||
if(T.icon_state == "carpetsymbol")
|
||||
T.dir = 10
|
||||
if("Tome")
|
||||
B.icon_state = "tome"
|
||||
B.item_state = "syringe_kit"
|
||||
|
||||
@@ -122,7 +122,6 @@
|
||||
hitsound = 'sound/weapons/sear.ogg'
|
||||
damtype = BURN
|
||||
attack_verb = list("punched", "cross countered", "pummeled")
|
||||
alignment_prohibited = ALIGNMENT_GODLESS
|
||||
|
||||
/obj/item/nullrod/staff
|
||||
name = "red holy staff"
|
||||
@@ -151,7 +150,6 @@
|
||||
sharp = 1
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
alignment_prohibited = ALIGNMENT_GODLESS
|
||||
|
||||
/obj/item/nullrod/claymore/hit_reaction(mob/living/carbon/human/owner, attack_text, final_block_chance, damage, attack_type)
|
||||
if(attack_type == PROJECTILE_ATTACK)
|
||||
@@ -175,7 +173,6 @@
|
||||
slot_flags = SLOT_BELT
|
||||
attack_verb = list("sawed", "torn", "cut", "chopped", "diced")
|
||||
hitsound = 'sound/weapons/chainsaw.ogg'
|
||||
alignment_prohibited = ALIGNMENT_GODLESS
|
||||
|
||||
/obj/item/nullrod/claymore/glowing
|
||||
name = "force blade"
|
||||
@@ -229,7 +226,6 @@
|
||||
throwforce = 1
|
||||
hitsound = 'sound/weapons/bladeslice.ogg'
|
||||
attack_verb = list("attacked", "slashed", "stabbed", "sliced", "torn", "ripped", "diced", "cut")
|
||||
alignment_prohibited = ALIGNMENT_GODLESS
|
||||
|
||||
/obj/item/nullrod/scythe
|
||||
name = "reaper scythe"
|
||||
@@ -358,8 +354,8 @@
|
||||
H.adjustBruteLoss(12) //Bonus damage
|
||||
|
||||
/obj/item/nullrod/fedora
|
||||
name = "athiest's fedora"
|
||||
desc = "The brim of the hat is as sharp as your wit. Throwing it at someone would hurt almost as much as disproving the existence of God."
|
||||
name = "binary fedora"
|
||||
desc = "The brim of the hat is as sharp as the division between 0 and 1. It makes a mighty throwing weapon."
|
||||
icon_state = "fedora"
|
||||
item_state = "fedora"
|
||||
slot_flags = SLOT_HEAD
|
||||
@@ -368,7 +364,6 @@
|
||||
throw_speed = 4
|
||||
throw_range = 7
|
||||
throwforce = 25 // Yes, this is high, since you can typically only use it once in a fight.
|
||||
alignment_required = ALIGNMENT_GODLESS
|
||||
|
||||
/obj/item/nullrod/armblade
|
||||
name = "dark blessing"
|
||||
|
||||
@@ -13,10 +13,6 @@
|
||||
if(client.handle_spam_prevention(msg, MUTE_PRAY, OOC_COOLDOWN))
|
||||
return
|
||||
|
||||
if(mind && !mind.canpray)
|
||||
to_chat(usr, "<span class='warning'>You cannot pray (atheist).</span>")
|
||||
return
|
||||
|
||||
var/image/cross = image('icons/obj/storage.dmi',"bible")
|
||||
var/font_color = "purple"
|
||||
var/prayer_type = "PRAYER"
|
||||
|
||||
Reference in New Issue
Block a user