cyberpresidentvanellope/Yogstation
1
0
Fork 0
mirror of https://github.com/yogstation13/Yogstation.git synced 2025-02-26 09:04:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ObjProcessingFix' of git://github.com/phil235/-tg-station into phil235-ObjProcessingFix

Browse Source 
Conflicts:
	code/game/gamemodes/wizard/artefact.dm
This commit is contained in:
Cheridan
2015-02-15 10:27:50 -06:00
parent 449020891a 135293bedf
commit 15439b8c4e
38 changed files with 47 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -31,7 +31,7 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/captain/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/laser/captain/Destroy()
@@ -110,7 +110,7 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/bluetag/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/laser/bluetag/Destroy()
SSobj.processing.Remove(src)
@@ -140,7 +140,7 @@ obj/item/weapon/gun/energy/laser/retro
/obj/item/weapon/gun/energy/laser/redtag/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/laser/redtag/Destroy()
SSobj.processing.Remove(src)

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

@@ -26,7 +26,7 @@
/obj/item/weapon/gun/energy/gun/nuclear/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/gun/nuclear/Destroy()

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

@@ -35,7 +35,7 @@
/obj/item/weapon/gun/energy/floragun/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/floragun/Destroy()
@@ -71,7 +71,7 @@
/obj/item/weapon/gun/energy/meteorgun/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/meteorgun/Destroy()
@@ -209,7 +209,7 @@
/obj/item/weapon/gun/energy/disabler/cyborg/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/disabler/cyborg/Destroy()
@@ -294,7 +294,7 @@
/obj/item/weapon/gun/energy/printer/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/printer/Destroy()

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

@@ -31,7 +31,7 @@
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/New()
..()
SSobj.processing.Add(src)
SSobj.processing |= src
/obj/item/weapon/gun/energy/gun/advtaser/cyborg/Destroy()

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

@@ -50,7 +50,8 @@
..()
charges = max_charges
chambered = new ammo_type(src)
if(can_charge) SSobj.processing.Add(src)
if(can_charge)
SSobj.processing |= src
/obj/item/weapon/gun/magic/Destroy()