Merge branch 'Bleeding-Edge' of github.com:d3athrow/vgstation13 into …

…Bleeding-Edge
Supermichael777 · Jul 30, 2014 · 45995de · 45995de
2 parents e1f7f17 + e02179b
commit 45995de
Show file tree

Hide file tree

Showing 52 changed files with 3,417 additions and 3,365 deletions.
diff --git a/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm b/code/WorkInProgress/Cael_Aislinn/Supermatter/Laser2.dm
@@ -111,7 +111,7 @@
 	src.hit()
 	return
 
-/obj/beam/e_beam/HasEntered(atom/movable/AM as mob|obj)
+/obj/beam/e_beam/Crossed(atom/movable/AM as mob|obj)
 	if (istype(AM, /obj/beam))
 		return
 	spawn( 0 )

diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
@@ -196,7 +196,7 @@
 		icon_state = "beartrap[armed]"
 		user << "<span class='notice'>[src] is now [armed ? "armed" : "disarmed"]</span>"
 
-/obj/item/weapon/legcuffs/beartrap/HasEntered(AM as mob|obj)
+/obj/item/weapon/legcuffs/beartrap/Crossed(AM as mob|obj)
 	if(armed)
 		if(ishuman(AM))
 			if(isturf(src.loc))

diff --git a/code/game/atoms.dm b/code/game/atoms.dm
@@ -127,9 +127,6 @@
 /atom/proc/CheckExit()
 	return 1
 
-/atom/proc/HasEntered(atom/movable/AM as mob|obj)
-	return
-
 /atom/proc/HasProximity(atom/movable/AM as mob|obj)
 	return
 

diff --git a/code/game/atoms_movable.dm b/code/game/atoms_movable.dm
@@ -57,6 +57,11 @@
 /atom/movable/proc/recycle(var/datum/materials/rec)
 	return 0
 
+// Previously known as HasEntered()
+// This is automatically called when something enters your square
+/atom/movable/Crossed(atom/movable/AM)
+	return
+
 /atom/movable/Bump(var/atom/A as mob|obj|turf|area, yes)
 	if(src.throwing)
 		src.throw_impact(A)
@@ -75,6 +80,8 @@
 			loc.Exited(src)
 		loc = destination
 		loc.Entered(src)
+		for(var/atom/movable/AM in loc)
+			AM.Crossed(src)
 		return 1
 	return 0
 

diff --git a/code/game/gamemodes/cult/cult_structures.dm b/code/game/gamemodes/cult/cult_structures.dm
@@ -51,7 +51,7 @@
 		return
 	return
 
-/obj/effect/gateway/HasEntered(AM as mob|obj)
+/obj/effect/gateway/Crossed(AM as mob|obj)
 	spawn(0)
 		return
 	return
diff --git a/code/game/machinery/bots/mulebot.dm b/code/game/machinery/bots/mulebot.dm
@@ -730,7 +730,7 @@ var/global/mulebot_count = 0
 	return get_turf(src)
 
 
-// called from mob/living/carbon/human/HasEntered()
+// called from mob/living/carbon/human/Crossed()
 // when mulebot is in the same loc
 /obj/machinery/bot/mulebot/proc/RunOver(var/mob/living/carbon/human/H)
 	src.visible_message("\red [src] drives over [H]!")

diff --git a/code/game/machinery/kinetic_accelerator.dm b/code/game/machinery/kinetic_accelerator.dm
@@ -11,7 +11,7 @@
 	var/power = 0.5
 	var/maxspeed = 2
 
-/obj/machinery/kinetic_accelerator/HasEntered(var/atom/movable/A)
+/obj/machinery/kinetic_accelerator/Crossed(var/atom/movable/A)
 	if(!istype(A)) return
 	if(A.throwing)
 		A.throw_speed=min(maxspeed,A.throw_speed+power)
