cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2026-08-22 20:57:23 +01:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Conflicts:
	code/game/objects/items/weapons/material/shards.dm
This commit is contained in:
PsiOmega
2015-08-30 10:23:14 +02:00
parent 13a11f89ac 88250ad57f
commit 6165b6fee3
3 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/material/shards.dm
+1 -2
View File
@@ -62,8 +62,7 @@
/obj/item/weapon/material/shard/Crossed(AM as mob|obj)
..()
if(ismob(AM))
if(isliving(AM))
var/mob/M = AM
if(M.buckled) //wheelchairs, office chairs, rollerbeds