mirror of
https://github.com/Aurorastation/Aurora.3.git
synced 2026-08-27 23:14:18 +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:
@@ -92,7 +92,7 @@
|
||||
qdel(src)
|
||||
return 50000
|
||||
|
||||
/obj/item/projectile/beam/emitter/singularity_pull()
|
||||
/obj/projectile/beam/emitter/singularity_pull()
|
||||
return
|
||||
|
||||
/obj/item/storage/backpack/holding/singularity_act(S, current_size)
|
||||
|
||||
@@ -156,7 +156,7 @@
|
||||
if(prob(35))
|
||||
spark_system.queue()
|
||||
|
||||
var/obj/item/projectile/beam/emitter/A = get_emitter_beam()
|
||||
var/obj/projectile/beam/emitter/A = get_emitter_beam()
|
||||
A.damage = round(power_per_shot / EMITTER_DAMAGE_POWER_TRANSFER)
|
||||
A.launch_projectile(get_step(src, dir))
|
||||
shot_counter++
|
||||
@@ -270,7 +270,7 @@
|
||||
return 0.2 SECONDS // This value doesn't really affect normal emitters, but *does* affect subtypes like the gyrotron that can have very long delays
|
||||
|
||||
/obj/machinery/power/emitter/proc/get_emitter_beam()
|
||||
return new /obj/item/projectile/beam/emitter(get_turf(src))
|
||||
return new /obj/projectile/beam/emitter(get_turf(src))
|
||||
|
||||
#undef EMITTER_LOOSE
|
||||
#undef EMITTER_BOLTED
|
||||
|
||||
@@ -160,8 +160,8 @@ field_generator power level display
|
||||
|
||||
return 0
|
||||
|
||||
/obj/machinery/field_generator/bullet_act(var/obj/item/projectile/Proj)
|
||||
if(istype(Proj, /obj/item/projectile/beam))
|
||||
/obj/machinery/field_generator/bullet_act(var/obj/projectile/Proj)
|
||||
if(istype(Proj, /obj/projectile/beam))
|
||||
power += Proj.damage * 1.25 * EMITTER_DAMAGE_POWER_TRANSFER
|
||||
update_icon()
|
||||
return 0
|
||||
|
||||
@@ -71,7 +71,7 @@
|
||||
energy += round((rand(20,60)/2),1)
|
||||
return
|
||||
|
||||
/obj/singularity/bullet_act(obj/item/projectile/P)
|
||||
/obj/singularity/bullet_act(obj/projectile/P)
|
||||
return 0 //Will there be an impact? Who knows. Will we see it? No.
|
||||
|
||||
/obj/singularity/Collide(atom/A)
|
||||
|
||||
Reference in New Issue
Block a user