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-17 22:51:51 -07: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/toys.dm
+1 -1
View File
@@ -237,7 +237,7 @@
w_class = WEIGHT_CLASS_SMALL
add_fingerprint(user)
// Copied from /obj/item/weapon/melee/energy/sword/attackby
// Copied from /obj/item/weapon/melee/transforming/energy/sword/attackby
/obj/item/toy/sword/attackby(obj/item/weapon/W, mob/living/user, params)
if(istype(W, /obj/item/toy/sword))
if((W.flags & NODROP) || (flags & NODROP))