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

Conflicts:
	code/game/gamemodes/events.dm
	code/game/gamemodes/events/space_ninja.dm
	code/game/machinery/atmo_control.dm
	code/game/machinery/doors/firedoor.dm
	code/game/machinery/telecomms/broadcaster.dm
	code/game/objects/structures/watercloset.dm
	code/modules/clothing/glasses/glasses.dm
	code/modules/mob/living/carbon/human/human.dm
	code/modules/mob/living/simple_animal/life.dm
	code/modules/mob/new_player/new_player.dm

Signed-off-by: Cael_Aislinn <cael_aislinn@yahoo.com.au>

code/game/objects/effects/aliens.dm

@@ -177,6 +177,7 @@
 	name = "purple sac"
 	desc = "Weird purple octopus-like thing."
 	luminosity = NODERANGE
+	var/node_range = NODERANGE
 
 /obj/effect/alien/weeds/node/New()
 	..(src.loc, src)
@@ -189,7 +190,7 @@
 		del(src)
 		return
 	if(icon_state == "weeds")icon_state = pick("weeds", "weeds1", "weeds2")
-	spawn(rand(50, 150))
+	spawn(rand(150, 200))
 		if(src)
 			Life()
 	return
@@ -221,7 +222,7 @@ 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(!linked_node)
+			if(!linked_node || get_dist(linked_node, src) > linked_node.node_range)
 				return
 
 	//		if (locate(/obj/movable, T)) // don't propogate into movables

code/game/objects/effects/bump_teleporter.dm

@@ -0,0 +1,34 @@
+var/list/obj/effect/bump_teleporter/BUMP_TELEPORTERS = list()
+
+/obj/effect/bump_teleporter
+	name = "bump-teleporter"
+	icon = 'icons/mob/screen1.dmi'
+	icon_state = "x2"
+	var/id = null			//id of this bump_teleporter.
+	var/id_target = null	//id of bump_teleporter which this moves you to.
+	invisibility = 101 		//nope, can't see this
+	anchored = 1
+	density = 1
+	opacity = 0
+
+/obj/effect/bump_teleporter/New()
+	..()
+	BUMP_TELEPORTERS += src
+
+/obj/effect/bump_teleporter/Del()
+	BUMP_TELEPORTERS -= src
+	..()
+
+/obj/effect/bump_teleporter/Bumped(atom/user)
+	if(!ismob(user))
+		//user.loc = src.loc	//Stop at teleporter location
+		return
+
+	if(!id_target)
+		//user.loc = src.loc	//Stop at teleporter location, there is nowhere to teleport to.
+		return
+
+	for(var/obj/effect/bump_teleporter/BT in BUMP_TELEPORTERS)
+		if(BT.id == src.id_target)
+			usr.loc = BT.loc	//Teleport to location with correct id.
+			return

code/game/objects/effects/landmarks.dm

@@ -131,7 +131,7 @@
 	new /obj/item/clothing/under/blackskirt(src.loc)
 	var/CHOICE = pick( /obj/item/clothing/head/beret , /obj/item/clothing/head/rabbitears )
 	new CHOICE(src.loc)
-	new /obj/item/clothing/glasses/blindfold(src.loc)
+	new /obj/item/clothing/glasses/sunglasses/blindfold(src.loc)
 	del(src)
 
 /obj/effect/landmark/costume/butler/New()