mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-30 16:38:22 +01:00
Repathed /obj/item/projectile to /obj/projectile (#19693)
Repathed /obj/item/projectile to /obj/projectile, same as TG and Bay, that's pretty much it.
This commit is contained in:
@@ -140,7 +140,7 @@
|
||||
if(H)
|
||||
H.electrocute_act(power, src)
|
||||
|
||||
/obj/item/poppet/bullet_act(var/obj/item/projectile/Proj)
|
||||
/obj/item/poppet/bullet_act(var/obj/projectile/Proj)
|
||||
var/mob/living/carbon/human/H = target.resolve()
|
||||
if(H)
|
||||
H.apply_damage(Proj.damage, DAMAGE_PAIN)
|
||||
|
||||
@@ -10,7 +10,7 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
|
||||
range = 7
|
||||
|
||||
var/proj_type = /obj/item/projectile/spell_projectile //use these. They are very nice
|
||||
var/proj_type = /obj/projectile/spell_projectile //use these. They are very nice
|
||||
|
||||
var/proj_step_delay = 1 //lower = faster
|
||||
var/cast_prox_range = 1
|
||||
@@ -21,7 +21,7 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
proj_type = text2path(proj_type) // sanity filters
|
||||
|
||||
for(var/atom/target in targets)
|
||||
var/obj/item/projectile/projectile = new proj_type(user.loc, user.dir)
|
||||
var/obj/projectile/projectile = new proj_type(user.loc, user.dir)
|
||||
|
||||
if(!projectile)
|
||||
return
|
||||
@@ -30,8 +30,8 @@ If the spell_projectile is seeking, it will update its target every process and
|
||||
projectile.shot_from = user //fired from the user
|
||||
projectile.hitscan = !proj_step_delay
|
||||
projectile.speed = proj_step_delay
|
||||
if(istype(projectile, /obj/item/projectile/spell_projectile))
|
||||
var/obj/item/projectile/spell_projectile/SP = projectile
|
||||
if(istype(projectile, /obj/projectile/spell_projectile))
|
||||
var/obj/projectile/spell_projectile/SP = projectile
|
||||
SP.carried = src //casting is magical
|
||||
projectile.launch_projectile(target, target_zone=BP_CHEST)
|
||||
return
|
||||
|
||||
@@ -21,7 +21,7 @@
|
||||
density = 1
|
||||
unacidable = 1
|
||||
|
||||
/obj/effect/forcefield/bullet_act(var/obj/item/projectile/Proj, var/def_zone)
|
||||
/obj/effect/forcefield/bullet_act(var/obj/projectile/Proj, var/def_zone)
|
||||
var/turf/T = get_turf(src.loc)
|
||||
if(T)
|
||||
for(var/mob/M in T)
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
/obj/item/projectile/spell_projectile
|
||||
/obj/projectile/spell_projectile
|
||||
name = "spell"
|
||||
icon = 'icons/obj/projectiles.dmi'
|
||||
|
||||
@@ -15,16 +15,16 @@
|
||||
var/proj_trail_icon_state = "trail"
|
||||
var/list/trails = new()
|
||||
|
||||
/obj/item/projectile/spell_projectile/Destroy()
|
||||
/obj/projectile/spell_projectile/Destroy()
|
||||
for(var/trail in trails)
|
||||
qdel(trail)
|
||||
carried = null
|
||||
return ..()
|
||||
|
||||
/obj/item/projectile/spell_projectile/ex_act(var/severity = 2.0)
|
||||
/obj/projectile/spell_projectile/ex_act(var/severity = 2.0)
|
||||
return
|
||||
|
||||
/obj/item/projectile/spell_projectile/before_move()
|
||||
/obj/projectile/spell_projectile/before_move()
|
||||
if(proj_trail && src && src.loc) //pretty trails
|
||||
var/obj/effect/overlay/trail = new /obj/effect/overlay(src.loc)
|
||||
trails += trail
|
||||
@@ -33,25 +33,25 @@
|
||||
trail.density = 0
|
||||
addtimer(CALLBACK(src, PROC_REF(post_trail), trail), proj_trail_lifespan)
|
||||
|
||||
/obj/item/projectile/spell_projectile/proc/post_trail(obj/effect/overlay/trail)
|
||||
/obj/projectile/spell_projectile/proc/post_trail(obj/effect/overlay/trail)
|
||||
trails -= trail
|
||||
qdel(trail)
|
||||
|
||||
/obj/item/projectile/spell_projectile/proc/prox_cast(var/list/targets)
|
||||
/obj/projectile/spell_projectile/proc/prox_cast(var/list/targets)
|
||||
if(loc)
|
||||
carried.prox_cast(targets, src)
|
||||
qdel(src)
|
||||
return
|
||||
|
||||
/obj/item/projectile/spell_projectile/Collide(atom/A)
|
||||
/obj/projectile/spell_projectile/Collide(atom/A)
|
||||
if(loc && carried)
|
||||
prox_cast(carried.choose_prox_targets(user = carried.holder, spell_holder = src))
|
||||
return 1
|
||||
|
||||
/obj/item/projectile/spell_projectile/on_impact()
|
||||
/obj/projectile/spell_projectile/on_impact()
|
||||
if(loc && carried)
|
||||
prox_cast(carried.choose_prox_targets(user = carried.holder, spell_holder = src))
|
||||
return 1
|
||||
|
||||
/obj/item/projectile/spell_projectile/seeking
|
||||
/obj/projectile/spell_projectile/seeking
|
||||
name = "seeking spell"
|
||||
|
||||
Reference in New Issue
Block a user