cyberpresidentvanellope/Bubberstation
1
0
Fork 0
mirror of https://github.com/Bubberstation/Bubberstation.git synced 2026-07-14 09:35:30 +01:00
Code Issues Packages Projects Releases Wiki Activity

why the fuck

Browse Source
This commit is contained in:
kevinz000
2016-06-04 02:44:25 -07:00
parent b7034fe3f7
commit e8ddb7a4d7
1 changed files with 0 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy.dm
-4
View File
@@ -183,8 +183,6 @@ obj/item/ammo_casing/energy/net
e_cost = 200
select_name = "stun"
projectile_type = /obj/item/projectile/energy/shock_revolver
<<<<<<< HEAD
/obj/item/ammo_casing/energy/gravipulse
projectile_type = /obj/item/projectile/gravipulse
@@ -200,5 +198,3 @@ obj/item/ammo_casing/energy/net
/obj/item/ammo_casing/energy/gravipulse/alt
projectile_type = /obj/item/projectile/gravipulse/alt
select_name = "attract"
=======
>>>>>>> refs/remotes/tgstation/master