From f50c180eb5930cff082fb9c527fbd1c419e04f62 Mon Sep 17 00:00:00 2001
From: "polyxenitopalidou@gmail.com"
 <polyxenitopalidou@gmail.com@316c924e-a436-60f5-8080-3fe189b3f50e>
Date: Fri, 13 Apr 2012 21:36:27 +0000
Subject: [PATCH] =?UTF-8?q?=E2=80=A2Sanitised=20the=20posters'=20sleep()?=
 =?UTF-8?q?=20in=20the=20walls'=20attackby()s.=20Rare=20runtime=20should?=
 =?UTF-8?q?=20be=20fixed.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@3452 316c924e-a436-60f5-8080-3fe189b3f50e
---
 code/game/turf.dm | 8 ++++++++
 tgstation.dme     | 1 -
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/code/game/turf.dm b/code/game/turf.dm
index c898b98a0e0..0259fb3733d 100644
--- a/code/game/turf.dm
+++ b/code/game/turf.dm
@@ -524,8 +524,12 @@
 			var/temp_loc = user.loc
 			P.resulting_poster.icon_state = "poster_being_set"
 			playsound(P.resulting_poster.loc, 'poster_being_created.ogg', 100, 1)
+
 			sleep(22)
 
+			if(!P)
+				return
+
 			if(user.loc == temp_loc)//Let's check if he still is there
 				user << "<FONT COLOR='blue'>You place the poster!</FONT>"
 				P.resulting_poster.icon_state = temp
@@ -796,8 +800,12 @@
 			var/temp_loc = user.loc
 			P.resulting_poster.icon_state = "poster_being_set"
 			playsound(P.resulting_poster.loc, 'poster_being_created.ogg', 100, 1)
+
 			sleep(22)
 
+			if(!P)
+				return
+
 			if(user.loc == temp_loc)//Let's check if he still is there
 				user << "<FONT COLOR='blue'>You place the poster!</FONT>"
 				P.resulting_poster.icon_state = temp
diff --git a/tgstation.dme b/tgstation.dme
index f0fb83744a1..b229cfa8fed 100644
--- a/tgstation.dme
+++ b/tgstation.dme
@@ -179,7 +179,6 @@
 #define FILE_DIR "icons/vending_icons"
 #define FILE_DIR "interface"
 #define FILE_DIR "maps"
-#define FILE_DIR "maps/backup"
 #define FILE_DIR "sound"
 #define FILE_DIR "sound/AI"
 #define FILE_DIR "sound/ambience"