cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2025-12-29 03:32:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #10340 from Kyep/chaplain_1

Browse Source 
Chaplain tweaks
This commit is contained in:
variableundefined
2018-11-29 14:22:03 +08:00
committed by GitHub
parent e0470a2d84 a65f8b690b
commit 00a0acb2ec
14 changed files with 167 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
code/modules/admin/verbs/pray.dm
View File

@@ -3,7 +3,8 @@
set name = "Pray"
msg = sanitize(copytext(msg, 1, MAX_MESSAGE_LEN))
if(!msg) return
if(!msg)
return
if(usr.client)
if(usr.client.prefs.muted & MUTE_PRAY)
@@ -29,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])" : ""]:</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))

1
code/modules/response_team/ert.dm
View File

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

9
code/modules/response_team/ert_outfits.dm
View File

@@ -146,7 +146,7 @@
/obj/item/organ/internal/cyberimp/chest/nutriment,
/obj/item/organ/internal/cyberimp/eyes/hud/security
)
backpack_contents = list(
/obj/item/clothing/head/helmet/space/hardsuit/ert/security = 1,
/obj/item/clothing/mask/gas/sechailer = 1,
@@ -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/seclite = 1
/obj/item/storage/box/zipties = 1
)
/datum/outfit/job/centcom/response_team/paranormal/amber
@@ -395,7 +394,7 @@
suit = /obj/item/clothing/suit/space/hardsuit/ert/paranormal/inquisitor
head = /obj/item/clothing/head/helmet/space/hardsuit/ert/paranormal/inquisitor
suit_store = /obj/item/gun/energy/gun
r_pocket = /obj/item/nullrod
r_pocket = /obj/item/nullrod/ert
glasses = /obj/item/clothing/glasses/sunglasses
cybernetic_implants = list(
@@ -411,7 +410,7 @@
l_pocket = /obj/item/grenade/clusterbuster/holy
shoes = /obj/item/clothing/shoes/magboots/advance
glasses = /obj/item/clothing/glasses/night
r_pocket = /obj/item/nullrod
r_pocket = /obj/item/nullrod/ert
cybernetic_implants = list(
/obj/item/organ/internal/cyberimp/chest/nutriment/plus,

4
code/modules/surgery/organs/vocal_cords.dm
View File

@@ -136,8 +136,8 @@ var/static/regex/multispin_words = regex("like a record baby")
var/power_multiplier = base_multiplier
if(owner.mind)
//Chaplains are very good at speaking with the voice of god
if(owner.mind.assigned_role == "Chaplain")
//Holy characters are very good at speaking with the voice of god
if(owner.mind.isholy)
power_multiplier *= 2
//Command staff has authority
if(owner.mind.assigned_role in command_positions)