TG: Fixes a pesky compile error in my last commit.

Revision: r3756
Author: 	 vageyenaman

baystation12.dme

@@ -699,6 +699,7 @@
 #include "code\game\objects\devices\shields.dm"
 #include "code\game\objects\devices\taperecorder.dm"
 #include "code\game\objects\devices\PDA\cart.dm"
+#include "code\game\objects\devices\PDA\chatroom.dm"
 #include "code\game\objects\devices\PDA\PDA.dm"
 #include "code\game\objects\devices\PDA\radio.dm"
 #include "code\game\objects\items\apc_frame.dm"

code/game/objects/devices/PDA/chatroom.dm

@@ -0,0 +1,16 @@
+var/list/chatrooms = list()
+
+/datum/chatroom
+	var/name = "Generic Chatroom"
+	var/list/logged_in = list()
+	var/list/logs = list() // chat logs
+	var/list/banned = list() // banned users
+	var/list/whitelist = list() // whitelisted users
+	var/list/muted = list()
+	var/topic = "" // topic message for the chatroom
+	var/password = "" // blank for no password.
+	var/operator = "" // name of the operator
+
+/datum/chatroom/proc/attempt_connect(var/obj/item/device/pda/device, var/obj/password)
+	if(!device)
+		return

code/game/objects/items/weapons/grenades.dm

@@ -232,7 +232,6 @@ CRITTER GRENADE
 		else
 			if (M.ear_damage >= 5)
 				M << "\red Your ears start to ring!"
-		M.update_icons()
 
 	prime()													// Prime now just handles the two loops that query for people in lockers and people who can see it.
 		var/turf/T = get_turf(src)

code/modules/critters/critters.dm

@@ -253,3 +253,36 @@
 	atkcarbon = 1
 	atksilicon = 1
 	attacktext = "bites"
+
+
+
+// We can maybe make these controllable via some console or something
+/obj/effect/critter/manhack
+	name = "viscerator"
+	desc = "A small, twin-bladed machine capable of inflicting very deadly lacerations."
+	icon_state = "viscerator"
+	pass_flags = PASSTABLE
+	health = 15
+	max_health = 15
+	aggressive = 1
+	opensdoors = 1
+	defensive = 1
+	wanderer = 1
+	atkcarbon = 1
+	atksilicon = 1
+	atkmech = 1
+	firevuln = 0 // immune to fire
+	brutevuln = 1
+	ventcrawl = 1
+	melee_damage_lower = 10
+	melee_damage_upper = 15
+	attacktext = "cuts"
+	attack_sound = 'bladeslice.ogg'
+	chasestate = "viscerator_attack"
+	deathtext = "is smashed into pieces!"
+
+	Die()
+		..()
+		for(var/mob/O in viewers(src, null))
+			O.show_message("\red <b>[src]</b> is smashed into pieces!", 1)
+		del(src)

code/modules/research/message_server.dm

@@ -1,9 +1,12 @@
+var/global/list/obj/machinery/message_server/message_servers = list()
+
 /datum/data_pda_msg
 	var/recipient = "Unspecified" //name of the person
 	var/sender = "Unspecified" //name of the sender
 	var/message = "Blank" //transferred message
 
 /datum/data_pda_msg/New(var/param_rec = "",var/param_sender = "",var/param_message = "")
+
 	if(param_rec)
 		recipient = param_rec
 	if(param_sender)
@@ -53,14 +56,35 @@
 
 	var/list/datum/data_pda_msg/pda_msgs = list()
 	var/list/datum/data_rc_msg/rc_msgs = list()
-
 	var/active = 1
+	var/decryptkey = "password"
+
+/obj/machinery/message_server/New()
+	message_servers += src
+	decryptkey = GenerateKey()
+	send_pda_message("System Administrator", "system", "This is an automated message. The messaging system is functioning correctly.")
+	..()
+	return
+
+/obj/machinery/message_server/Del()
+	message_servers -= src
+	..()
+	return
+
+/obj/machinery/message_server/proc/GenerateKey()
+	//Feel free to move to Helpers.
+	var/newKey
+	newKey += pick("the", "if", "of", "as", "in", "a", "you", "from", "to", "an", "too", "little", "snow", "dead", "drunk", "rosebud", "duck", "al", "le")
+	newKey += pick("diamond", "beer", "mushroom", "assistant", "clown", "captain", "twinkie", "security", "nuke", "small", "big", "escape", "yellow", "gloves", "monkey", "engine", "nuclear", "ai")
+	newKey += pick("1", "2", "3", "4", "5", "6", "7", "8", "9", "0")
+	return newKey
 
 /obj/machinery/message_server/process()
+	//if(decryptkey == "password")
+	//	decryptkey = generateKey()
 	if((stat & (BROKEN|NOPOWER)) && active)
 		active = 0
 		return
-
 	update_icon()
 	return