From a0489f05d2b55cca24d0efa660ac409b505556c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:31:42 -0600 Subject: [PATCH 1/3] fixes offcenter shields --- nsv13/code/modules/overmap/weapons/damage.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/weapons/damage.dm b/nsv13/code/modules/overmap/weapons/damage.dm index 1bcd3fa46b1..775db4b4140 100644 --- a/nsv13/code/modules/overmap/weapons/damage.dm +++ b/nsv13/code/modules/overmap/weapons/damage.dm @@ -82,7 +82,10 @@ Bullet reactions 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 /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src) + add_overlay(E) + E.pixel_y = pixel_y + E.pixel_x = pixel_x if(!impact_sound_cooldown && damage_sound) relay(damage_sound) if(damage_amount >= 15) //Flak begone From 45fcc34dbff8967a5f2dfa6b56680d8686d9f4b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 7 Jun 2024 12:48:38 -0600 Subject: [PATCH 2/3] might fix double shield effects --- nsv13/code/modules/overmap/shieldgen.dm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nsv13/code/modules/overmap/shieldgen.dm b/nsv13/code/modules/overmap/shieldgen.dm index d0cd127dd03..9b9a074640c 100644 --- a/nsv13/code/modules/overmap/shieldgen.dm +++ b/nsv13/code/modules/overmap/shieldgen.dm @@ -359,10 +359,13 @@ desired.Scale(resize_x,resize_y) desired.Turn(overmap.angle) transform = desired + /* overmap.vis_contents += src - +*/ /obj/effect/temp_visual/overmap_shield_hit/Destroy() +/* overmap?.vis_contents -= src +*/ overmap = null return ..() From cb580c097fbfceda5e631cba44070fbec52d9cde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E1=9B=88=E1=9B=9F=E1=9A=B2=E1=9A=B2=E1=9B=96=E1=9B=8F?= =?UTF-8?q?=E1=9B=8B?= <55299415+Pockets-byte@users.noreply.github.com> Date: Fri, 7 Jun 2024 14:30:22 -0600 Subject: [PATCH 3/3] AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA --- nsv13/code/modules/overmap/fighters/_fighters.dm | 4 ++++ nsv13/code/modules/overmap/shieldgen.dm | 6 ++---- nsv13/code/modules/overmap/weapons/damage.dm | 10 +++++----- 3 files changed, 11 insertions(+), 9 deletions(-) diff --git a/nsv13/code/modules/overmap/fighters/_fighters.dm b/nsv13/code/modules/overmap/fighters/_fighters.dm index 543c4bf5cd7..7249f6eb239 100644 --- a/nsv13/code/modules/overmap/fighters/_fighters.dm +++ b/nsv13/code/modules/overmap/fighters/_fighters.dm @@ -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." diff --git a/nsv13/code/modules/overmap/shieldgen.dm b/nsv13/code/modules/overmap/shieldgen.dm index 9b9a074640c..493b8994259 100644 --- a/nsv13/code/modules/overmap/shieldgen.dm +++ b/nsv13/code/modules/overmap/shieldgen.dm @@ -359,13 +359,11 @@ desired.Scale(resize_x,resize_y) desired.Turn(overmap.angle) transform = desired - /* overmap.vis_contents += src -*/ + /obj/effect/temp_visual/overmap_shield_hit/Destroy() -/* + overmap?.vis_contents -= src -*/ overmap = null return ..() diff --git a/nsv13/code/modules/overmap/weapons/damage.dm b/nsv13/code/modules/overmap/weapons/damage.dm index 775db4b4140..d297fd2c0c4 100644 --- a/nsv13/code/modules/overmap/weapons/damage.dm +++ b/nsv13/code/modules/overmap/weapons/damage.dm @@ -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) @@ -81,11 +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) - var/obj/effect/temp_visual/overmap_shield_hit/E = new /obj/effect/temp_visual/overmap_shield_hit(get_turf(src), src) - add_overlay(E) - E.pixel_y = pixel_y - E.pixel_x = pixel_x + 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