- 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
This commit is contained in:
panurgomatic
2011-03-05 03:25:21 +00:00
parent 7b1caa58b5
commit 4d2c3ffe64
4 changed files with 8 additions and 8 deletions
+5 -5
View File
@@ -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"
+1 -1
View File
@@ -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)
+1 -1
View File
@@ -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()
+1 -1
View File
@@ -53,7 +53,7 @@
bless(M)
for(var/mob/O in viewers(M, null))
O.show_message(text("\red <B>[] heals [] with the power of [src.deity_name]!</B>", 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))