shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' into master

Browse Source
This commit is contained in:
Thalpy
2019-07-04 03:14:29 +01:00
committed by GitHub
parent bccd3e42b6 a814442fa5
commit 8a6e669060
82 changed files with 965 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/storage/toolbox.dm
+1 -1
View File
@@ -192,7 +192,7 @@
w_class = WEIGHT_CLASS_HUGE //heyo no bohing this!
force = 18 //spear damage
/obj/item/storage/toolbox/durasteel/afterattack(atom/A, mob/user, proximity)
/obj/item/storage/toolbox/plastitanium/afterattack(atom/A, mob/user, proximity)
. = ..()
if(proximity && isobj(A) && !isitem(A))
var/obj/O = A