cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-11 10:43:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/PolarisSS13/Polaris into polaris-sync-20170630

Browse Source
This commit is contained in:
Leshana
2017-06-30 22:05:02 -04:00
parent 1a9546f8ab 7164f8ed23
commit 18b1828631
67 changed files with 1127 additions and 278 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
code/modules/tables/interactions.dm
View File

@@ -130,7 +130,7 @@
break_to_parts()
return
if(istype(W, /obj/item/weapon/melee/arm_blade))
if(istype(W, /obj/item/weapon/melee/changeling/arm_blade))
user.visible_message("<span class='danger'>\The [src] was sliced apart by [user]!</span>")
break_to_parts()
return