cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 18:53:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixes #9785

Browse Source
This commit is contained in:
Zuhayr
2015-06-20 22:12:38 +09:30
parent e13c4a2243
commit c8c35acf3a
1 changed files with 14 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
code/game/objects/items/weapons/traps.dm
View File

@@ -20,7 +20,7 @@
/obj/item/weapon/beartrap/attack_self(mob/user as mob) /obj/item/weapon/beartrap/attack_self(mob/user as mob)
..() ..()
if(deployed && can_use(user)) if(!deployed && can_use(user))
user.visible_message( user.visible_message(
"<span class='danger'>[user] starts to deploy \the [src].</span>", "<span class='danger'>[user] starts to deploy \the [src].</span>",
"<span class='danger'>You begin deploying \the [src]!</span>", "<span class='danger'>You begin deploying \the [src]!</span>",
@@ -86,11 +86,14 @@
//trap the victim in place //trap the victim in place
if(!blocked) if(!blocked)
set_dir(L.dir) set_dir(L.dir)
can_buckle = 1
buckle_mob(L) buckle_mob(L)
L << "<span class='danger'>The steel jaws of \the [src] bite into you, trapping you in place!</span>" L << "<span class='danger'>The steel jaws of \the [src] bite into you, trapping you in place!</span>"
deployed = 0
can_buckle = initial(can_buckle)
/obj/item/weapon/beartrap/Crossed(AM as mob|obj) /obj/item/weapon/beartrap/Crossed(AM as mob|obj)
if(isliving(AM)) if(deployed && isliving(AM))
var/mob/living/L = AM var/mob/living/L = AM
if(L.m_intent == "run") if(L.m_intent == "run")
L.visible_message( L.visible_message(