-Fixed issue 913

You'll have to write the name on the paper itself now.

-Fixed issue 912
-Fixed issue 909
Also, Cyborgs without names are called "Default Cyborgs". 

-Fixed issue 908

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@4680 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
giacomand@gmail.com
2012-09-12 08:57:30 +00:00
parent 9b78786611
commit 1d72e3c4e9
7 changed files with 31 additions and 23 deletions
+2 -2
View File
@@ -377,8 +377,8 @@ var/list/sacrificed = list()
"\red You hear liquid flowing.")
D.real_name = "Unknown"
for(var/obj/item/weapon/paper/P in this_rune.loc)
if(length(P.name)<=24)
D.real_name = P.name
if(P.info)
D.real_name = copytext(P.info, 1, MAX_NAME_LEN)
break
D.universal_speak = 1
D.nodamage = 0
@@ -42,6 +42,7 @@
if(iswelder(W))
if(weld(W, user))
user << "You weld the assembly securely into place."
anchored = 1
state = 2
return
@@ -67,6 +68,7 @@
if(weld(W, user))
user << "You unweld the assembly from it's place."
state = 1
anchored = 1
return
@@ -96,14 +98,14 @@
else if(iswirecutter(W))
new/obj/item/weapon/cable_coil(src.loc, 2)
new/obj/item/weapon/cable_coil(get_turf(src), 2)
playsound(src.loc, 'sound/items/Wirecutter.ogg', 50, 1)
user << "You cut the wires from the circuits."
state = 2
return
// Upgrades!
if(is_type_in_list(W, possible_upgrades))
if(is_type_in_list(W, possible_upgrades) && !is_type_in_list(W, upgrades)) // Is a possible upgrade and isn't in the camera already.
user << "You attach the [W] into the assembly inner circuits."
upgrades += W
user.drop_item(W)
@@ -116,7 +118,7 @@
if(U)
user << "You unattach an upgrade from the assembly."
playsound(src.loc, 'sound/items/Crowbar.ogg', 50, 1)
U.loc = src.loc
U.loc = get_turf(src)
upgrades -= U
return
+3 -3
View File
@@ -66,7 +66,7 @@
var/obj/item/robot_parts/r_leg/r_leg = null
var/obj/item/robot_parts/chest/chest = null
var/obj/item/robot_parts/head/head = null
var/created_name = "Cyborg"
var/created_name = ""
/obj/item/robot_parts/robot_suit/New()
..()
@@ -194,8 +194,8 @@
user.drop_item()
O.invisibility = 0
O.name = created_name
O.real_name = created_name
O.custom_name = created_name
O.updatename("Default")
M.brainmob.mind.transfer_to(O)
@@ -33,8 +33,7 @@
del(R.module)
R.module = null
R.modtype = "robot"
R.real_name = "Cyborg [R.ident]"
R.name = R.real_name
R.updatename("Default")
R.nopush = 0
R.updateicon()