diff --git a/code/game/machinery/pipe/pipe_dispenser.dm b/code/game/machinery/pipe/pipe_dispenser.dm
@@ -173,7 +173,7 @@
 
 /*
 //Allow you to push disposal pipes into it (for those with density 1)
-/obj/machinery/pipedispenser/disposal/HasEntered(var/obj/structure/disposalconstruct/pipe as obj)
+/obj/machinery/pipedispenser/disposal/Crossed(var/obj/structure/disposalconstruct/pipe as obj)
 	if(istype(pipe) && !pipe.anchored)
 		del(pipe)
 

diff --git a/code/game/machinery/transformer.dm b/code/game/machinery/transformer.dm
@@ -39,7 +39,7 @@
 	if(cooldown_state)
 		return
 
-	// HasEntered didn't like people lying down.
+	// Crossed didn't like people lying down.
 	if(ishuman(AM))
 		// Only humans can enter from the west side, while lying down.
 		var/move_dir = get_dir(loc, AM.loc)

diff --git a/code/game/mecha/mecha.dm b/code/game/mecha/mecha.dm
@@ -331,7 +331,7 @@
 		var/obj/O = obstacle
 		if(istype(O, /obj/effect/portal)) //derpfix
 			src.anchored = 0
-			O.HasEntered(src)
+			O.Crossed(src)
 			spawn(0)//countering portal teleport spawn(0), hurr
 				src.anchored = 1
 		else if(!O.anchored)

diff --git a/code/game/objects/effects/decals/Cleanable/humans.dm b/code/game/objects/effects/decals/Cleanable/humans.dm
@@ -44,7 +44,7 @@ var/global/list/image/splatter_cache=list()
 	if(basecolor == "rainbow") basecolor = "#[pick(list("FF0000","FF7F00","FFFF00","00FF00","0000FF","4B0082","8F00FF"))]"
 	color = basecolor
 
-/obj/effect/decal/cleanable/blood/HasEntered(mob/living/carbon/human/perp)
+/obj/effect/decal/cleanable/blood/Crossed(mob/living/carbon/human/perp)
 	if (!istype(perp))
 		return
 	if(amount < 1)

diff --git a/code/game/objects/effects/decals/Cleanable/misc.dm b/code/game/objects/effects/decals/Cleanable/misc.dm
@@ -96,7 +96,7 @@
 			D.holder = null
 		..()
 
-/obj/effect/decal/cleanable/vomit/HasEntered(mob/living/carbon/human/perp)
+/obj/effect/decal/cleanable/vomit/Crossed(mob/living/carbon/human/perp)
 	if (!istype(perp))
 		return
 	if(amount < 1)

diff --git a/code/game/objects/effects/effect_system.dm b/code/game/objects/effects/effect_system.dm
@@ -223,7 +223,7 @@ steam.start() -- spawns the effect
 	spawn(time_to_live)
 		qdel(src)
 
-/obj/effect/effect/smoke/HasEntered(mob/living/carbon/M as mob )
+/obj/effect/effect/smoke/Crossed(mob/living/carbon/M as mob )
 	..()
 	if(istype(M))
 		affect(M)
@@ -742,7 +742,7 @@ steam.start() -- spawns the effect
 			qdel(src)
 
 
-/obj/effect/effect/foam/HasEntered(var/atom/movable/AM)
+/obj/effect/effect/foam/Crossed(var/atom/movable/AM)
 	if(metal)
 		return
 

diff --git a/code/game/objects/effects/mines.dm b/code/game/objects/effects/mines.dm
@@ -13,7 +13,7 @@
 /obj/effect/mine/New()
 	icon_state = "uglyminearmed"
 
-/obj/effect/mine/HasEntered(AM as mob|obj)
+/obj/effect/mine/Crossed(AM as mob|obj)
 	Bumped(AM)
 
 /obj/effect/mine/Bumped(mob/M as mob|obj)

diff --git a/code/game/objects/effects/portals.dm b/code/game/objects/effects/portals.dm
@@ -17,7 +17,7 @@
 		return
 	return
 
-/obj/effect/portal/HasEntered(AM as mob|obj)
+/obj/effect/portal/Crossed(AM as mob|obj)
 	spawn(0)
 		src.teleport(AM)
 		return

diff --git a/code/game/objects/effects/step_triggers.dm b/code/game/objects/effects/step_triggers.dm
@@ -10,7 +10,7 @@
 /obj/effect/step_trigger/proc/Trigger(var/atom/movable/A)
 	return 0
 
-/obj/effect/step_trigger/HasEntered(H as mob|obj)
+/obj/effect/step_trigger/Crossed(H as mob|obj)
 	..()
 	if(!H)
 		return

diff --git a/code/game/objects/items/devices/PDA/PDA.dm b/code/game/objects/items/devices/PDA/PDA.dm
@@ -1191,7 +1191,7 @@ var/global/list/obj/item/device/pda/PDAs = list()
 		src.pai.loc = get_turf(src.loc)
 	..()
 
-/obj/item/device/pda/clown/HasEntered(AM as mob|obj) //Clown PDA is slippery.
+/obj/item/device/pda/clown/Crossed(AM as mob|obj) //Clown PDA is slippery.
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if ((istype(M, /mob/living/carbon/human) && (istype(M:shoes, /obj/item/clothing/shoes) && M:shoes.flags&NOSLIP)) || M.m_intent == "walk")

diff --git a/code/game/objects/items/stacks/sheets/glass.dm b/code/game/objects/items/stacks/sheets/glass.dm
@@ -290,7 +290,7 @@
 			return
 	return ..()
 
-/obj/item/weapon/shard/HasEntered(AM as mob|obj)
+/obj/item/weapon/shard/Crossed(AM as mob|obj)
 	if(ismob(AM))
 		var/mob/M = AM
 		M << "\red <B>You step in the broken glass!</B>"

diff --git a/code/game/objects/items/toys.dm b/code/game/objects/items/toys.dm
@@ -431,7 +431,7 @@
 		playsound(src, 'sound/effects/snap.ogg', 50, 1)
 		del(src)
 
-/obj/item/toy/snappop/HasEntered(H as mob|obj)
+/obj/item/toy/snappop/Crossed(H as mob|obj)
 	if((ishuman(H))) //i guess carp and shit shouldn't set them off
 		var/mob/living/carbon/M = H
 		if(M.m_intent == "run")

diff --git a/code/game/objects/items/weapons/clown_items.dm b/code/game/objects/items/weapons/clown_items.dm
@@ -8,7 +8,7 @@
 /*
  * Banana Peals
  */
