From dcf7c34990f881d1d63418654594c96ed8db6733 Mon Sep 17 00:00:00 2001
From: Pete Goodfellow <petethegoat@gmail.com>
Date: Tue, 28 May 2013 21:31:28 +0100
Subject: [PATCH] Changed the suicide text for cable coils if you're standing
 on a stool bed or chair.

Fixed some table icon_states that Cheri missed.
---
 code/modules/power/cable.dm |   5 ++++-
 icons/obj/structures.dmi    | Bin 102529 -> 102529 bytes
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/code/modules/power/cable.dm b/code/modules/power/cable.dm
index 468616da212..2bd03158537 100644
--- a/code/modules/power/cable.dm
+++ b/code/modules/power/cable.dm
@@ -227,7 +227,10 @@
 	attack_verb = list("whipped", "lashed", "disciplined", "flogged")
 
 	suicide_act(mob/user)
-		viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+		if(locate(/obj/structure/stool) in user.loc)
+			viewers(user) << "\red <b>[user] is making a noose with the [src.name]! It looks like \he's trying to commit suicide.</b>"
+		else
+			viewers(user) << "\red <b>[user] is strangling \himself with the [src.name]! It looks like \he's trying to commit suicide.</b>"
 		return(OXYLOSS)
 
 
diff --git a/icons/obj/structures.dmi b/icons/obj/structures.dmi
index 4e91f6cd615ffcad595ab8a4659588f2f7375bab..f28fb421cadf15c3afb76feafb984d95d9f6766a 100644
GIT binary patch
delta 335
zcmZo%$kw=!ZG$Fb{R3gkX{<A@Z=7;6`MaSNSG4w_t)(x6ISMm2h|LSg&`bZ(vaNsd
zgM0H?o0xa3QMYaNwzKVG%w7E9zQmQPf;00~PMJ3FUw3A_SHe9(+cA%`NPEI>&Z2&W
z?<__89oEfQtY9^fDYvxo+&YK$pasF6;<^QHGiM30UVbZhCD-w(*p>P`$FE{n@*P>l
zuM{+jir*+~yes<Sxx$8LUAva8$i_x+?OwJa8%$VTHGRPL<(lQB%3WU=S*pIwHN3m%
zeb0gV;GW05+OGGa*f*PHm3L%mZH_p5>gKEZkHX&$2MX+woA>Cz+YgI&eJQGFTwZQ-
z_?+2G<&td++bb4KP?45j>|oiiGVMn3f(=hUFzgMMe|hZ}+w#o%3+uCg?5(Veo&EK+
Z+JE-QS<Jc4rFUO7Co^qNW@41<0|3|+rNsaM

delta 335
zcmZo%$kw=!ZG$Fb{RLsmX{^((ZJct_`MaSNSG4w_t)(xGISMm2u+0m|&`ST&vaEmc
zgLCs)o8InUqi);cZD-rXn7jDHeTgeo0rUKYo=P2PKfRFQ{Z7^sQx&$e>=Zrmmu08>
zgleXp@e1K*0tM!JG;Z7FkRHCkS@XimCEa2ci+y}Mn_hn7c(rXo5qDPo_61ekueL8}
z;?CM}po{y>jsx$w{uB#D6uZU-Uopi-w8jSCFa;BHUr7}(SG|@wX%qX4fywsQxfyvE
z%iSLA*F5&|*i@zbwat;zTdiG8r$(+xdz$lg{}0aJ4>dUA`27nXlvM=AR$1;jaCx^)
zV*2baf>yULINJnxOzQ0qTrkI7$oq|Dz>T7chI=deOR{U5FK@AbaozOKJ)8aO&i+cB
Y{GZt=kZHZv^wNOlWTx%OOpJ1U0LsCi<NyEw