Merge pull request #1664 from silveryferret/death_alarm_change

Changes Death Alarm

code/game/objects/items/weapons/implants/implant.dm

@@ -417,22 +417,26 @@ the implant may become unstable and either pre-maturely inject the subject or si
 		var/area/t = get_area(M)
 		switch (cause)
 			if("death")
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
 				if(istype(t, /area/syndicate_station) || istype(t, /area/syndicate_mothership) || istype(t, /area/shuttle/syndicate_elite) )
 					//give the syndies a bit of stealth
-					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm")
+					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm", "Security")
+					a.autosay("[mobname] has died in Space!", "[mobname]'s Death Alarm", "Medical")
 				else
-					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm")
+					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm", "Security")
+					a.autosay("[mobname] has died in [t.name]!", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 				processing_objects.Remove(src)
 			if ("emp")
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
 				var/name = prob(50) ? t.name : pick(teleportlocs)
-				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm")
+				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Security")
+				a.autosay("[mobname] has died in [name]!", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 			else
-				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset(null)
+				var/obj/item/device/radio/headset/a = new /obj/item/device/radio/headset/heads/captain(null)
-				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm")
+				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Security")
+				a.autosay("[mobname] has died-zzzzt in-in-in...", "[mobname]'s Death Alarm", "Medical")
 				qdel(a)
 				processing_objects.Remove(src)
 

html/changelogs/SilveryFerret-PR-1664.yml

@@ -0,0 +1,36 @@
+################################
+# 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
+#################################
+
+# Your name.  
+author: SilveryFerret
+
+# 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: 
+  - rscadd: "Changes the Death Alarms from announcing over Common channel, to announcing only over Medical and Security channels."