diff --git a/code/datums/organs/organ_external.dm b/code/datums/organs/organ_external.dm
index 74c28006266..b7ded52a4f1 100644
--- a/code/datums/organs/organ_external.dm
+++ b/code/datums/organs/organ_external.dm
@@ -357,23 +357,10 @@
owner << "\red You are now sterile."
if(HEAD)
H = new /obj/item/weapon/organ/head(owner.loc, owner)
- if(ishuman(owner))
- if(owner.gender == FEMALE)
- H.icon_state = "head_f"
- H.overlays += owner.generate_head_icon()
- H:transfer_identity(owner)
- H.pixel_x = -10
- H.pixel_y = 6
- H.name = "[owner.real_name]'s head"
-
owner.u_equip(owner.glasses)
owner.u_equip(owner.head)
owner.u_equip(owner.ears)
owner.u_equip(owner.wear_mask)
-
- owner.regenerate_icons()
-
- owner.death()
if(ARM_RIGHT)
H = new /obj/item/weapon/organ/r_arm(owner.loc, owner)
if(ismonkey(owner))
@@ -446,18 +433,17 @@
step(H,lol)
destspawn = 1
- if(status & ORGAN_ROBOT)
+ if(status & ORGAN_ROBOT && !no_explode)
owner.visible_message("\red \The [owner]'s [display_name] explodes violently!",\
"\red Your [display_name] explodes!",\
"You hear an explosion followed by a scream!")
- if(!no_explode)
- explosion(get_turf(owner),-1,-1,2,3)
- var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
- spark_system.set_up(5, 0, owner)
- spark_system.attach(owner)
- spark_system.start()
- spawn(10)
- del(spark_system)
+ explosion(get_turf(owner),-1,-1,2,3)
+ var/datum/effect/effect/system/spark_spread/spark_system = new /datum/effect/effect/system/spark_spread()
+ spark_system.set_up(5, 0, owner)
+ spark_system.attach(owner)
+ spark_system.start()
+ spawn(10)
+ del(spark_system)
else
owner.visible_message("\red [owner.name]'s [display_name] flies off in an arc.",\
"Your [display_name] goes flying off!",\
@@ -542,27 +528,6 @@
else
take_damage(damage, 0, 1, used_weapon = "EMP")
- proc/getDisplayName()
- switch(name)
- if("l_leg")
- return "left leg"
- if("r_leg")
- return "right leg"
- if("l_arm")
- return "left arm"
- if("r_arm")
- return "right arm"
- if("l_foot")
- return "left foot"
- if("r_foot")
- return "right foot"
- if("l_hand")
- return "left hand"
- if("r_hand")
- return "right hand"
- else
- return name
-
proc/robotize()
src.status &= ~ORGAN_BROKEN
src.status &= ~ORGAN_BLEEDING
@@ -743,11 +708,23 @@ obj/item/weapon/organ/head
var/mob/living/carbon/brain/brainmob
var/brain_op_stage = 0
-obj/item/weapon/organ/head/New()
+obj/item/weapon/organ/head/New(loc, mob/living/carbon/human/H)
..()
spawn(5)
if(brainmob && brainmob.client)
brainmob.client.screen.len = null //clear the hud
+ if(ishuman(H))
+ if(H.gender == FEMALE)
+ H.icon_state = "head_f"
+ H.overlays += H.generate_head_icon()
+ transfer_identity(H)
+ pixel_x = -10
+ pixel_y = 6
+ name = "[H.real_name]'s head"
+
+ H.regenerate_icons()
+
+ H.death()
obj/item/weapon/organ/head/proc/transfer_identity(var/mob/living/carbon/human/H)//Same deal as the regular brain proc. Used for human-->head
brainmob = new(src)
diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
index 46b7a8b4f36..3d97d7eb7cd 100755
--- a/code/game/objects/items/devices/PDA/PDA.dm
+++ b/code/game/objects/items/devices/PDA/PDA.dm
@@ -914,7 +914,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
user.show_message("\blue Localized Damage, Brute/Burn:",1)
if(length(damaged)>0)
for(var/datum/organ/external/org in damaged)
- user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.getDisplayName()),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
+ user.show_message(text("\blue \t []: []\blue-[]",capitalize(org.display_name),(org.brute_dam > 0)?"\red [org.brute_dam]":0,(org.burn_dam > 0)?"\red [org.burn_dam]":0),1)
else
user.show_message("\blue \t Limbs are OK.",1)
diff --git a/code/game/objects/items/devices/scanners.dm b/code/game/objects/items/devices/scanners.dm
index a0f4f202d90..6d8a77549f2 100644
--- a/code/game/objects/items/devices/scanners.dm
+++ b/code/game/objects/items/devices/scanners.dm
@@ -112,7 +112,7 @@ MASS SPECTROMETER
if(length(damaged)>0)
for(var/datum/organ/external/org in damaged)
user.show_message(text("\blue \t []: [][]\blue - []", \
- capitalize(org.getDisplayName()), \
+ capitalize(org.display_name), \
(org.brute_dam > 0) ? "\red [org.brute_dam]" :0, \
(org.status & ORGAN_BLEEDING)?"\red \[Bleeding\]":"\t", \
(org.burn_dam > 0) ? "[org.burn_dam]" :0),1)
@@ -146,7 +146,7 @@ MASS SPECTROMETER
var/mob/living/carbon/human/H = M
for(var/name in H.organs_by_name)
var/datum/organ/external/e = H.organs_by_name[name]
- var/limb = e.getDisplayName()
+ var/limb = e.display_name
if(e.status & ORGAN_BROKEN)
if(((e.name == "l_arm") || (e.name == "r_arm") || (e.name == "l_leg") || (e.name == "r_leg")) && (!(e.status & ORGAN_SPLINTED)))
user << "\red Unsecured fracture in subject [limb]. Splinting recommended for transport."
@@ -328,4 +328,4 @@ MASS SPECTROMETER
name = "advanced mass-spectrometer"
icon_state = "adv_spectrometer"
details = 1
- origin_tech = "magnets=4;biotech=2"
+ origin_tech = "magnets=4;biotech=2"
diff --git a/code/modules/mob/living/carbon/carbon.dm b/code/modules/mob/living/carbon/carbon.dm
index 8f8fe88145a..7eca9638fc5 100644
--- a/code/modules/mob/living/carbon/carbon.dm
+++ b/code/modules/mob/living/carbon/carbon.dm
@@ -188,7 +188,7 @@
status = "MISSING!"
if(status == "")
status = "OK"
- src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.getDisplayName(),status),1)
+ src.show_message(text("\t []My [] is [].",status=="OK"?"\blue ":"\red ",org.display_name,status),1)
if((SKELETON in H.mutations) && (!H.w_uniform) && (!H.wear_suit))
H.play_xylophone()
else