From 4d2c3ffe64c121c483590cc50d6b290487e58c9f Mon Sep 17 00:00:00 2001 From: panurgomatic Date: Sat, 5 Mar 2011 03:25:21 +0000 Subject: [PATCH] - Fixed religion naming issue - Fixed bible healing message reporting wrong deity. - Small tweaks to improve code readability. git-svn-id: http://tgstation13.googlecode.com/svn/trunk@1160 316c924e-a436-60f5-8080-3fe189b3f50e --- code/game/jobs/jobprocs.dm | 10 +++++----- code/game/mecha/mecha.dm | 2 +- code/game/mecha/mecha_control_console.dm | 2 +- code/game/objects/storage/bible.dm | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/code/game/jobs/jobprocs.dm b/code/game/jobs/jobprocs.dm index 8428eaef84c..046f74adb63 100644 --- a/code/game/jobs/jobprocs.dm +++ b/code/game/jobs/jobprocs.dm @@ -290,11 +290,11 @@ if (new_religion) if (length(new_religion) >= 26) new_religion = copytext(new_religion, 1, 26) - new_religion = dd_replacetext(new_religion, ">", "'") - if(new_religion == "Imperium") - B.name = "Uplifting Primer" - else - B.name = "The Holy Book of [new_religion]" + new_religion = dd_replacetext(new_religion, ">", "'") + if(new_religion == "Imperium") + B.name = "Uplifting Primer" + else + B.name = "The Holy Book of [new_religion]" spawn(1) var/deity_name = "Emperor" diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm index 78185a95aa0..f9565e1b0ca 100644 --- a/code/game/mecha/mecha.dm +++ b/code/game/mecha/mecha.dm @@ -578,7 +578,7 @@ set name = "Move Inside" set src in oview(1) - if (usr.stat != 0 || !istype(usr, /mob/living/carbon/human)) + if (usr.stat || !ishuman(usr)) return src.log_message("[usr] tries to move in.") if (src.occupant) diff --git a/code/game/mecha/mecha_control_console.dm b/code/game/mecha/mecha_control_console.dm index 2c394070f33..330f82fcd9d 100644 --- a/code/game/mecha/mecha_control_console.dm +++ b/code/game/mecha/mecha_control_console.dm @@ -90,7 +90,7 @@ icon_state = "motion2" proc/get_mecha_info() - if(!istype(src.loc, /obj/mecha)) + if(!in_mecha()) return 0 var/obj/mecha/M = src.loc var/cell_charge = M.get_charge() diff --git a/code/game/objects/storage/bible.dm b/code/game/objects/storage/bible.dm index 63cbdb8f0e4..c0b8d54e637 100644 --- a/code/game/objects/storage/bible.dm +++ b/code/game/objects/storage/bible.dm @@ -53,7 +53,7 @@ bless(M) for(var/mob/O in viewers(M, null)) O.show_message(text("\red [] heals [] with the power of [src.deity_name]!", user, M), 1) - M << "\red May the power of Christ compel you to be healed!" + M << "\red May the power of [src.deity_name] compel you to be healed!" playsound(src.loc, "punch", 25, 1, -1) else if(ishuman(M) && !istype(M:head, /obj/item/clothing/head/helmet))