cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-07-12 15:45:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
code/WorkInProgress/Cael_Aislinn/Tajara/examine.dm
+1 -1
View File
@@ -86,7 +86,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))
code/WorkInProgress/Cael_Aislinn/Tajara/tajaran.dm
+4 -4
View File
@@ -344,8 +344,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))
@@ -360,8 +360,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))