Merge fixes for NOCLONE, attack logs and map changes.

This commit is contained in:
Ren Erthilo
2012-03-30 06:46:01 +01:00
parent 7cf7c7775a
commit 321f16eccb
3 changed files with 10 additions and 8 deletions
+1 -1
View File
@@ -871,7 +871,7 @@
var/mob/occupant = src.connected.occupant
dat = "<font color='blue'><B>Occupant Statistics:</B></FONT><BR>" //Blah obvious
if(occupant && occupant.dna) //is there REALLY someone in there?
if(occupant.mutations & NOCLONE)
if(occupant.mutations2 & NOCLONE)
dat += "The occupant's DNA structure is ruined beyond recognition, please insert a subject with an intact DNA structure.<BR><BR>" //NOPE. -Pete
dat += text("<A href='?src=\ref[];buffermenu=1'>View/Edit/Transfer Buffer</A><BR><BR>", src)
dat += text("<A href='?src=\ref[];radset=1'>Radiation Emitter Settings</A><BR><BR>", src)
+2
View File
@@ -16,6 +16,8 @@
return ..()
M.attack_log += text("\[[time_stamp()]\] <font color='orange'>Has had their soul captured with [src.name] by [user.name] ([user.ckey])</font>")
user.attack_log += text("\[[time_stamp()]\] <font color='red'>Used the [src.name] to capture the soul of [M.name] ([M.ckey])</font>")
log_admin("ATTACK: [user] ([user.ckey]) captured the soul of [M] ([M.ckey]).")
message_admins("ATTACK: [user] ([user.ckey]) captured the soul of [M] ([M.ckey]).")
transfer_soul("VICTIM", M, user)
return