Possibly the finishing touches to the telecomms prototype. They will be included in the game soon-ish.

Some work on critters. Added a new critter type: the VISCERATORS. (http://dl.dropbox.com/u/10657252/SS13/Manhacks.PNG) Includes a small new audio file. They'll probably be created with a traitor item or a box-o-hacks in the armory.



git-svn-id: http://tgstation13.googlecode.com/svn/trunk@2932 316c924e-a436-60f5-8080-3fe189b3f50e

code/modules/critters/critter.dm

@@ -21,6 +21,8 @@
 		wanderer = 1
 	//Will open doors it bumps ignoring access
 		opensdoors = 0
+	//Will randomly travel through vents
+		ventcrawl = 0
 
 	//Internal tracking ignore
 		frustration = 0
@@ -32,6 +34,10 @@
 		target = null
 		oldtarget_name = null
 		target_lastloc = null
+
+		thinkspeed  = 15
+		chasespeed  = 4
+		wanderspeed = 10
 		//The last guy who attacked it
 		attacker = null
 		//Will not attack this thing
@@ -47,6 +53,11 @@
 		atksame = 0
 		atkmech = 0
 
+		//Attacks syndies/traitors (distinguishes via mind)
+		atksynd = 1
+		//Attacks things NOT in its obj/req_access list
+		atkreq = 0
+
 	//Damage multipliers
 		brutevuln = 1
 		firevuln = 1
@@ -59,7 +70,10 @@
 		//Basic attack message when they move to attack and attack
 		angertext = "charges at"
 		attacktext = "attacks"
+		deathtext = "dies!"
 
+		chasestate = null // the icon state to use when attacking or chasing a target
+		attackflick = null // the icon state to flick when it attacks
 		attack_sound = null // the sound it makes when it attacks!
 
 		attack_speed = 25 // delay of attack

code/modules/critters/critter_AI.dm

@@ -13,7 +13,7 @@
 			if("thinking")
 				src.attack = 0
 				src.target = null
-				sleep(15)
+				sleep(thinkspeed)
 				walk_to(src,0)
 				if (src.aggressive) seek_target()
 				if (src.wanderer && !src.target) src.task = "wandering"
@@ -29,11 +29,13 @@
 						var/mob/living/carbon/M = src.target
 						ChaseAttack()
 						src.task = "attacking"
+						if(chasestate)
+							icon_state = chasestate
 						src.anchored = 1
 						src.target_lastloc = M.loc
 					else
 						var/turf/olddist = get_dist(src, src.target)
-						walk_to(src, src.target,1,4)
+						walk_to(src, src.target,1,chasespeed)
 						if ((get_dist(src, src.target)) >= (olddist))
 							src.frustration++
 						else
@@ -45,6 +47,8 @@
 				if ((get_dist(src, src.target) > 1) || ((src.target:loc != src.target_lastloc)))
 					src.anchored = 0
 					src.task = "chasing"
+					if(chasestate)
+						icon_state = chasestate
 				else
 					if (get_dist(src, src.target) <= 1)
 						var/mob/living/carbon/M = src.target
@@ -58,20 +62,25 @@
 							src.attacking = 0
 						else
 							if(M!=null)
-								if(M.health < 0)
-									src.task = "thinking"
-									src.target = null
-									src.anchored = 0
-									src.last_found = world.time
-									src.frustration = 0
-									src.attacking = 0
+								if(ismob(src.target))
+									if(M.health < 0)
+										src.task = "thinking"
+										src.target = null
+										src.anchored = 0
+										src.last_found = world.time
+										src.frustration = 0
+										src.attacking = 0
 					else
 						src.anchored = 0
 						src.attacking = 0
 						src.task = "chasing"
+						if(chasestate)
+							icon_state = chasestate
 			if("wandering")
+				if(chasestate)
+					icon_state = initial(icon_state)
 				patrol_step()
-				sleep(10)
+				sleep(wanderspeed)
 		spawn(8)
 			process()
 		return
@@ -112,29 +121,57 @@
 			if (src.target)
 				src.task = "chasing"
 				break
+
+			// Ignore syndicates and traitors if specified
+			if(!atksynd && C.mind)
+				var/datum/mind/synd_mind = C.mind
+				if( synd_mind.special_role == "Syndicate" || synd_mind.special_role == "traitor" )
+					continue
 			if((C.name == src.oldtarget_name) && (world.time < src.last_found + 100)) continue
 			if(istype(C, /mob/living/carbon/) && !src.atkcarbon) continue
 			if(istype(C, /mob/living/silicon/) && !src.atksilicon) continue
+			if(atkreq)
+				if(src.allowed(C)) continue
 			if(C.health < 0) continue
 			if(istype(C, /mob/living/carbon/) && src.atkcarbon)	src.attack = 1
 			if(istype(C, /mob/living/silicon/) && src.atksilicon)	src.attack = 1
+			if(atkreq)
+				if(!src.allowed(C)) src.attack = 1
 			if(src.attack)
 				T = C
 				break
 
 		if(!src.attack)
 			for(var/obj/effect/critter/C in view(src.seekrange,src))
-				if(istype(C, /obj/effect/critter) && !src.atkcritter) continue
-				if(istype(C, /obj/mecha) && !src.atkmech) continue
+				if(!src.atkcritter) continue
 				if(C.health <= 0) continue
-				if(istype(C, /obj/effect/critter) && src.atkcritter)
+				if(src.atkcritter)
 					if((istype(C, src.type) && !src.atksame) || (C == src))	continue
 					src.attack = 1
-				if(istype(C, /obj/mecha) && src.atkmech)	src.attack = 1
 				if(src.attack)
 					T = C
 					break
 
+			if(!src.attack)
+				for(var/obj/mecha/C in view(src.seekrange,src))
+					if(!C.occupant) continue
+
+					if(atkreq && C.occupant)
+						if(src.allowed(C.occupant)) continue
+
+					if(!atksynd && C.occupant)
+						if(C.occupant.mind)
+							var/datum/mind/synd_mind = C.occupant.mind
+							if( synd_mind.special_role == "Syndicate" || synd_mind.special_role == "traitor" )
+								continue
+
+					if(!src.atkmech) continue
+					if(C.health <= 0) continue
+					if(src.atkmech)	src.attack = 1
+					if(src.attack)
+						T = C
+						break
+
 		if(src.attack)
 			src.target = T
 			src.oldtarget_name = T:name
@@ -150,10 +187,11 @@
 
 	RunAttack()
 		src.attacking = 1
-		for(var/mob/O in viewers(src, null))
-			O.show_message("\red <B>[src]</B> [src.attacktext] [src.target]!", 1)
 		if(ismob(src.target))
 
+			for(var/mob/O in viewers(src, null))
+				O.show_message("\red <B>[src]</B> [src.attacktext] [src.target]!", 1)
+
 			var/damage = rand(melee_damage_lower, melee_damage_upper)
 
 			if(istype(target, /mob/living/carbon/human))
@@ -172,7 +210,8 @@
 
 		if(isobj(src.target))
 			if(istype(target, /obj/mecha))
-				src.target:take_damage(rand(melee_damage_lower,melee_damage_upper))
+				//src.target:take_damage(rand(melee_damage_lower,melee_damage_upper))
+				src.target:attack_critter(src)
 			else
 				src.target:TakeDamage(rand(melee_damage_lower,melee_damage_upper))
 		spawn(attack_speed)

code/modules/critters/critter_defenses.dm

@@ -13,7 +13,7 @@ Contains the procs that control attacking critters
 			if("fire") damage = W.force * firevuln
 			if("brute") damage = W.force * brutevuln
 		TakeDamage(damage)
-		if(src.defensive)	Target_Attacker(user)
+		if(src.defensive && alive)	Target_Attacker(user)
 		return
 
 
@@ -46,9 +46,10 @@ Contains the procs that control attacking critters
 		if(!target)	return
 		src.target = target
 		src.oldtarget_name = target:name
-		if(task != "chasing" || task != "attacking")
-			for(var/mob/O in viewers(src, null))
-				O.show_message("\red <b>[src]</b> [src.angertext] at [target:name]!", 1)
+		if(task != "chasing" && task != "attacking")
+			if(angertext && angertext != "")
+				for(var/mob/O in viewers(src, null))
+					O.show_message("\red <b>[src]</b> [src.angertext] at [target:name]!", 1)
 			src.task = "chasing"
 		return
 
@@ -70,7 +71,7 @@ Contains the procs that control attacking critters
 		src.anchored = 0
 		src.density = 0
 		walk_to(src,0)
-		src.visible_message("<b>[src]</b> dies!")
+		src.visible_message("<b>[src]</b> [deathtext]")
 
 
 	Harvest(var/obj/item/weapon/W, var/mob/living/user)

code/modules/critters/critters.dm

@@ -242,3 +242,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.wav'
+	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/mob/mob_helpers.dm

@@ -192,6 +192,24 @@ proc/isorgan(A)
 	return copytext(sanitize(t),1,MAX_MESSAGE_LEN)
 
 
+proc/Gibberish(t, p)
+	/* Turn text into complete gibberish! */
+	var/returntext = ""
+	for(var/i = 1, i <= length(t), i++)
+
+		var/letter = copytext(t, i, i+1)
+		if(prob(50))
+			if(p >= 70)
+				letter = ""
+
+			for(var/j = 1, j <= rand(0, 2), j++)
+				letter += pick("#","@","*","&","%","$","/", "<", ">", ";","*","*","*","*","*","*","*")
+
+		returntext += letter
+
+	return returntext
+
+
 /proc/ninjaspeak(n)
 /*
 The difference with stutter is that this proc can stutter more than 1 letter