cyberpresidentvanellope/Paradise
1
0
Fork 0
mirror of https://github.com/ParadiseSS13/Paradise.git synced 2026-08-26 13:37:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

New unarmed beartrap sprites by Cheri.

Browse Source 
Slightly improved beartrap code while I was there, mostly standardisation and formatting stuff as usual.

Fixed the Chaplain's PDA spawn.

Reduced the chance of stealthy hulk wall smashing. All but one of the messages will attempt to go over the radio now.
Changed hulk resist text colour to red because it was barely readable in green.

git-svn-id: http://tgstation13.googlecode.com/svn/trunk@5191 316c924e-a436-60f5-8080-3fe189b3f50e
This commit is contained in:
petethegoat@gmail.com
2012-11-25 20:57:08 +00:00
parent c69f0cab36
commit d9480a1407
8 changed files with 21 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/defines/obj/weapon.dm
+8 -8
View File
@@ -714,23 +714,23 @@
flags = FPRINT | TABLEPASS | CONDUCT
throwforce = 0
w_class = 3.0
throw_speed = 2
throw_range = 0 //cannot be thrown
origin_tech = "materials=1"
var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
var/breakouttime = 300 //Deciseconds = 30s = 0.5 minute
/obj/item/weapon/legcuffs/beartrap
name = "bear trap"
icon_state = "beartrap"
throw_speed = 2
throw_range = 1
icon_state = "beartrap0"
desc = "A trap used to catch bears and other legged creatures."
breakouttime = 300 //Deciseconds = 30s = 0.5 minute
var/armed = 0
/obj/item/weapon/legcuffs/beartrap/attack_self()
/obj/item/weapon/legcuffs/beartrap/attack_self(mob/user as mob)
..()
if(ishuman(usr) && !usr.stat && !usr.restrained())
if(ishuman(user) && !user.stat && !user.restrained())
armed = !armed
usr << "\blue \the [src] is now [(armed)?"armed":"disarmed"]"
icon_state = "beartrap[armed]"
user << "<span class='notice'>[src] is now [armed ? "armed" : "disarmed"]</span>"
/obj/item/weapon/legcuffs/beartrap/HasEntered(AM as mob|obj)
if(armed)