From 9485c6410ce36845e2938c3ad5fc3d9204e371ea Mon Sep 17 00:00:00 2001
From: mwerezak <mwerezak@gmail.com>
Date: Thu, 1 Jan 2015 15:42:34 -0500
Subject: [PATCH] Fixes #7598

---
 .../game/objects/effects/decals/contraband.dm | 41 -------------------
 code/game/turfs/simulated/walls.dm            |  5 ---
 code/game/turfs/simulated/walls_reinforced.dm |  7 +---
 3 files changed, 1 insertion(+), 52 deletions(-)

diff --git a/code/game/objects/effects/decals/contraband.dm b/code/game/objects/effects/decals/contraband.dm
index 121c4d1667..9d097f47a0 100644
--- a/code/game/objects/effects/decals/contraband.dm
+++ b/code/game/objects/effects/decals/contraband.dm
@@ -74,9 +74,6 @@
 	
 	del(oldsrc)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
 
-//I'm 
-/obj/structure/sign/poster/proc/placement_check()
-
 //############################## THE ACTUAL DECALS ###########################
 
 /obj/structure/sign/poster
@@ -159,44 +156,6 @@
 	src.loc = P
 	del(src)
 
-
-//separated to reduce code duplication. Moved here for ease of reference and to unclutter r_wall/attackby()
-/turf/simulated/wall/proc/place_poster(var/obj/item/weapon/contraband/poster/P, var/mob/user)
-
-	if(!istype(src,/turf/simulated/wall))
-		user << "\red You can't place this here!"
-		return
-
-	var/stuff_on_wall = 0
-	for(var/obj/O in contents) //Let's see if it already has a poster on it or too much stuff
-		if(istype(O,/obj/structure/sign/poster))
-			user << "<span class='notice'>The wall is far too cluttered to place a poster!</span>"
-			return
-		stuff_on_wall++
-		if(stuff_on_wall == 3)
-			user << "<span class='notice'>The wall is far too cluttered to place a poster!</span>"
-			return
-
-	user << "<span class='notice'>You start placing the poster on the wall...</span>" //Looks like it's uncluttered enough. Place the poster.
-
-	//declaring D because otherwise if P gets 'deconstructed' we lose our reference to P.resulting_poster
-	var/obj/structure/sign/poster/D = new(P.serial_number)
-
-	var/temp_loc = user.loc
-	flick("poster_being_set",D)
-	D.loc = src
-	del(P)	//delete it now to cut down on sanity checks afterwards. Agouri's code supports rerolling it anyway
-	playsound(D.loc, 'sound/items/poster_being_created.ogg', 100, 1)
-
-	sleep(17)
-	if(!D)	return
-
-	if(istype(src,/turf/simulated/wall) && user && user.loc == temp_loc)//Let's check if everything is still there
-		user << "<span class='notice'>You place the poster!</span>"
-	else
-		D.roll_and_drop(temp_loc)
-	return
-
 /datum/poster
 	// Name suffix. Poster - [name]
 	var/name=""
diff --git a/code/game/turfs/simulated/walls.dm b/code/game/turfs/simulated/walls.dm
index d8f91582b6..8b0a40249b 100644
--- a/code/game/turfs/simulated/walls.dm
+++ b/code/game/turfs/simulated/walls.dm
@@ -439,11 +439,6 @@
 		AH.try_build(src)
 		return
 
-	//Poster stuff
-	else if(istype(W,/obj/item/weapon/contraband/poster))
-		place_poster(W,user)
-		return
-
 	else
 		return attack_hand(user)
 	return
diff --git a/code/game/turfs/simulated/walls_reinforced.dm b/code/game/turfs/simulated/walls_reinforced.dm
index 10c7a2cbce..c0992634a3 100644
--- a/code/game/turfs/simulated/walls_reinforced.dm
+++ b/code/game/turfs/simulated/walls_reinforced.dm
@@ -305,12 +305,7 @@
 		var/obj/item/light_fixture_frame/small/AH = W
 		AH.try_build(src)
 		return
-
-	//Poster stuff
-	else if(istype(W,/obj/item/weapon/contraband/poster))
-		place_poster(W,user)
-		return
-
+	
 	//Finally, CHECKING FOR FALSE WALLS if it isn't damaged
 	else if(!d_state)
 		return attack_hand(user)