Merge remote-tracking branch 'remotes/git-svn' into bs12_with_tgport

Conflicts:
	code/ATMOSPHERICS/pipes.dm
	code/datums/organs/organ_external.dm
	code/game/gamemodes/changeling/modularchangling.dm
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/ninja_equipment.dm
	code/game/hud.dm
	code/game/jobs/job/captain.dm
	code/game/machinery/atmoalter/area_atmos_computer.dm
	code/game/machinery/recharger.dm
	code/game/objects/hud.dm
	code/game/turfs/turf.dm
	code/modules/client/client defines.dm
	code/modules/clothing/head/misc.dm
	code/modules/clothing/spacesuits/rig.dm
	code/modules/clothing/under/miscellaneous.dm
	code/modules/mob/living/carbon/alien/humanoid/hud.dm
	code/modules/mob/living/carbon/human/hud.dm
	code/modules/mob/living/carbon/human/update_icons.dm
	code/modules/mob/living/carbon/monkey/hud.dm
	code/modules/mob/mob_cleanup.dm
	code/modules/mob/mob_defines.dm
	code/modules/mob/mob_helpers.dm
	code/modules/mob/mob_movement.dm
	code/modules/mob/screen.dm
	code/modules/paperwork/filingcabinet.dm
	code/modules/power/cable_heavyduty.dm
	code/modules/projectiles/guns/energy/temperature.dm
	code/setup.dm
	config/game_options.txt
	icons/mob/screen1_Midnight.dmi
	icons/mob/screen1_Orange.dmi
	icons/mob/screen1_alien.dmi
	icons/mob/screen1_old.dmi
	icons/obj/atmospherics/passive_gate.dmi
	icons/obj/pipe-item.dmi
	interface/interface.dm

code/game/objects/effects/aliens.dm

@@ -170,20 +170,26 @@
 	anchored = 1
 	density = 0
 	var/health = 15
+	var/obj/effect/alien/weeds/node/linked_node = null
 
-	node
-		icon_state = "weednode"
-		name = "purple sac"
-		desc = "Weird purple octopus-like thing."
-		luminosity = NODERANGE
+/obj/effect/alien/weeds/node
+	icon_state = "weednode"
+	name = "purple sac"
+	desc = "Weird purple octopus-like thing."
+	luminosity = NODERANGE
 
-/obj/effect/alien/weeds/New()
+/obj/effect/alien/weeds/node/New()
+	..(src.loc, src)
+
+
+/obj/effect/alien/weeds/New(pos, node)
 	..()
+	linked_node = node
 	if(istype(loc, /turf/space))
 		del(src)
 		return
 	if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2")
-	spawn(rand(150,300))
+	spawn(rand(50, 150))
 		if(src)
 			Life()
 	return
@@ -215,8 +221,8 @@ Alien plants should do something if theres a lot of poison
 			if (!istype(T) || T.density || locate(/obj/effect/alien/weeds) in T || istype(T.loc, /area/arrival) || istype(T, /turf/space))
 				continue
 
-			if(!(locate(/obj/effect/alien/weeds/node) in view(NODERANGE,T)))
-				continue
+			if(!linked_node)
+				return
 
 	//		if (locate(/obj/movable, T)) // don't propogate into movables
 	//			continue
@@ -225,7 +231,7 @@ Alien plants should do something if theres a lot of poison
 				if(O.density)
 					continue direction_loop
 
-			new /obj/effect/alien/weeds(T)
+			new /obj/effect/alien/weeds(T, linked_node)
 
 
 /obj/effect/alien/weeds/ex_act(severity)
@@ -370,10 +376,10 @@ Alien plants should do something if theres a lot of poison
 		new /obj/item/clothing/mask/facehugger(src)
 		return
 
-	proc/Burst() //drops and kills the hugger if any is remaining
+	proc/Burst(var/kill = 1) //drops and kills the hugger if any is remaining
 		var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
 
-		if(child)
+		if(kill && istype(child))
 			loc.contents += child
 			child.Die()
 
@@ -381,6 +387,7 @@ Alien plants should do something if theres a lot of poison
 		status = BURST
 		return
 
+
 /obj/effect/alien/egg/bullet_act(var/obj/item/projectile/Proj)
 	health -= Proj.damage
 	..()
@@ -388,7 +395,6 @@ Alien plants should do something if theres a lot of poison
 	return
 
 
-
 /obj/effect/alien/egg/attackby(var/obj/item/weapon/W, var/mob/user)
 	if(health <= 0)
 		return
@@ -416,4 +422,22 @@ Alien plants should do something if theres a lot of poison
 /obj/effect/alien/egg/temperature_expose(datum/gas_mixture/air, exposed_temperature, exposed_volume)
 	if(exposed_temperature > 500)
 		health -= 5
-		healthcheck()
+		healthcheck()
+
+/obj/effect/alien/egg/HasProximity(atom/movable/AM as mob|obj)
+	if(status == GROWN && iscarbon(AM) && !isalien(AM))
+
+		var/mob/living/carbon/C = AM
+		if(C.stat == CONSCIOUS && C.has_disease(/datum/disease/alien_embryo))
+			return
+
+		status = BURST
+		flick("egg_opening", src) //Play animation
+		var/turf/pos = get_turf(src)
+		spawn(18) // Wait until the animation finishes
+			Burst(0)
+			var/obj/item/clothing/mask/facehugger/child = GetFacehugger()
+			child.loc = pos
+			if(AM && in_range(AM, pos))
+				child.Attach(AM)
+

code/game/objects/effects/decals/Cleanable/humans.dm

@@ -39,7 +39,7 @@
 	desc = "They look bloody and gruesome."
 	gender = PLURAL
 	density = 0
-	anchored = 0
+	anchored = 1
 	layer = 2
 	icon = 'icons/effects/blood.dmi'
 	icon_state = "gibbl5"

code/game/objects/effects/decals/Cleanable/robots.dm

@@ -5,7 +5,7 @@
 	desc = "It's a useless heap of junk... <i>or is it?</i>"
 	gender = PLURAL
 	density = 0
-	anchored = 0
+	anchored = 1
 	layer = 2
 	icon = 'icons/mob/robots.dmi'
 	icon_state = "gib1"

code/game/objects/effects/landmarks.dm

@@ -209,6 +209,11 @@
 	new/obj/item/clothing/suit/wizrobe/marisa/fake(src.loc)
 	del(src)
 
+/obj/effect/landmark/costume/cutewitch/New()
+	new /obj/item/clothing/under/sundress(src.loc)
+	new /obj/item/clothing/head/witchwig(src.loc)
+	del(src)
+
 /obj/effect/landmark/costume/fakewizard/New()
 	new /obj/item/clothing/suit/wizrobe/fake(src.loc)
 	new /obj/item/clothing/head/wizard/fake(src.loc)

code/game/objects/effects/signs.dm

@@ -160,6 +160,15 @@
 	opacity = 0
 	density = 0
 
+/obj/effect/sign/kiddieplaque
+	desc = "Next to the extremely long list of names and job titles, there is a drawing of a little child. The child is holding a crayon and writing some code in his diary with it. The child is smiling evilly."
+	name = "Credits plaque for AI developers."
+	icon = 'icons/obj/decals.dmi'
+	icon_state = "kiddieplaque"
+	anchored = 1.0
+	opacity = 0
+	density = 0
+
 /obj/effect/sign/atmosplaque
 	desc = "This plaque commemorates the fall of the Atmos FEA division. For all the charred, dizzy, and brittle men who have died in its hands."
 	name = "FEA Atmospherics Division"