diff --git a/code/modules/mob/living/carbon/human/human_damage.dm b/code/modules/mob/living/carbon/human/human_damage.dm
index d0969503796..63f9461e06b 100644
--- a/code/modules/mob/living/carbon/human/human_damage.dm
+++ b/code/modules/mob/living/carbon/human/human_damage.dm
@@ -38,7 +38,6 @@
var/obj/item/organ/brain/sponge = internal_organs_by_name["brain"]
if(sponge)
sponge.take_damage(amount)
- sponge.damage = min(max(sponge.damage, 0),(maxHealth*2))
brainloss = sponge.damage
else
brainloss = 200
diff --git a/code/modules/nano/nanoui.dm b/code/modules/nano/nanoui.dm
index 7d5ebc18868..150f45e9518 100644
--- a/code/modules/nano/nanoui.dm
+++ b/code/modules/nano/nanoui.dm
@@ -347,7 +347,7 @@ nanoui is used to open and update nano browser uis
template_data_json = list2json(templates)
var/list/send_data = get_send_data(initial_data)
- var/initial_data_json = replacetext(list2json_usecache(send_data), "'", "'")
+ var/initial_data_json = replacetext(replacetext(list2json_usecache(send_data), """, """), "'", "'")
var/url_parameters_json = list2json(list("src" = "\ref[src]"))
diff --git a/code/modules/organs/organ.dm b/code/modules/organs/organ.dm
index 01b95c09ddf..7dff264aa53 100644
--- a/code/modules/organs/organ.dm
+++ b/code/modules/organs/organ.dm
@@ -178,16 +178,18 @@ var/list/organ_cache = list()
W.damage += damage
W.time_inflicted = world.time
+//Note: external organs have their own version of this proc
/obj/item/organ/proc/take_damage(amount, var/silent=0)
- if(src.robotic == 2)
- src.damage += (amount * 0.8)
+ if(src.status & ORGAN_ROBOT)
+ src.damage = between(0, src.damage + (amount * 0.8), max_damage)
else
- src.damage += amount
+ src.damage = between(0, src.damage + amount, max_damage)
- if(owner && parent_organ)
- var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
- if(parent && !silent)
- owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
+ //only show this if the organ is not robotic
+ if(owner && parent_organ && amount > 0)
+ var/obj/item/organ/external/parent = owner.get_organ(parent_organ)
+ if(parent && !silent)
+ owner.custom_pain("Something inside your [parent.name] hurts a lot.", 1)
/obj/item/organ/proc/robotize() //Being used to make robutt hearts, etc
robotic = 2
diff --git a/code/modules/research/rdconsole.dm b/code/modules/research/rdconsole.dm
index 25914feb81d..7c67f22cf7b 100644
--- a/code/modules/research/rdconsole.dm
+++ b/code/modules/research/rdconsole.dm
@@ -771,7 +771,7 @@ won't update every console in existence) but it's more of a hassle to do. Also,
dat += "Disconnect from Research Network
"
dat += "Device Linkage Menu
"
dat += "Lock Console
"
- if(check_rights(R_ADMIN))
+ if(check_rights(R_ADMIN,0))
dat += "\[ADMIN\] Maximize Research Levels
"
dat += "Reset R&D Database"