From 8dbf3ceff62057900a006d5a0dabd33fb22f2076 Mon Sep 17 00:00:00 2001
From: Mykhailo Bykhovtsev <mikebykhovtsev@gmail.com>
Date: Mon, 5 Nov 2018 00:19:02 -0800
Subject: [PATCH] Diona and Synth bugfixes (#5546)

- Diona are no longer blind all the time. Fixes #5543
- Radium doesn't spam Diona with messages. Fixes #5544
- Synthetics like AI/cyborgs/PAI can now talk. Fixes #5516
---
 .../mob/living/carbon/human/human_helpers.dm  |  2 +-
 code/modules/mob/living/carbon/human/life.dm  |  2 +-
 code/modules/mob/living/silicon/say.dm        |  2 +-
 .../Chemistry-Reagents-Dispenser.dm           |  5 ++-
 html/changelogs/Sindorman-dionafixes.yml      | 39 +++++++++++++++++++
 5 files changed, 46 insertions(+), 4 deletions(-)
 create mode 100644 html/changelogs/Sindorman-dionafixes.yml

diff --git a/code/modules/mob/living/carbon/human/human_helpers.dm b/code/modules/mob/living/carbon/human/human_helpers.dm
index 44d46625c03..7248be69c7b 100644
--- a/code/modules/mob/living/carbon/human/human_helpers.dm
+++ b/code/modules/mob/living/carbon/human/human_helpers.dm
@@ -149,7 +149,7 @@
 		return null
 
 	var/obj/item/organ/O = internal_organs_by_name[species.vision_organ]
-	if (no_synthetic && O.status & ORGAN_ROBOT)
+	if (!istype(O, /obj/item/organ/eyes) || (no_synthetic && (O.status & ORGAN_ROBOT)))
 		return null
 
 	return O
diff --git a/code/modules/mob/living/carbon/human/life.dm b/code/modules/mob/living/carbon/human/life.dm
index b03d12fabb4..cca595d3efb 100644
--- a/code/modules/mob/living/carbon/human/life.dm
+++ b/code/modules/mob/living/carbon/human/life.dm
@@ -164,7 +164,7 @@
 	//Vision
 	var/obj/item/organ/vision
 	if(species.vision_organ)
-		vision = internal_organs_by_name[species.vision_organ]
+		vision = organs_by_name[species.vision_organ]
 
 	if (!vision)
 		if (species.vision_organ) // if they should have eyes but don't, they can't see
diff --git a/code/modules/mob/living/silicon/say.dm b/code/modules/mob/living/silicon/say.dm
index 0f2f4829b77..d03560d918d 100644
--- a/code/modules/mob/living/silicon/say.dm
+++ b/code/modules/mob/living/silicon/say.dm
@@ -19,7 +19,7 @@
 			speech_problem_flag = 1
 			message = Gibberish(message,damaged-10)
 
-	var/list/returns[3]
+	var/list/returns[4]
 	returns[1] = message
 	returns[2] = verb
 	returns[3] = speech_problem_flag
diff --git a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
index af1c97ea2e1..42bd7c02720 100644
--- a/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
+++ b/code/modules/reagents/Chemistry-Reagents/Chemistry-Reagents-Dispenser.dm
@@ -342,6 +342,7 @@
 	unaffected_species = IS_MACHINE
 
 	specific_heat = 0.220
+	var/message_shown = FALSE
 
 /datum/reagent/radium/affect_blood(var/mob/living/carbon/M, var/alien, var/removed)
 	M.apply_effect(10 * removed, IRRADIATE, blocked = 0) // Radium may increase your chances to cure a disease
@@ -349,7 +350,9 @@
 		M.adjustToxLoss(-20 * removed)
 		M.adjustBruteLoss(-20 * removed)
 		M.adjustFireLoss(-20 * removed)
-		to_chat(M, "<span class='notice'>You feel an extreme energy as your body regenerates faster.</span>")
+		if(!message_shown) // Not to spam message
+			to_chat(M, "<span class='notice'>You feel an extreme energy as your body regenerates faster.</span>")
+			message_shown = TRUE
 		return
 	if(M.virus2.len)
 		for(var/ID in M.virus2)
diff --git a/html/changelogs/Sindorman-dionafixes.yml b/html/changelogs/Sindorman-dionafixes.yml
new file mode 100644
index 00000000000..acfcd25180d
--- /dev/null
+++ b/html/changelogs/Sindorman-dionafixes.yml
@@ -0,0 +1,39 @@
+################################
+# Example Changelog File
+#
+# Note: This file, and files beginning with ".", and files that don't end in ".yml" will not be read. If you change this file, you will look really dumb.
+#
+# Your changelog will be merged with a master changelog. (New stuff added only, and only on the date entry for the day it was merged.)
+# When it is, any changes listed below will disappear.
+#
+# Valid Prefixes:
+#   bugfix
+#   wip (For works in progress)
+#   tweak
+#   soundadd
+#   sounddel
+#   rscadd (general adding of nice things)
+#   rscdel (general deleting of nice things)
+#   imageadd
+#   imagedel
+#   maptweak
+#   spellcheck (typo fixes)
+#   experiment
+#   balance
+#################################
+
+# Your name.
+author: PoZe
+
+# Optional: Remove this file after generating master changelog.  Useful for PR changelogs that won't get used again.
+delete-after: True
+
+# Any changes you've made.  See valid prefix list above.
+# INDENT WITH TWO SPACES.  NOT TABS.  SPACES.
+# SCREW THIS UP AND IT WON'T WORK.
+# Also, all entries are changed into a single [] after a master changelog generation. Just remove the brackets when you add new entries.
+# Please surround your changes in  double quotes ("), as certain characters otherwise screws up compiling. The quotes will not show up in the changelog.
+changes:
+  - bugfix: "Diona are no longer blind all the time."
+  - bugfix: "Radium no longer spams messages to Diona."
+  - bugfix: "Cyborgs, AI, PAI can now talk."