Merge pull request #810 from Citadel-Station-13/upstream-merge-26991

[MIRROR] Follow links on adamantine vocal cords now work
2017-05-17 11:05:10 -04:00
parent da2fc1da0d 7b41f8cd55
commit 5b1fc3194d
2 changed files with 11 additions and 1 deletions
@@ -51,7 +51,7 @@
 			if(C.getorganslot("adamantine_resonator"))
 				to_chat(C, msg)
 		if(isobserver(m))
-			var/link = FOLLOW_LINK(m, src)
+			var/link = FOLLOW_LINK(m, owner)
 			to_chat(m, "[link] [msg]")

 //Colossus drop, forces the listeners to obey certain commands
@@ -0,0 +1,10 @@
+diff a/code/modules/surgery/organs/vocal_cords.dm b/code/modules/surgery/organs/vocal_cords.dm	(rejected hunks)
+@@ -51,7 +51,7 @@
+ 			if(C.getorganslot("adamantine_resonator"))
+ 				to_chat(C, msg)
+ 		if(isobserver(m))
+-			var/link = FOLLOW_LINK(m, src)
+			var/link = FOLLOW_LINK(m, owner)
+ 			to_chat(m, "[link] [msg]")
+ 
+ //Colossus drop, forces the listeners to obey certain commands