Merge pull request #7801 from Mloc/bs12-glowypipes

refactor buckling + glowy HE pipes
This commit is contained in:
Chinsky
2015-02-03 18:12:09 +03:00
29 changed files with 250 additions and 145 deletions
@@ -23,6 +23,8 @@
if (source.handcuffed)
var/obj/item/weapon/W = source.handcuffed
source.handcuffed = null
if(source.buckled && source.buckled.buckle_require_restraints)
source.buckled.unbuckle_mob()
source.update_inv_handcuffed()
if (source.client)
source.client.screen -= W
+1 -1
View File
@@ -69,7 +69,7 @@
return
if(user && user.buckled)
user.buckled.unbuckle()
user.buckled.unbuckle_mob()
var/list/tempL = L
var/attempt = null
+3 -1
View File
@@ -119,6 +119,8 @@
"You cut \the [C]'s restraints with \the [src]!",\
"You hear cable being cut.")
C.handcuffed = null
if(C.buckled && C.buckled.buckle_require_restraints)
C.buckled.unbuckle_mob()
C.update_inv_handcuffed()
return
else
@@ -531,4 +533,4 @@
if(!resolved && tool && target)
tool.afterattack(target,user,1)
if(tool)
tool.loc = src*/
tool.loc = src*/