AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA

BeeStation · Jun 7, 2024 · cb580c0 · cb580c0
1 parent 45fcc34
commit cb580c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git 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
@@ -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
@@ -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