Reverting registered_name change. Reverting area name changes. Reverts Plasma Steel and object changes.

This commit is contained in:
Ren Erthilo
2012-03-26 15:47:39 +01:00
parent 024f1abd2a
commit 470d767369
33 changed files with 142 additions and 115 deletions
@@ -94,7 +94,7 @@
var/obj/item/device/pda/pda = src:wear_id
id = pda.owner
else
id = src.wear_id.registered
id = src.wear_id.registered_name
// if (src.wear_id.PHOTO)
// photo = 1
if (id != src.real_name && in_range(src, usr))
@@ -1110,8 +1110,8 @@
if (wear_id)
if (istype(wear_id, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/id = wear_id
if (id.registered)
name = id.registered
if (id.registered_name)
name = id.registered_name
else
name = "Unknown"
else if (istype(wear_id, /obj/item/device/pda))
@@ -1126,8 +1126,8 @@
if (wear_id)
if (istype(wear_id, /obj/item/weapon/card/id))
var/obj/item/weapon/card/id/id = wear_id
if (id.registered != real_name)
name = "[real_name] (as [id.registered])"
if (id.registered_name != real_name)
name = "[real_name] (as [id.registered_name])"
else if (istype(wear_id, /obj/item/device/pda))
@@ -1239,7 +1239,7 @@
return
//TG Simple Animal
/mob/living/carbon/human/attack_animal(mob/living/simple_animal/M as mob)
if(M.melee_damage_upper == 0)
M.emote("[M.friendly] [src]")
@@ -2333,11 +2333,11 @@ It can still be worn/put on as normal.
var/obj/item/weapon/card/id/id = wear_id
if (istype(pda))
if (pda.id)
. = pda.id.registered
. = pda.id.registered_name
else
. = pda.owner
else if (istype(id))
. = id.registered
. = id.registered_name
else
return if_no_id
return
@@ -2350,7 +2350,7 @@ It can still be worn/put on as normal.
if (istype(pda))
. = pda.owner
else if (istype(id))
. = id.registered
. = id.registered_name
else
return if_no_id
return
+1 -1
View File
@@ -13,7 +13,7 @@
client.images += image(tempHud,perp,"hud[ckey(perp:wear_id:GetJobName())]")
var/perpname = "wot"
if(istype(perp.wear_id,/obj/item/weapon/card/id))
perpname = perp.wear_id:registered
perpname = perp.wear_id:registered_name
else if(istype(perp.wear_id,/obj/item/device/pda))
var/obj/item/device/pda/tempPda = perp.wear_id
perpname = tempPda.owner