shikix/GS13NG
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into hopefullythefinalhardsync

Browse Source
This commit is contained in:
deathride58
2018-07-05 00:17:44 -04:00
parent cc628a905e e92379e360
commit ac6fddcfb3
18 changed files with 99 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/projectiles/ammunition/energy/gravity.dm
+3 -3
View File
@@ -7,8 +7,8 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravityrepulse/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()
/obj/item/ammo_casing/energy/gravityattract
projectile_type = /obj/item/projectile/gravityattract
@@ -20,8 +20,8 @@
/obj/item/ammo_casing/energy/gravityattract/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()
/obj/item/ammo_casing/energy/gravitychaos
projectile_type = /obj/item/projectile/gravitychaos
@@ -32,5 +32,5 @@
var/obj/item/gun/energy/gravity_gun/gun
/obj/item/ammo_casing/energy/gravitychaos/Initialize(mapload, obj/item/gun/energy/gravity_gun/G)
. = ..()
gun = G
. = ..()