Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Shieldfix(fixes shields) #2679

Closed
wants to merge 3 commits into from
Closed

Shieldfix(fixes shields) #2679

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a0489f0
fixes offcenter shields
Pockets-byte Jun 7, 2024
45fcc34
might fix double shield effects
Pockets-byte Jun 7, 2024
cb580c0
AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA
Pockets-byte Jun 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions nsv13/code/modules/overmap/fighters/_fighters.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -377,6 +377,10 @@ Been a mess since 2018, we'll fix it someday (probably)
/obj/structure/overmap/small_craft/forceMove(atom/destination)
return doMove(destination)

/obj/structure/overmap/small_craft/combat/light/Initialize(mapload)
. = ..()
AddComponent(/datum/component/overmap_shields, 125, 125, 15) //inital integrity, max integrity, and recharge rate. bound to change most likely

/obj/structure/overmap/small_craft/combat/light
name = "Su-818 Rapier"
desc = "An Su-818 Rapier space superiorty fighter craft. Designed for high maneuvreability and maximum combat effectiveness against other similar weight classes."
Expand Down
1 change: 1 addition & 0 deletions nsv13/code/modules/overmap/shieldgen.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -362,6 +362,7 @@
overmap.vis_contents += src

/obj/effect/temp_visual/overmap_shield_hit/Destroy()

overmap?.vis_contents -= src
overmap = null
return ..()
Expand Down
7 changes: 5 additions & 2 deletions nsv13/code/modules/overmap/weapons/damage.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,8 @@ Bullet reactions
if(shield_result)
var/damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
if(!impact_sound_cooldown)
new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
var/obj/effect/temp_visual/overmap_shield_hit/E= new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src)
qdel(E)
relay(damage_sound)
if(P.damage >= 15) //Flak begone
shake_everyone(5)
Expand Down Expand Up @@ -81,8 +82,10 @@ Bullet reactions
if(!bypasses_shields && shields && shields.absorb_hit(damage_amount))
blocked = TRUE
damage_sound = pick('nsv13/sound/effects/ship/damage/shield_hit.ogg', 'nsv13/sound/effects/ship/damage/shield_hit2.ogg')
/*
if(!impact_sound_cooldown)
add_overlay(new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src))
var/obj/effect/temp_visual/overmap_shield_hit/E = new(src)
*/
if(!impact_sound_cooldown && damage_sound)
relay(damage_sound)
if(damage_amount >= 15) //Flak begone
Expand Down
Loading