mirror of
https://github.com/ParadiseSS13/Paradise.git
synced 2026-08-22 19:47:22 +01:00
Merge fixes for NOCLONE, attack logs and map changes.
This commit is contained in:
+1
-1
@@ -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)
|
||||
|
||||
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user