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/modules/projectiles/guns/ballistic/revolver.dm
+2 -2
View File
@@ -278,8 +278,8 @@
..()
if(istype(A, /obj/item/ammo_box) || istype(A, /obj/item/ammo_casing))
chamber_round()
if(istype(A, /obj/item/weapon/melee/energy))
var/obj/item/weapon/melee/energy/W = A
if(istype(A, /obj/item/weapon/melee/transforming/energy))
var/obj/item/weapon/melee/transforming/energy/W = A
if(W.active)
sawoff(user)
if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
code/modules/projectiles/guns/ballistic/shotgun.dm
+2 -2
View File
@@ -89,8 +89,8 @@
..()
if(istype(A, /obj/item/weapon/circular_saw) || istype(A, /obj/item/weapon/gun/energy/plasmacutter))
sawoff(user)
if(istype(A, /obj/item/weapon/melee/energy))
var/obj/item/weapon/melee/energy/W = A
if(istype(A, /obj/item/weapon/melee/transforming/energy))
var/obj/item/weapon/melee/transforming/energy/W = A
if(W.active)
sawoff(user)