Revert "12/21 modernizations from TG live"
This commit is contained in:
@@ -4,8 +4,8 @@
|
||||
//Note that this proc does NOT do MMI related stuff!
|
||||
/mob/proc/change_mob_type(new_type = null, turf/location = null, new_name = null as text, delete_old_mob = 0 as num)
|
||||
|
||||
if(isnewplayer(src))
|
||||
usr << "<span class='danger'>Cannot convert players who have not entered yet.</span>"
|
||||
if(istype(src,/mob/new_player))
|
||||
usr << "<span class='danger'>cannot convert players who have not entered yet.</span>"
|
||||
return
|
||||
|
||||
if(!new_type)
|
||||
@@ -18,8 +18,8 @@
|
||||
usr << "Invalid type path (new_type = [new_type]) in change_mob_type(). Contact a coder."
|
||||
return
|
||||
|
||||
if(ispath(new_type, /mob/new_player))
|
||||
usr << "<span class='danger'>Cannot convert into a new_player mob type.</span>"
|
||||
if( new_type == /mob/new_player )
|
||||
usr << "<span class='danger'>cannot convert into a new_player mob type.</span>"
|
||||
return
|
||||
|
||||
var/mob/M
|
||||
@@ -50,7 +50,7 @@
|
||||
client.prefs.copy_to(H)
|
||||
H.dna.update_dna_identity()
|
||||
|
||||
if(mind && isliving(M))
|
||||
if(mind && istype(M, /mob/living))
|
||||
mind.transfer_to(M, 1) // second argument to force key move to new mob
|
||||
else
|
||||
M.key = key
|
||||
|
||||
Reference in New Issue
Block a user