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

Tg 2 11 sync (#215)

Browse Source 
* first series of updates

* datums

* games folder

* admin and atmosia stuffs

* moar

* mob updates borg riding

* sprites and stuff

* fixes for various things

* oops. some missed fixes
This commit is contained in:
Poojawa
2017-02-12 03:56:14 -06:00
committed by GitHub
parent 30b3dff395
commit 6674f9fc15
153 changed files with 1651 additions and 1368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/spells/spell_types/aimed.dm
+11
View File
@@ -6,6 +6,7 @@
var/active_msg = "You charge your projectile!"
var/base_icon_state = "projectile"
var/active_icon_state = "projectile"
var/projectile_damage_override = -1
/obj/effect/proc_holder/spell/aimed/Click()
var/mob/living/user = usr
@@ -54,6 +55,11 @@
var/obj/item/projectile/P = new projectile_type(user.loc)
P.current = get_turf(user)
P.preparePixelProjectile(target, get_turf(target), user)
if(projectile_damage_override != -1)
P.damage = projectile_damage_override
P.nodamage = TRUE
if(P.damage)
P.nodamage = FALSE
P.fire()
return TRUE
@@ -80,6 +86,11 @@
var/obj/item/projectile/magic/aoe/lightning/P = new /obj/item/projectile/magic/aoe/lightning(user.loc)
P.current = get_turf(user)
P.preparePixelProjectile(target, get_turf(target), user)
if(projectile_damage_override != -1)
P.damage = projectile_damage_override
P.nodamage = TRUE
if(P.damage)
P.nodamage = FALSE
P.tesla_power = tesla_power
P.tesla_range = tesla_range
P.tesla_boom = tesla_boom