From 94dbad82a4df18072971a265b794b009ef096816 Mon Sep 17 00:00:00 2001
From: SamCroswell <Sam.Croswell@gmail.com>
Date: Wed, 30 Jul 2014 00:53:56 -0400
Subject: [PATCH] Alien Tweaks, Commented Out Detomatix

---
 code/datums/uplink_item.dm                            |  6 ++++--
 code/game/objects/effects/aliens.dm                   | 11 ++++++-----
 code/modules/mob/living/carbon/alien/larva/larva.dm   |  1 +
 .../mob/living/carbon/alien/special/facehugger.dm     |  1 +
 4 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/code/datums/uplink_item.dm b/code/datums/uplink_item.dm
index 3be86b6d7f4..0b8dfadcdbd 100644
--- a/code/datums/uplink_item.dm
+++ b/code/datums/uplink_item.dm
@@ -267,11 +267,13 @@ var/list/uplink_items = list()
 	item = /obj/item/weapon/soap/syndie
 	cost = 1
 
-/datum/uplink_item/stealthy_weapons/detomatix
+/*/datum/uplink_item/stealthy_weapons/detomatix
 	name = "Detomatix PDA Cartridge"
 	desc = "When inserted into a personal digital assistant, this cartridge gives you five opportunities to detonate PDAs of crewmembers who have their message feature enabled. The concussive effect from the explosion will knock the recipient out for a short period, and deafen them for longer. It has a chance to detonate your PDA."
 	item = /obj/item/weapon/cartridge/syndicate
-	cost = 3
+	cost = 3 */
+
+// Commented out until a fix can be found, currently doesn't work with the PDA NanoUI and people keep wasting Telecrystals on it. -- Dave
 
 /datum/uplink_item/stealthy_weapons/silencer
 	name = "Stetchkin Silencer"
diff --git a/code/game/objects/effects/aliens.dm b/code/game/objects/effects/aliens.dm
index 3f3f7d59b77..cac77dcb41c 100644
--- a/code/game/objects/effects/aliens.dm
+++ b/code/game/objects/effects/aliens.dm
@@ -218,11 +218,11 @@
 	if(istype(loc, /turf/space))
 		qdel(src)
 		return
-	
+
 	linked_node = N
 	if(linked_node)
 		linked_node.connected_weeds.Add(src)
-	
+
 	if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2")
 	spawn(rand(150, 200))
 		if(src)
@@ -248,13 +248,13 @@ Alien plants should do something if theres a lot of poison
 	if (istype(U, /turf/space))
 		del(src)
 		return
-	
+
 	if(!linked_node || (get_dist(linked_node, src) > linked_node.node_range) )
 		return
-	
+
 	direction_loop:
 		for(var/dirn in cardinal)
-			
+
 			var/turf/T = get_step(src, dirn)
 
 			if (!istype(T) || T.density || locate(/obj/effect/alien/weeds) in T || istype(T.loc, /area/arrival) || istype(T, /turf/space))
@@ -461,6 +461,7 @@ Alien plants should do something if theres a lot of poison
 				if(kill && istype(child))
 					child.death()
 				else
+					child.cancel_camera()
 					for(var/mob/M in range(1,src))
 						if(CanHug(M))
 							child.Attach(M)
diff --git a/code/modules/mob/living/carbon/alien/larva/larva.dm b/code/modules/mob/living/carbon/alien/larva/larva.dm
index 5081607929c..1de43f35628 100644
--- a/code/modules/mob/living/carbon/alien/larva/larva.dm
+++ b/code/modules/mob/living/carbon/alien/larva/larva.dm
@@ -8,6 +8,7 @@
 	health = 25
 	storedPlasma = 50
 	max_plasma = 50
+	density = 0
 
 	var/amount_grown = 0
 	var/max_grown = 200
diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
index 6abb75fce0c..f722a5e1bf0 100644
--- a/code/modules/mob/living/carbon/alien/special/facehugger.dm
+++ b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -47,6 +47,7 @@ var/const/MAX_ACTIVE_TIME = 400
 
 	maxHealth = 5
 	health = 5
+	density = 0 // Avoiding Facehugger clusterfucks at the egg room.
 	var/strength=5
 	var/sterile = 0
 	var/attached = 0