From a330cafea504310a7ea434c9174e07509d677e71 Mon Sep 17 00:00:00 2001
From: phil235 <phil235@users.noreply.github.com>
Date: Thu, 3 Mar 2016 21:02:03 +0100
Subject: [PATCH] Fixes some mistakes. Updating the package wrap's descriptions
 to be accurate and useful.

---
 code/game/mecha/working/ripley.dm      |  2 +-
 code/game/objects/items/stacks/wrap.dm |  6 ++----
 code/modules/mob/living/living.dm      | 12 +++++++-----
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/code/game/mecha/working/ripley.dm b/code/game/mecha/working/ripley.dm
index 841d27e9c78..a1260748a42 100644
--- a/code/game/mecha/working/ripley.dm
+++ b/code/game/mecha/working/ripley.dm
@@ -167,4 +167,4 @@
 		cargo -= O
 	else
 		if(user.loc == src) //so we don't get the message if we resisted multiple times and succeeded.
-			user << "<span class='warning'>You fail to push [src]!</span>"
+			user << "<span class='warning'>You fail to push [O] out of [src]!</span>"
diff --git a/code/game/objects/items/stacks/wrap.dm b/code/game/objects/items/stacks/wrap.dm
index 671545a5578..a26131c0b07 100644
--- a/code/game/objects/items/stacks/wrap.dm
+++ b/code/game/objects/items/stacks/wrap.dm
@@ -6,7 +6,7 @@
 
 /obj/item/stack/wrapping_paper
 	name = "wrapping paper"
-	desc = "You can use this to wrap items in."
+	desc = "Wrap packages with this festive paper to make gifts."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "wrap_paper"
 	flags = NOBLUDGEON
@@ -14,9 +14,6 @@
 	max_amount = 25
 	burn_state = FLAMMABLE
 
-/obj/item/stack/wrapping_paper/attack_self(mob/user)
-	user << "<span class='warning'>You need to use it on a package that has already been wrapped!</span>"
-
 /obj/item/stack/wrapping_paper/Destroy()
 	if(!amount)
 		new /obj/item/weapon/c_tube(get_turf(src))
@@ -29,6 +26,7 @@
 
 /obj/item/stack/packageWrap
 	name = "package wrapper"
+	desc = "You can use this to wrap items in."
 	icon = 'icons/obj/items.dmi'
 	icon_state = "deliveryPaper"
 	flags = NOBLUDGEON
diff --git a/code/modules/mob/living/living.dm b/code/modules/mob/living/living.dm
index 7831cfb6625..bed2db4857e 100644
--- a/code/modules/mob/living/living.dm
+++ b/code/modules/mob/living/living.dm
@@ -95,11 +95,12 @@ Sorry Giacom. Please don't be mad :(
 			return 1
 
 		if(L.pulling)
-			var/mob/P = L.pulling
-			if(P.restrained())
-				if(!(world.time % 5))
-					src << "<span class='warning'>[L] is restraining [P], you cannot push past.</span>"
-				return 1
+			if(ismob(L.pulling))
+				var/mob/P = L.pulling
+				if(P.restrained())
+					if(!(world.time % 5))
+						src << "<span class='warning'>[L] is restraining [P], you cannot push past.</span>"
+					return 1
 
 	//switch our position with M
 	//BubbleWrap: people in handcuffs are always switched around as if they were on 'help' intent to prevent a person being pulled from being seperated from their puller
@@ -505,6 +506,7 @@ Sorry Giacom. Please don't be mad :(
 	ExtinguishMob()
 	fire_stacks = 0
 	updatehealth()
+	update_canmove()
 
 
 //proc called by revive(), to check if we can actually ressuscitate the mob (we don't want to revive him and have him instantly die again)