Merge pull request #191 from SkyMarshal/master

Nuclear revamp, full details in description.

code/modules/mob/living/carbon/human/emote.dm

@@ -15,6 +15,9 @@
 
 	if(src.stat == 2.0 && (act != "deathgasp"))
 		return
+	if(src.stat != 2.0 && act == "deathgasp" && !src.mind.special_role == "Syndicate")
+		src << "You are not dead.  No."
+		return
 	switch(act)
 		if ("airguitar")
 			if (!src.restrained())
@@ -461,6 +464,18 @@
 				message = "<B>[src]</B> makes a very loud noise."
 				m_type = 2
 
+		if ("hungry")
+			if(prob(1))
+				message = "<B>Blue Elf</B> needs food Badly."
+			else
+				message = "<B>[src]'s</B> stomach growls."
+
+		if ("thirsty")
+			if(prob(1))
+				message = "<B>[src]</B> cancels destory station: Drinking."
+			else
+				message = "<B>[src]</B> looks thirsty."
+
 		if ("help")
 			src << "blink, blink_r, blush, bow-(none)/mob, burp, choke, chuckle, clap, collapse, cough,\ncry, custom, deathgasp, drool, eyebrow, frown, gasp, giggle, groan, grumble, handshake, hug-(none)/mob, glare-(none)/mob,\ngrin, laugh, look-(none)/mob, moan, mumble, nod, pale, point-atom, raise, salute, shake, shiver, shrug,\nsigh, signal-#1-10, smile, sneeze, sniff, snore, stare-(none)/mob, tremble, twitch, twitch_s, whimper,\nwink, yawn"
 

code/modules/mob/living/say.dm

@@ -318,6 +318,13 @@
 
 	for (var/mob/M in W)
 		W |= M.contents
+		if(ishuman(M))
+			var/mob/living/carbon/human/G = M
+			for(var/datum/organ/external/F in G.organs)
+				W |= F.implant
+
+	for (var/obj/item/device/pda/M in W)
+		W |= M.contents
 
 	for (var/obj/O in W) //radio in pocket could work, radio in backpack wouldn't --rastaf0
 		spawn (0)

code/modules/mob/living/silicon/robot/robot.dm

@@ -142,7 +142,7 @@
 			channels = list()
 
 	overlays -= "eyes" //Takes off the eyes that it started with
-	radio.borg(src, channels)
+	radio.config(channels)
 	updateicon()
 
 /mob/living/silicon/robot/verb/cmd_robot_alerts()
@@ -959,7 +959,7 @@ Frequency:
 	icon_state = "robot"
 	updateicon()
 	channels = list()
-	radio.borg(src, channels)
+	radio.config(channels)
 	uneq_all()
 	del(module)
 

code/modules/mob/organ/organ.dm

@@ -29,6 +29,7 @@
 		max_damage = 0
 		wound_size = 0
 		max_size = 0
+	var/obj/item/weapon/implant/implant = null
 
 
 	proc/take_damage(brute, burn)