cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 02:34:00 +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

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

@@ -20,20 +20,20 @@
/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>",
"You hear the slow creaking of a spring." "You hear the slow creaking of a spring."
) )
if (do_after(user, 60)) if (do_after(user, 60))
user.visible_message( user.visible_message(
"<span class='danger'>[user] has deployed \the [src].</span>", "<span class='danger'>[user] has deployed \the [src].</span>",
"<span class='danger'>You have deployed \the [src]!</span>", "<span class='danger'>You have deployed \the [src]!</span>",
"You hear a latch click loudly." "You hear a latch click loudly."
) )
deployed = 1 deployed = 1
user.drop_from_inventory(src) user.drop_from_inventory(src)
update_icon() update_icon()
@@ -42,7 +42,7 @@
/obj/item/weapon/beartrap/attack_hand(mob/user as mob) /obj/item/weapon/beartrap/attack_hand(mob/user as mob)
if(buckled_mob && can_use(user)) if(buckled_mob && can_use(user))
user.visible_message( user.visible_message(
"<span class='notice'>[user] begins freeing [buckled_mob] from \the [src].</span>", "<span class='notice'>[user] begins freeing [buckled_mob] from \the [src].</span>",
"<span class='notice'>You carefully begin to free [buckled_mob] from \the [src].</span>", "<span class='notice'>You carefully begin to free [buckled_mob] from \the [src].</span>",
) )
if(do_after(user, 60)) if(do_after(user, 60))
@@ -51,13 +51,13 @@
anchored = 0 anchored = 0
else if(deployed && can_use(user)) else if(deployed && can_use(user))
user.visible_message( user.visible_message(
"<span class='danger'>[user] starts to disarm \the [src].</span>", "<span class='danger'>[user] starts to disarm \the [src].</span>",
"<span class='notice'>You begin disarming \the [src]!</span>", "<span class='notice'>You begin disarming \the [src]!</span>",
"You hear a latch click followed by the slow creaking of a spring." "You hear a latch click followed by the slow creaking of a spring."
) )
if(do_after(user, 60)) if(do_after(user, 60))
user.visible_message( user.visible_message(
"<span class='danger'>[user] has disarmed \the [src].</span>", "<span class='danger'>[user] has disarmed \the [src].</span>",
"<span class='notice'>You have disarmed \the [src]!</span>" "<span class='notice'>You have disarmed \the [src]!</span>"
) )
deployed = 0 deployed = 0
@@ -86,15 +86,18 @@
//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(
"<span class='danger'>[L] steps on \the [src].</span>", "<span class='danger'>[L] steps on \the [src].</span>",
"<span class='danger'>You step on \the [src]!</span>", "<span class='danger'>You step on \the [src]!</span>",
"<b>You hear a loud metallic snap!</b>" "<b>You hear a loud metallic snap!</b>"
) )