cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2025-12-24 08:31:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

makes all Destroy()'s return properly

Browse Source
This commit is contained in:
duncathan
2015-08-31 00:21:01 -06:00
parent 529059c3f1
commit 51c09f16bf
172 changed files with 208 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
code/modules/projectiles/guns/energy/laser.dm
View File

@@ -40,7 +40,7 @@
/obj/item/weapon/gun/energy/laser/captain/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/laser/captain/process()
@@ -122,7 +122,7 @@
/obj/item/weapon/gun/energy/laser/bluetag/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/laser/bluetag/process()
charge_tick++
@@ -154,7 +154,7 @@
/obj/item/weapon/gun/energy/laser/redtag/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/laser/redtag/process()
charge_tick++

2
code/modules/projectiles/guns/energy/nuclear.dm
View File

@@ -64,7 +64,7 @@
/obj/item/weapon/gun/energy/gun/nuclear/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/gun/nuclear/process()

6
code/modules/projectiles/guns/energy/special.dm
View File

@@ -61,7 +61,7 @@
/obj/item/weapon/gun/energy/floragun/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/floragun/process()
@@ -97,7 +97,7 @@
/obj/item/weapon/gun/energy/meteorgun/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/meteorgun/process()
charge_tick++
@@ -301,7 +301,7 @@
/obj/item/weapon/gun/energy/printer/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/printer/process()
charge_tick++

4
code/modules/projectiles/guns/energy/stun.dm
View File

@@ -38,7 +38,7 @@
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++
@@ -78,7 +78,7 @@
/obj/item/weapon/gun/energy/disabler/cyborg/Destroy()
SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/energy/disabler/cyborg/process() //Every [recharge_time] ticks, recharge a shot for the cyborg
charge_tick++

2
code/modules/projectiles/guns/magic.dm
View File

@@ -56,7 +56,7 @@
/obj/item/weapon/gun/magic/Destroy()
if(can_charge) SSobj.processing.Remove(src)
..()
return ..()
/obj/item/weapon/gun/magic/process()