-/obj/item/weapon/bananapeel/HasEntered(AM as mob|obj)
+/obj/item/weapon/bananapeel/Crossed(AM as mob|obj)
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))
@@ -23,7 +23,7 @@
 /*
  * Soap
  */
-/obj/item/weapon/soap/HasEntered(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
+/obj/item/weapon/soap/Crossed(AM as mob|obj) //EXACTLY the same as bananapeel for now, so it makes sense to put it in the same dm -- Urist
 	if (istype(AM, /mob/living/carbon))
 		var/mob/M =	AM
 		if (istype(M, /mob/living/carbon/human) && (isobj(M:shoes) && M:shoes.flags&NOSLIP))

diff --git a/code/game/objects/items/weapons/grenades/clowngrenade.dm b/code/game/objects/items/weapons/grenades/clowngrenade.dm
@@ -63,7 +63,7 @@
 	throw_speed = 4
 	throw_range = 20
 
-	HasEntered(AM as mob|obj)
+	Crossed(AM as mob|obj)
 		var/burned = rand(2,5)
 		if(istype(AM, /mob/living))
 			var/mob/living/M = AM

diff --git a/code/game/objects/structures/signs.dm b/code/game/objects/structures/signs.dm
@@ -75,6 +75,12 @@
 /obj/structure/sign/double/map/right
 	icon_state = "map-right"
 
+//For efficiency station
+/obj/structure/sign/map/efficiency
+	name = "station map"
+	desc = "A framed picture of the station."
+	icon_state = "map_efficiency"
+
 /obj/structure/sign/securearea
 	name = "\improper SECURE AREA"
 	desc = "A warning sign which reads 'SECURE AREA'."

diff --git a/code/game/objects/structures/watercloset.dm b/code/game/objects/structures/watercloset.dm
@@ -194,7 +194,7 @@
 				del(mymist)
 				ismist = 0
 
-/obj/machinery/shower/HasEntered(atom/movable/O)
+/obj/machinery/shower/Crossed(atom/movable/O)
 	..()
 	wash(O)
 	if(ismob(O))

diff --git a/code/game/turfs/turf.dm b/code/game/turfs/turf.dm
@@ -69,15 +69,15 @@
 		return 0
 
 	// first, check objects to block exit that are not on the border
-	for(var/atom/movable/obstacle in oldloc.contents - O)
-		if(obstacle.flags & ~ON_BORDER)
+	for(var/atom/movable/obstacle in oldloc)
+		if((obstacle.flags & ~ON_BORDER) && (obstacle != O))
 			if(!obstacle.CheckExit(O, src))
 				O.Bump(obstacle, 1)
 				return 0
 
 	// now, check objects to block exit that are on the border
-	for(var/atom/movable/border_obstacle in oldloc.contents - O)
-		if(border_obstacle.flags & ON_BORDER)
+	for(var/atom/movable/border_obstacle in oldloc)
+		if((border_obstacle.flags & ON_BORDER) && (border_obstacle != O))
 			if(!border_obstacle.CheckExit(O, src))
 				O.Bump(border_obstacle, 1)
 				return 0
@@ -120,14 +120,6 @@
 			Obj:inertia_dir = 0
 	..()
 	var/objects = 0
-	for(var/atom/A as mob|obj|turf|area in src)
-		if(objects > loopsanity)	break
-		objects++
-		spawn( 0 )
-			if ((A && Obj))
-				A.HasEntered(Obj, 1)
-			return
-	objects = 0
 	for(var/atom/A as mob|obj|turf|area in range(1))
 		if(objects > loopsanity)	break
 		objects++

diff --git a/code/modules/assembly/bomb.dm b/code/modules/assembly/bomb.dm
@@ -73,9 +73,9 @@
 	if(bombassembly)
 		bombassembly.HasProximity(AM)
 
-/obj/item/device/onetankbomb/HasEntered(AM as mob|obj)
+/obj/item/device/onetankbomb/Crossed(AM as mob|obj)
 	if(bombassembly)
-		bombassembly.HasEntered(AM)
+		bombassembly.Crossed(AM)
 
 /obj/item/device/onetankbomb/on_found(mob/finder as mob)
 	if(bombassembly)

diff --git a/code/modules/assembly/holder.dm b/code/modules/assembly/holder.dm
@@ -110,13 +110,13 @@
 			special_assembly.HasProximity(AM)
 
 
-	HasEntered(atom/movable/AM as mob|obj)
+	Crossed(atom/movable/AM as mob|obj)
 		if(a_left)
-			a_left.HasEntered(AM)
+			a_left.Crossed(AM)
 		if(a_right)
-			a_right.HasEntered(AM)
+			a_right.Crossed(AM)
 		if(special_assembly)
-			special_assembly.HasEntered(AM)
+			special_assembly.Crossed(AM)
 
 
 	on_found(mob/finder as mob)

diff --git a/code/modules/assembly/infrared.dm b/code/modules/assembly/infrared.dm
@@ -198,6 +198,8 @@
 	return
 
 /obj/effect/beam/i_beam/Crossed(atom/movable/O)
+	..(O)
+
 	if(O && O.density && !istype(O, /obj/effect/beam))
 		spawn(0)
 			hit()
@@ -274,7 +276,7 @@
 	hit()
 	return
 
-/obj/effect/beam/i_beam/HasEntered(atom/movable/AM as mob|obj)
+/obj/effect/beam/i_beam/Crossed(atom/movable/AM as mob|obj)
 	if(istype(AM, /obj/effect/beam))
 		return
 	spawn(0)

diff --git a/code/modules/assembly/mousetrap.dm b/code/modules/assembly/mousetrap.dm
@@ -81,7 +81,7 @@
 		..()
 
 
-	HasEntered(AM as mob|obj)
+	Crossed(AM as mob|obj)
 		if(armed)
 			if(ishuman(AM))
 				var/mob/living/carbon/H = AM

diff --git a/code/modules/flufftext/Hallucination.dm b/code/modules/flufftext/Hallucination.dm
@@ -252,7 +252,7 @@ proc/check_panel(mob/M)
 
 		return
 
-	HasEntered(var/mob/M, somenumber)
+	Crossed(var/mob/M, somenumber)
 		if(M == my_target)
 			step_away(src,my_target,2)
 			if(prob(30))

diff --git a/code/modules/mob/dead/observer/observer.dm b/code/modules/mob/dead/observer/observer.dm
@@ -293,7 +293,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if(NewLoc)
 		loc = NewLoc
 		for(var/obj/effect/step_trigger/S in NewLoc)
-			S.HasEntered(src)
+			S.Crossed(src)
 
 		var/area/A = get_area_master(src)
 		if(A)
@@ -311,7 +311,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 		x--
 
 	for(var/obj/effect/step_trigger/S in locate(x, y, z))	//<-- this is dumb
-		S.HasEntered(src)
+		S.Crossed(src)
 
 	var/area/A = get_area_master(src)
 	if(A)

diff --git a/code/modules/mob/living/carbon/alien/alien.dm b/code/modules/mob/living/carbon/alien/alien.dm
@@ -48,7 +48,7 @@
 	return 2
 
 // MULEBOT SMASH
-/mob/living/carbon/alien/HasEntered(var/atom/movable/AM)
+/mob/living/carbon/alien/Crossed(var/atom/movable/AM)
 	var/obj/machinery/bot/mulebot/MB = AM
 	if(istype(MB))
 		MB.RunOverCreature(src,"#00ff00")

diff --git a/code/modules/mob/living/carbon/alien/special/facehugger.dm b/code/modules/mob/living/carbon/alien/special/facehugger.dm
@@ -80,7 +80,7 @@ var/const/MAX_ACTIVE_TIME = 400
 /obj/item/clothing/mask/facehugger/equipped(mob/M)
 	Attach(M)
 
-/obj/item/clothing/mask/facehugger/HasEntered(atom/target)
+/obj/item/clothing/mask/facehugger/Crossed(atom/target)
 	HasProximity(target)
 	return
 

diff --git a/code/modules/mob/living/carbon/human/human.dm b/code/modules/mob/living/carbon/human/human.dm
@@ -529,7 +529,7 @@
 
 // called when something steps onto a human
 // this could be made more general, but for now just handle mulebot
-/mob/living/carbon/human/HasEntered(var/atom/movable/AM)
+/mob/living/carbon/human/Crossed(var/atom/movable/AM)
 	var/obj/machinery/bot/mulebot/MB = AM
 	if(istype(MB))
 		MB.RunOverCreature(src,species.blood_color)