-Metroid eggs are now a child of eggs. Meaning you can throw them at people!

-Resin walls/windows will now block heat the same as regular walls.

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

code/game/atoms.dm

@@ -58,7 +58,7 @@
 		return null
 
 /atom/proc/check_eye(user as mob)
-	if (istype(user, /mob/living/silicon/ai))
+	if (istype(user, /mob/living/silicon/ai)) // WHYYYY
 		return 1
 	return
 

code/game/gamemodes/cult/ritual.dm

@@ -563,7 +563,7 @@ var/engwords = list("travel", "blood", "join", "hell", "destroy", "technology",
 			for (var/mob/V in viewers(src))
 				V.show_message("\red [user] slices open a finger and begins to chant and paint symbols on the floor.", 3, "\red You hear chanting.", 2)
 			user << "\red You slice open one of your fingers and begin drawing a rune on the floor whilst chanting the ritual that binds your life essence with the dark arcane energies flowing through the surrounding world."
-			user.take_overall_damage(1)
+			user.take_overall_damage((rand(9)+1)/10) // 0.1 to 1.0 damage
 			if(do_after(user, 50))
 				if(usr.get_active_hand() != src)
 					return

code/game/objects/effects/aliens.dm

@@ -28,7 +28,7 @@
 	density = 1
 	opacity = 1
 	anchored = 1
-	var/health = 50
+	var/health = 170
 	//var/mob/living/affecting = null
 
 	wall
@@ -43,6 +43,16 @@
 		opacity = 0
 		health = 20
 
+/obj/effect/alien/resin/New()
+	..()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = WALL_HEAT_TRANSFER_COEFFICIENT
+
+/obj/effect/alien/resin/Del()
+	var/turf/T = get_turf(src)
+	T.thermal_conductivity = initial(T.thermal_conductivity)
+	..()
+
 /obj/effect/alien/resin/proc/healthcheck()
 	if(health <=0)
 		density = 0
@@ -113,7 +123,7 @@
 	for(var/mob/O in oviewers(src))
 		O.show_message("\red [usr] claws at the resin!", 1)
 	playsound(loc, 'sound/effects/attackblob.ogg', 100, 1)
-	health -= rand(10, 20)
+	health -= rand(40, 60)
 	if(health <= 0)
 		usr << "\green You slice the [name] to pieces."
 		for(var/mob/O in oviewers(src))