From 89650e859080865ad02c8202c6598f9bb0e858de Mon Sep 17 00:00:00 2001
From: Markolie <markvanalphen2@gmail.com>
Date: Wed, 25 Feb 2015 19:56:24 +0100
Subject: [PATCH] Extinguisher wheelchair update, deathsquad robot fix

---
 .../objects/items/weapons/extinguisher.dm     | 22 +++++++++++++++++--
 .../modules/mob/living/silicon/robot/robot.dm |  2 +-
 2 files changed, 21 insertions(+), 3 deletions(-)

diff --git a/code/game/objects/items/weapons/extinguisher.dm b/code/game/objects/items/weapons/extinguisher.dm
index b242397b251..475e816a897 100644
--- a/code/game/objects/items/weapons/extinguisher.dm
+++ b/code/game/objects/items/weapons/extinguisher.dm
@@ -34,6 +34,16 @@
 	m_amt = 0
 	max_water = 30
 	sprite_name = "miniFE"
+	
+/obj/item/weapon/extinguisher/examine()
+	set src in usr
+
+	usr << "\icon[src] [src.name] contains:"
+	if(reagents && reagents.reagent_list.len)
+		for(var/datum/reagent/R in reagents.reagent_list)
+			usr << "\blue [R.volume] units of [R.name]"
+	..()
+	return
 
 /obj/item/weapon/extinguisher/New()
 	create_reagents(max_water)
@@ -91,19 +101,27 @@
 
 		if(usr.buckled && isobj(usr.buckled) && !usr.buckled.anchored )
 			spawn(0)
+				var/obj/structure/stool/bed/chair/C = null
+				if(istype(usr.buckled, /obj/structure/stool/bed/chair))
+					C = usr.buckled
 				var/obj/B = usr.buckled
 				var/movementdirection = turn(direction,180)
+				if(C)	C.propelled = 4
 				B.Move(get_step(usr,movementdirection), movementdirection)
 				sleep(1)
 				B.Move(get_step(usr,movementdirection), movementdirection)
+				if(C)	C.propelled = 3
+				sleep(1)
+				B.Move(get_step(usr,movementdirection), movementdirection)
 				sleep(1)
 				B.Move(get_step(usr,movementdirection), movementdirection)
-				sleep(1)
-				B.Move(get_step(usr,movementdirection), movementdirection)
+				if(C)	C.propelled = 2
 				sleep(2)
 				B.Move(get_step(usr,movementdirection), movementdirection)
+				if(C)	C.propelled = 1
 				sleep(2)
 				B.Move(get_step(usr,movementdirection), movementdirection)
+				if(C)	C.propelled = 0
 				sleep(3)
 				B.Move(get_step(usr,movementdirection), movementdirection)
 				sleep(3)
diff --git a/code/modules/mob/living/silicon/robot/robot.dm b/code/modules/mob/living/silicon/robot/robot.dm
index df291cc4738..3775adfba20 100644
--- a/code/modules/mob/living/silicon/robot/robot.dm
+++ b/code/modules/mob/living/silicon/robot/robot.dm
@@ -1403,7 +1403,7 @@ var/list/robot_verbs_default = list(
 
 	..()
 	
-/mob/living/silicon/robot/syndicate/init()
+/mob/living/silicon/robot/deathsquad/init()
 	aiCamera = new/obj/item/device/camera/siliconcam/robot_camera(src)
 
 	laws = new /datum/ai_laws/deathsquad