TG: - Deleted ERP.dmi

- Moved some objects into /effect
- Removed the debugger object
Revision: r3739
Author: 	 baloh.matevz

code/modules/mob/dead/observer/observer.dm

@@ -86,7 +86,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 /mob/dead/observer/Move(NewLoc, direct)
 	if(NewLoc)
 		loc = NewLoc
-		for(var/obj/step_trigger/S in NewLoc)
+		for(var/obj/effect/step_trigger/S in NewLoc)
 			S.HasEntered(src)
 
 		return
@@ -100,7 +100,7 @@ This is the proc mobs get to turn into a ghost. Forked from ghostize due to comp
 	if((direct & WEST) && x > 1)
 		x--
 
-	for(var/obj/step_trigger/S in locate(x, y, z))
+	for(var/obj/effect/step_trigger/S in locate(x, y, z))
 		S.HasEntered(src)
 
 /mob/dead/observer/examine()

code/modules/mob/living/silicon/robot/emote.dm

@@ -67,6 +67,25 @@
 				return
 			message = "<B>[src]</B> [input]"
 
+		if ("me")
+			if(silent)
+				return
+			if (src.client && (client.muted || client.muted_complete))
+				src << "You are muted."
+				return
+			if (stat)
+				return
+			if(!(message))
+				return
+			else
+				if(cmptext(copytext(message, 1, 3), "v "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 1
+				else if(cmptext(copytext(message, 1, 3), "h "))
+					message = "<B>[src]</B> [copytext(message, 3)]"
+					m_type = 2
+				else
+					message = "<B>[src]</B> [message]"
 		if ("twitch")
 			message = "<B>[src]</B> twitches violently."
 			m_type = 1
@@ -189,25 +208,7 @@
 			playsound(src.loc, 'biamthelaw.ogg', 50, 0)
 			m_type = 2
 
-		if ("me")
-			if(silent)
-				return
-			if (src.client && (client.muted || client.muted_complete))
-				src << "You are muted."
-				return
-			if (stat)
-				return
-			if(!(message))
-				return
-			else
-				if(cmptext(copytext(message, 1, 3), "v "))
-					message = "<B>[src]</B> [copytext(message, 3)]"
-					m_type = 1
-				else if(cmptext(copytext(message, 1, 3), "h "))
-					message = "<B>[src]</B> [copytext(message, 3)]"
-					m_type = 2
-				else
-					message = "<B>[src]</B> [message]"
+
 
 		if("help")
 			src << "beep-(none)/mob, ping-(none)/mob, buzz-(none)/mob, look-(none)/mob, stare-(none)/mob, glare-(none)/mob, twitch, twitch_s, law"

code/modules/mob/mob_defines.dm

@@ -12,7 +12,7 @@
 	//MOB overhaul
 
 	//Not in use yet
-//	var/obj/organstructure/organStructure = null
+//	var/obj/effect/organstructure/organStructure = null
 
 	//Vars that have been relocated to organStructure
 	//Vars that have been relocated to organStructure ++END