cyberpresidentvanellope/Aurora.3
1
0
Fork 0
mirror of https://github.com/Aurorastation/Aurora.3.git synced 2026-08-31 00:49:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

Repathed /obj/item/projectile to /obj/projectile (#19693)

Browse Source 
Repathed /obj/item/projectile to /obj/projectile, same as TG and Bay,
that's pretty much it.
This commit is contained in:
Fluffy
2024-07-27 10:09:46 +00:00
committed by GitHub
parent 2a8d6acd86
commit 3e1b9d4170
214 changed files with 1014 additions and 971 deletions
Download Patch File Download Diff File Expand all files Collapse all files
code/modules/psionics/abilities/air_bullet.dm
+2 -2
View File
@@ -13,7 +13,7 @@
icon_state = "force_missile"
cast_methods = CAST_RANGED|CAST_USE
aspect = ASPECT_PSIONIC
spell_projectile = /obj/item/projectile/air_bullet
spell_projectile = /obj/projectile/air_bullet
fire_sound = 'sound/weapons/wave.ogg'
cooldown = 5
psi_cost = 0
@@ -48,7 +48,7 @@
bullets--
maptext = SMALL_FONTS(7, bullets)
/obj/item/projectile/air_bullet
/obj/projectile/air_bullet
name = "air bullet"
icon_state = "plasma_bolt"
damage = 30
code/modules/psionics/abilities/hollow_purple.dm
+8 -8
View File
@@ -15,7 +15,7 @@
icon_state = "destablize"
cast_methods = CAST_RANGED
aspect = ASPECT_PSIONIC
spell_projectile = /obj/item/projectile/hollow_purple
spell_projectile = /obj/projectile/hollow_purple
fire_sound = 'sound/magic/WandODeath.ogg'
cooldown = 10
psi_cost = 50
@@ -53,7 +53,7 @@
for(var/mob/living/L in get_hearers_in_view(7, src))
shake_camera(L, 5, 5)
/obj/item/projectile/hollow_purple
/obj/projectile/hollow_purple
name = "hollow purple"
icon_state = "hollow_purple"
color = COLOR_PURPLE
@@ -65,14 +65,14 @@
anti_materiel_potential = 100
damage_type = DAMAGE_BRUTE
/obj/item/projectile/hollow_purple/Initialize()
/obj/projectile/hollow_purple/Initialize()
. = ..()
set_light(10, 10, COLOR_PURPLE)
/obj/item/projectile/hollow_purple/Destroy()
/obj/projectile/hollow_purple/Destroy()
return ..()
/obj/item/projectile/hollow_purple/on_impact(var/atom/A)
/obj/projectile/hollow_purple/on_impact(var/atom/A)
if(ismob(A))
if(A != firer)
var/mob/M = A
@@ -80,7 +80,7 @@
explosion(A, 5, 5, 5)
..()
/obj/item/projectile/hollow_purple/on_hit(atom/target, blocked, def_zone)
/obj/projectile/hollow_purple/on_hit(atom/target, blocked, def_zone)
if(ismob(target))
if(target != firer)
var/mob/M = target
@@ -88,11 +88,11 @@
explosion(target, 5, 5, 5)
..()
/obj/item/projectile/hollow_purple/check_penetrate(atom/A)
/obj/projectile/hollow_purple/check_penetrate(atom/A)
on_hit(A)
return TRUE
/obj/item/projectile/hollow_purple/after_move()
/obj/projectile/hollow_purple/after_move()
for(var/a in range(3, src))
if(isliving(a) && a != firer)
var/mob/living/M = a
code/modules/psionics/abilities/lightning.dm
+9 -9
View File
@@ -12,7 +12,7 @@
icon_state = "chain_lightning"
cast_methods = CAST_RANGED|CAST_USE
aspect = ASPECT_PSIONIC
spell_projectile = /obj/item/projectile/beam/psi_lightning
spell_projectile = /obj/projectile/beam/psi_lightning
fire_sound = 'sound/magic/LightningShock.ogg'
cooldown = 10
psi_cost = 15
@@ -23,13 +23,13 @@
mode = !mode
if(mode)
to_chat(user, SPAN_NOTICE("You will now fire area-of-effect lightning in a 4x3 area in front of you."))
spell_projectile = /obj/item/projectile/beam/psi_lightning/wide
spell_projectile = /obj/projectile/beam/psi_lightning/wide
else
to_chat(user, SPAN_NOTICE("You will now fire a normal lightning bolt."))
spell_projectile = /obj/item/projectile/beam/psi_lightning
spell_projectile = /obj/projectile/beam/psi_lightning
/obj/item/projectile/beam/psi_lightning
/obj/projectile/beam/psi_lightning
name = "psionic lightning"
damage = 30
armor_penetration = 30
@@ -43,18 +43,18 @@
impact_type = /obj/effect/projectile/impact/tesla
/obj/item/projectile/beam/psi_lightning/pellet
/obj/projectile/beam/psi_lightning/pellet
damage = 20
armor_penetration = 20
/obj/item/projectile/beam/psi_lightning/wide
/obj/projectile/beam/psi_lightning/wide
damage = 20
armor_penetration = 20
/obj/item/projectile/beam/psi_lightning/wide/Initialize()
/obj/projectile/beam/psi_lightning/wide/Initialize()
. = ..()
for(var/i = 1 to 4)
var/turf/new_turf = get_random_turf_in_range(get_turf(firer), i + rand(0, i), 0, TRUE, FALSE)
var/obj/item/projectile/beam/psi_lightning/pellet/pellet = new type(new_turf)
var/obj/projectile/beam/psi_lightning/pellet/pellet = new type(new_turf)
var/turf/front_turf = get_step(pellet, pellet.dir)
INVOKE_ASYNC(pellet, TYPE_PROC_REF(/obj/item/projectile/beam/psi_lightning/pellet, launch_projectile), front_turf)
INVOKE_ASYNC(pellet, TYPE_PROC_REF(/obj/projectile/beam/psi_lightning/pellet, launch_projectile), front_turf)
code/modules/psionics/abilities/throw.dm
+5 -5
View File
@@ -12,7 +12,7 @@
icon_state = "aspect_bolt"
cast_methods = CAST_RANGED
aspect = ASPECT_PSIONIC
spell_projectile = /obj/item/projectile/psionic_throw
spell_projectile = /obj/projectile/psionic_throw
fire_sound = 'sound/weapons/wave.ogg'
cooldown = 20
psi_cost = 20
@@ -48,8 +48,8 @@
item_to_throw = null
ClearOverlays()
/obj/item/spell/projectile/throw_item/make_projectile(obj/item/projectile/projectile_type, mob/living/user)
var/obj/item/projectile/psionic_throw/P = ..()
/obj/item/spell/projectile/throw_item/make_projectile(obj/projectile/projectile_type, mob/living/user)
var/obj/projectile/psionic_throw/P = ..()
if(P && item_to_throw)
var/base_damage = item_to_throw.force > 5 ? item_to_throw.force : 10
/// Why is it called a fucking divisor? It's a multiplier...
@@ -80,13 +80,13 @@
P.source_item = item_to_throw
return P
/obj/item/projectile/psionic_throw
/obj/projectile/psionic_throw
name = "thrown projectile"
damage_type = DAMAGE_BRUTE
impact_sounds = list(BULLET_IMPACT_MEAT = SOUNDS_BULLET_MEAT, BULLET_IMPACT_METAL = SOUNDS_BULLET_METAL)
var/obj/source_item
/obj/item/projectile/psionic_throw/Destroy()
/obj/projectile/psionic_throw/Destroy()
if(source_item)
source_item.forceMove(loc)
source_item = null