-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))

code/modules/mob/living/carbon/metroid/life.dm

@@ -344,9 +344,9 @@
 		if(istype(src, /mob/living/carbon/metroid/adult))
 			if(!client && nutrition >= 1000)
 				var/number = pick(1,1,1,1,1,1,2,2,2,3) //number of eggs laid
-				var/obj/item/weapon/reagent_containers/food/snacks/roro_egg/E
+				var/obj/item/weapon/reagent_containers/food/snacks/egg/roro/E
 				for(var/i=1,i<=number,i++)
-					E = new/obj/item/weapon/reagent_containers/food/snacks/roro_egg(loc)
+					E = new(loc)
 					src.nutrition -= 200
 				step_away(E,src)
 

code/modules/mob/living/carbon/metroid/metroid.dm

@@ -815,7 +815,7 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75
 				Flush = 30
 */
 
-/obj/item/weapon/reagent_containers/food/snacks/roro_egg
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro
 	name = "roro egg"
 	desc = "A small, gelatinous egg."
 	icon = 'icons/mob/mob.dmi'
@@ -824,19 +824,19 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75
 	origin_tech = "biotech=4"
 	var/grown = 0
 
-/obj/item/weapon/reagent_containers/food/snacks/roro_egg/New()
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro/New()
 	..()
 	reagents.add_reagent("nutriment", 5)
 	spawn(rand(1200,1500))//the egg takes a while to "ripen"
 		Grow()
 
-/obj/item/weapon/reagent_containers/food/snacks/roro_egg/proc/Grow()
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro/proc/Grow()
 	grown = 1
 	icon_state = "roro egg-grown"
 	processing_objects.Add(src)
 	return
 
-/obj/item/weapon/reagent_containers/food/snacks/roro_egg/proc/Hatch()
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro/proc/Hatch()
 	processing_objects.Remove(src)
 	var/turf/T = get_turf(src)
 	src.visible_message("\blue The [name] pulsates and quivers!")
@@ -846,8 +846,14 @@ mob/living/carbon/metroid/var/temperature_resistance = T0C+75
 		del(src)
 
 
-/obj/item/weapon/reagent_containers/food/snacks/roro_egg/process()
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro/process()
 	var/turf/location = get_turf(src)
 	var/datum/gas_mixture/environment = location.return_air()
 	if (environment.toxins > MOLES_PLASMA_VISIBLE)//plasma exposure causes the egg to hatch
-		src.Hatch()
+		src.Hatch()
+
+/obj/item/weapon/reagent_containers/food/snacks/egg/roro/attackby(obj/item/weapon/W as obj, mob/user as mob)
+	if(istype( W, /obj/item/toy/crayon ))
+		return
+	else
+		..()

code/modules/mob/living/carbon/metroid/powers.dm

@@ -196,7 +196,7 @@
 	if(istype(src, /mob/living/carbon/metroid/adult))
 		if(amount_grown >= 10)
 			if(src.nutrition >= 300)
-				new/obj/item/weapon/reagent_containers/food/snacks/roro_egg(loc)
+				new/obj/item/weapon/reagent_containers/food/snacks/egg/roro(loc)
 				src.nutrition -= 200
 			else
 				src << "<i>I have not fed enough...</i>"

code/modules/reagents/Chemistry-Reagents.dm

@@ -1122,8 +1122,8 @@ datum
 				return
 			reaction_obj(var/obj/O, var/volume)
 				src = null
-				if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/roro_egg))
-					var/obj/item/weapon/reagent_containers/food/snacks/roro_egg/egg = O
+				if(istype(O,/obj/item/weapon/reagent_containers/food/snacks/egg/roro))
+					var/obj/item/weapon/reagent_containers/food/snacks/egg/roro/egg = O
 					if (egg.grown)
 						egg.Hatch()
 				if((!O) || (!volume))	return 0