cyberpresidentvanellope/VOREStation
1
0
Fork 0
mirror of https://github.com/VOREStation/VOREStation.git synced 2026-07-19 02:56:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into dev-freeze

Browse Source
This commit is contained in:
GinjaNinja32
2015-08-22 15:28:49 +01:00
parent a7f452416e 70241d576f
commit 4e56b82ec0
7 changed files with 680 additions and 620 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/traps.dm
+1
View File
@@ -9,6 +9,7 @@
throwforce = 0
w_class = 3
origin_tech = "materials=1"
matter = list(DEFAULT_WALL_MATERIAL = 18750)
var/deployed = 0
/obj/item/weapon/beartrap/suicide_act(mob/user)