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

Energy swords and other transforming energy weapons are now subtypes of transforming weapons (#2049)

Browse Source
This commit is contained in:
CitadelStationBot
2017-07-18 00:51:51 -05:00
committed by kevinz000
parent 7a173b95ed
commit bbc28aa856
30 changed files with 131 additions and 168 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/game/objects/items/weapons/sharpener.dm
+1 -1
View File
@@ -20,7 +20,7 @@
if(requires_sharpness && !I.sharpness)
to_chat(user, "<span class='notice'>You can only sharpen items that are already sharp, such as knives.</span>")
return
if(istype(I, /obj/item/weapon/melee/energy))
if(istype(I, /obj/item/weapon/melee/transforming/energy))
to_chat(user, "<span class='notice'>You don't think \the [I] will be the thing getting modified if you use it on \the [src].</span>")
return
if(istype(I, /obj/item/weapon/twohanded))//some twohanded items should still be sharpenable, but handle force differently. therefore i need this stuff