cyberpresidentvanellope/CHOMPStation2
1
0
Fork 0
mirror of https://github.com/CHOMPStation2/CHOMPStation2.git synced 2025-12-13 11:43:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5464 from Neerti/arc_projectile_fix

Browse Source 
Makes arcing projectiles exist in the code.
This commit is contained in:
Anewbe
2018-08-03 10:37:03 -05:00
committed by GitHub
parent f69fecf1a1 75048b8e14
commit c652369f34
3 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
code/modules/projectiles/projectile.dm
View File

@@ -323,6 +323,7 @@
before_move() before_move()
Move(location.return_turf()) Move(location.return_turf())
after_move()
if(!bumped && !isturf(original)) if(!bumped && !isturf(original))
if(loc == get_turf(original)) if(loc == get_turf(original))
@@ -348,6 +349,9 @@
/obj/item/projectile/proc/before_move() /obj/item/projectile/proc/before_move()
return return
/obj/item/projectile/proc/after_move()
return
/obj/item/projectile/proc/setup_trajectory(turf/startloc, turf/targloc, var/x_offset = 0, var/y_offset = 0) /obj/item/projectile/proc/setup_trajectory(turf/startloc, turf/targloc, var/x_offset = 0, var/y_offset = 0)
// setup projectile state // setup projectile state
starting = startloc starting = startloc

BIN
icons/obj/projectiles.dmi
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 55 KiB

After

Width:  |  Height:  |  Size: 56 KiB

1
polaris.dme
View File

@@ -2145,6 +2145,7 @@
#include "code\modules\projectiles\guns\projectile\sniper.dm" #include "code\modules\projectiles\guns\projectile\sniper.dm"
#include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm" #include "code\modules\projectiles\guns\projectile\sniper\collapsible_sniper.dm"
#include "code\modules\projectiles\projectile\animate.dm" #include "code\modules\projectiles\projectile\animate.dm"
#include "code\modules\projectiles\projectile\arc.dm"
#include "code\modules\projectiles\projectile\beams.dm" #include "code\modules\projectiles\projectile\beams.dm"
#include "code\modules\projectiles\projectile\bullets.dm" #include "code\modules\projectiles\projectile\bullets.dm"
#include "code\modules\projectiles\projectile\change.dm" #include "code\modules\projectiles\projectile\change.dm"