From 1da4c6611773bb711f5bb700d8a3aae7176cdab3 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Wed, 29 Nov 2023 18:58:05 +0100
Subject: [PATCH 01/14] removes unused gau shrapnels

---
 code/datums/ammo/shrapnel.dm | 22 ----------------------
 1 file changed, 22 deletions(-)

diff --git a/code/datums/ammo/shrapnel.dm b/code/datums/ammo/shrapnel.dm
index e27caa4b277d..52649da9e27e 100644
--- a/code/datums/ammo/shrapnel.dm
+++ b/code/datums/ammo/shrapnel.dm
@@ -133,25 +133,3 @@
 /datum/ammo/bullet/shrapnel/jagged/on_hit_mob(mob/M, obj/projectile/P)
 	if(isxeno(M))
 		M.apply_effect(0.4, SLOW)
-
-/*
-//========
-					CAS 30mm impacters
-//========
-*/
-/datum/ammo/bullet/shrapnel/gau  //for the GAU to have a impact bullet instead of firecrackers
-	name = "30mm Multi-Purpose shell"
-
-	damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects.
-	damage_type = BRUTE
-	penetration = ARMOR_PENETRATION_TIER_2
-	accuracy = HIT_ACCURACY_TIER_MAX
-	max_range = 0
-	shrapnel_chance = 100 //the least of your problems
-
-/datum/ammo/bullet/shrapnel/gau/at
-	name = "30mm Anti-Tank shell"
-
-	damage = 1 // ALL DAMAGE IS IN dropship_ammo SO WE CAN DEAL DAMAGE TO RESTING MOBS, these will still remain however so that we can get cause_data and status effects.
-	penetration = ARMOR_PENETRATION_TIER_8
-	accuracy = HIT_ACCURACY_TIER_MAX

From 9a18af55cad96f6720a96fa30f44396354b46afd Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:00:27 +0100
Subject: [PATCH 02/14] updates GAU itself

---
 code/modules/cm_marines/dropship_ammo.dm | 38 +++++++++++++-----------
 1 file changed, 20 insertions(+), 18 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index ef59e643e4cf..c75ee9c42f7e 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -138,16 +138,18 @@
 	icon_state = "30mm_crate"
 	desc = "A crate full of PGU-100 30mm Multi-Purpose ammo designed to penetrate light (non reinforced) structures, as well as shred infantry, IAVs, LAVs, IMVs, and MRAPs. Works in large areas for use on Class 4 and superior alien insectoid infestations, as well as fitting within the armaments allowed for use against a tier 4 insurgency as well as higher tiers. However, it lacks armor penetrating capabilities, for which Anti-Tank 30mm ammo is needed. Can be loaded into the GAU-21 30mm cannon."
 	equipment_type = /obj/structure/dropship_equipment/weapon/heavygun
-	ammo_count = 400
-	max_ammo_count = 400
+	ammo_count = 800
+	max_ammo_count = 800
 	transferable_ammo = TRUE
 	ammo_used_per_firing = 40
 	point_cost = 275
-	fire_mission_delay = 2
-	var/bullet_spread_range = 4 //how far from the real impact turf can bullets land
-	var/shrapnel_type = /datum/ammo/bullet/shrapnel/gau //For siming 30mm bullet impacts.
-	var/directhit_damage = 105 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
+	fire_mission_delay = 1 //1 from 2
+	travelling_time = 30
+	var/bullet_spread_range = 3 //3 from 4
+	var/directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	var/penetration = 10 //AP value pretty much
+	var/holo_stacks = 100
+	var/slow_duration = 2
 
 /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user)
 	. = ..()
@@ -167,18 +169,19 @@
 	var/soundplaycooldown = 0
 	var/debriscooldown = 0
 	for(var/i = 1 to ammo_used_per_firing)
-		var/turf/impact_tile = pick(turf_list)
-		sleep(1)
+		var/turf/impact_tile = pick(turf_list) //no sleep
+		turf_list -= impact_tile//moved it from here
 		var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob)
-		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(alldirs), cause_data)
-		create_shrapnel(impact_tile,1,0,0,shrapnel_type,cause_data,FALSE,100) //simulates a bullet
 		for(var/atom/movable/explosion_effect in impact_tile)
 			if(iscarbon(explosion_effect))
 				var/mob/living/carbon/bullet_effect = explosion_effect
-				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW, null, cause_data)
+				bullet_effect.ex_act(EXPLOSION_THRESHOLD_VLOW, null, cause_data)
 				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
+				bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
+				bullet_effect.adjust_effect(slow_duration, SLOW)
 			else
 				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)
+		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(alldirs), cause_data)//moved this
 		if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
 			playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
 			soundplaycooldown = 3
@@ -196,15 +199,14 @@
 	name = "\improper PGU-105 30mm Anti-tank ammo crate"
 	icon_state = "30mm_crate_hv"
 	desc = "A crate full of PGU-105 Specialized 30mm APFSDS Titanium-Tungsten alloy penetrators, made for countering peer and near peer APCs, IFVs, and MBTs in CAS support. It is designed to penetrate up to the equivalent 1350mm of RHA when launched from a GAU-21. It is much less effective against soft targets however, in which case 30mm ball ammunition is recommended. WARNING: discarding petals from the ammunition can be harmful if the dropship does not pull out at the needed speeds. Please consult page 3574 of the manual, available for order at any ARMAT store. Can be loaded into the GAU-21 30mm cannon."
-	travelling_time = 60
-	ammo_count = 400
-	max_ammo_count = 400
+	travelling_time = 20
+	ammo_count = 800
+	max_ammo_count = 800
 	ammo_used_per_firing = 40
-	bullet_spread_range = 4
+	bullet_spread_range = 3
 	point_cost = 325
-	fire_mission_delay = 2
-	shrapnel_type = /datum/ammo/bullet/shrapnel/gau/at
-	directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
+	fire_mission_delay = 1
+	directhit_damage = 65 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	penetration = 40 //AP value pretty much
 
 //laser battery

From 18249684c79fbb38a897eb06e3173a5e4fe616ff Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:23:05 +0100
Subject: [PATCH 03/14] adds holo and slow to AP ammo

---
 code/modules/cm_marines/dropship_ammo.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index c75ee9c42f7e..325fd183bd7d 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -208,6 +208,8 @@
 	fire_mission_delay = 1
 	directhit_damage = 65 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	penetration = 40 //AP value pretty much
+	var/holo_stacks = 100
+	var/slow_duration = 2
 
 //laser battery
 

From 45c67501b3a615ed4394a5d1dd85565895907f62 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:38:08 +0100
Subject: [PATCH 04/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 7752478e3b94..49a1c1a5fffd 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -181,7 +181,7 @@
 				bullet_effect.adjust_effect(slow_duration, SLOW)
 			else
 				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)
-		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(alldirs), cause_data)//moved this
+		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)//moved this
 		if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
 			playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
 			soundplaycooldown = 3

From cdb94afa441b835c81f840398a0c2a4806574806 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Wed, 29 Nov 2023 19:41:25 +0100
Subject: [PATCH 05/14] removes shit I should not have added

---
 code/modules/cm_marines/dropship_ammo.dm | 2 --
 1 file changed, 2 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 49a1c1a5fffd..05e96827223b 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -208,8 +208,6 @@
 	fire_mission_delay = 1
 	directhit_damage = 65 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	penetration = 40 //AP value pretty much
-	var/holo_stacks = 100
-	var/slow_duration = 2
 
 //laser battery
 

From 6b2b4c68399823276e2977462ada87cd2dbcf139 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:11:07 +0100
Subject: [PATCH 06/14] toxic cuz why not

---
 code/modules/cm_marines/dropship_ammo.dm | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 05e96827223b..8600bdcda1ef 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -150,6 +150,7 @@
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100
 	var/slow_duration = 2
+	var/accid_per_hit = 10 
 
 /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user)
 	. = ..()
@@ -179,6 +180,7 @@
 				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
 				bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
 				bullet_effect.adjust_effect(slow_duration, SLOW)
+				bullet_effect.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
 			else
 				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)
 		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)//moved this

From 6a9a74a6947e24518e95e891167d33b7bf2c3b0a Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:52:38 +0100
Subject: [PATCH 07/14] adds bunch of negative effects

---
 code/modules/cm_marines/dropship_ammo.dm | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 8600bdcda1ef..2291ff0ac060 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -150,7 +150,10 @@
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100
 	var/slow_duration = 2
-	var/accid_per_hit = 10 
+	var/acid_per_hit = 10 
+	var/plasma_drain_hit = 200
+	var/interference_duration = 10
+	var/healing_reduction_duration = 10
 
 /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user)
 	. = ..()
@@ -179,8 +182,13 @@
 				bullet_effect.ex_act(EXPLOSION_THRESHOLD_VLOW, null, cause_data)
 				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
 				bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
-				bullet_effect.adjust_effect(slow_duration, SLOW)
-				bullet_effect.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
+				bullet_effect.adjust_effect(slow_duration, SLOW)			
+				if(isxeno(bullet_effect))
+					var/mob/living/carbon/xenomorph/xenomorph = bullet_effect
+					xenomorph.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
+					xenomorph.plasma_stored = max(X.plasma_stored - plasma_drain_hit, 0)
+					xenomorph.interference += (interference_duration)
+					xenomorph.AddComponent(/datum/component/healing_reduction, healing_reduction_duration)
 			else
 				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)
 		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)//moved this

From 40bc803316ab6ab80c1dbf3f8fe5b67269d83477 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Thu, 30 Nov 2023 12:55:48 +0100
Subject: [PATCH 08/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 2291ff0ac060..807a353f7a08 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -186,7 +186,7 @@
 				if(isxeno(bullet_effect))
 					var/mob/living/carbon/xenomorph/xenomorph = bullet_effect
 					xenomorph.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
-					xenomorph.plasma_stored = max(X.plasma_stored - plasma_drain_hit, 0)
+					xenomorph.plasma_stored = max(xenomorph.plasma_stored - plasma_drain_hit, 0)
 					xenomorph.interference += (interference_duration)
 					xenomorph.AddComponent(/datum/component/healing_reduction, healing_reduction_duration)
 			else

From 077f47575bb9c315c5aba0cdb84a18ad5776b4b6 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Fri, 1 Dec 2023 13:39:50 +0100
Subject: [PATCH 09/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 807a353f7a08..a6a764e69c0b 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -143,17 +143,19 @@
 	transferable_ammo = TRUE
 	ammo_used_per_firing = 40
 	point_cost = 275
-	fire_mission_delay = 1 //1 from 2
+	fire_mission_delay = 2
 	travelling_time = 30
 	var/bullet_spread_range = 3 //3 from 4
 	var/directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100
-	var/slow_duration = 2
-	var/acid_per_hit = 10 
+	var/slow_duration = 3
+	var/acid_per_hit = 10
+	var/max_armor_reduction = 0.2
 	var/plasma_drain_hit = 200
 	var/interference_duration = 10
 	var/healing_reduction_duration = 10
+	var/max_interference = 10
 
 /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user)
 	. = ..()
@@ -179,19 +181,18 @@
 		for(var/atom/movable/explosion_effect in impact_tile)
 			if(iscarbon(explosion_effect))
 				var/mob/living/carbon/bullet_effect = explosion_effect
-				bullet_effect.ex_act(EXPLOSION_THRESHOLD_VLOW, null, cause_data)
-				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
 				bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
-				bullet_effect.adjust_effect(slow_duration, SLOW)			
+				bullet_effect.adjust_effect(slow_duration, SUPERSLOW)
 				if(isxeno(bullet_effect))
 					var/mob/living/carbon/xenomorph/xenomorph = bullet_effect
-					xenomorph.AddComponent(/datum/component/toxic_buildup, acid_per_hit)
+					xenomorph.AddComponent(/datum/component/toxic_buildup,acid_per_hit, xenomorph.armor_deflection*max_armor_reduction)
 					xenomorph.plasma_stored = max(xenomorph.plasma_stored - plasma_drain_hit, 0)
-					xenomorph.interference += (interference_duration)
+					if(xenomorph.interference < max_interference)
+						xenomorph.interference = max(max_interference, xenomorph.interference)
 					xenomorph.AddComponent(/datum/component/healing_reduction, healing_reduction_duration)
+				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
 			else
-				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)
-		impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)//moved this
+				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)//moved this
 		if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
 			playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
 			soundplaycooldown = 3
@@ -204,7 +205,6 @@
 	sleep(11) //speed of sound simulation
 	playsound(impact, 'sound/effects/gau.ogg',100,1,60)
 
-
 /obj/structure/ship_ammo/heavygun/antitank
 	name = "\improper PGU-105 30mm Anti-tank ammo crate"
 	icon_state = "30mm_crate_hv"

From 5e15130f5637fa9cf8fb579865ce6f6318b4a5c2 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:28:19 +0100
Subject: [PATCH 10/14] removes explosions and AP ammo

---
 code/modules/cm_marines/dropship_ammo.dm | 24 +++++-------------------
 1 file changed, 5 insertions(+), 19 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index a6a764e69c0b..72cc88fc3d51 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -138,15 +138,15 @@
 	icon_state = "30mm_crate"
 	desc = "A crate full of PGU-100 30mm Multi-Purpose ammo designed to penetrate light (non reinforced) structures, as well as shred infantry, IAVs, LAVs, IMVs, and MRAPs. Works in large areas for use on Class 4 and superior alien insectoid infestations, as well as fitting within the armaments allowed for use against a tier 4 insurgency as well as higher tiers. However, it lacks armor penetrating capabilities, for which Anti-Tank 30mm ammo is needed. Can be loaded into the GAU-21 30mm cannon."
 	equipment_type = /obj/structure/dropship_equipment/weapon/heavygun
-	ammo_count = 800
-	max_ammo_count = 800
+	ammo_count = 600
+	max_ammo_count = 600
 	transferable_ammo = TRUE
-	ammo_used_per_firing = 40
+	ammo_used_per_firing = 30
 	point_cost = 275
-	fire_mission_delay = 2
+	fire_mission_delay = 1
 	travelling_time = 30
 	var/bullet_spread_range = 3 //3 from 4
-	var/directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
+	var/directhit_damage = 90 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100
 	var/slow_duration = 3
@@ -205,20 +205,6 @@
 	sleep(11) //speed of sound simulation
 	playsound(impact, 'sound/effects/gau.ogg',100,1,60)
 
-/obj/structure/ship_ammo/heavygun/antitank
-	name = "\improper PGU-105 30mm Anti-tank ammo crate"
-	icon_state = "30mm_crate_hv"
-	desc = "A crate full of PGU-105 Specialized 30mm APFSDS Titanium-Tungsten alloy penetrators, made for countering peer and near peer APCs, IFVs, and MBTs in CAS support. It is designed to penetrate up to the equivalent 1350mm of RHA when launched from a GAU-21. It is much less effective against soft targets however, in which case 30mm ball ammunition is recommended. WARNING: discarding petals from the ammunition can be harmful if the dropship does not pull out at the needed speeds. Please consult page 3574 of the manual, available for order at any ARMAT store. Can be loaded into the GAU-21 30mm cannon."
-	travelling_time = 20
-	ammo_count = 800
-	max_ammo_count = 800
-	ammo_used_per_firing = 40
-	bullet_spread_range = 3
-	point_cost = 325
-	fire_mission_delay = 1
-	directhit_damage = 65 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
-	penetration = 40 //AP value pretty much
-
 //laser battery
 
 /obj/structure/ship_ammo/laser_battery

From ba7d5e367e7d778e8e8b514497a9b2160148b311 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Fri, 1 Dec 2023 15:56:44 +0100
Subject: [PATCH 11/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 72cc88fc3d51..ad3c22004066 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -145,7 +145,7 @@
 	point_cost = 275
 	fire_mission_delay = 1
 	travelling_time = 30
-	var/bullet_spread_range = 3 //3 from 4
+	var/bullet_spread_range = 2 
 	var/directhit_damage = 90 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100

From d31fa8f8299796c70f23d622347e3bce5410e264 Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Sat, 2 Dec 2023 11:31:04 +0100
Subject: [PATCH 12/14] should make it so that one mob does not get mvoed
 around into more impacts too of the same gau burst

---
 code/modules/cm_marines/dropship_ammo.dm | 55 +++++++++++++-----------
 1 file changed, 30 insertions(+), 25 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index ad3c22004066..0ff19bff4543 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -145,8 +145,8 @@
 	point_cost = 275
 	fire_mission_delay = 1
 	travelling_time = 30
-	var/bullet_spread_range = 2 
-	var/directhit_damage = 90 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
+	var/bullet_spread_range = 3 //3 from 4
+	var/directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs.
 	var/penetration = 10 //AP value pretty much
 	var/holo_stacks = 100
 	var/slow_duration = 3
@@ -170,39 +170,44 @@
 /obj/structure/ship_ammo/heavygun/detonate_on(turf/impact)
 	set waitfor = 0
 	var/list/turf_list = list()
-	for(var/turf/T in range(bullet_spread_range, impact))
-		turf_list += T
+	for(var/turf/turf in range(bullet_spread_range, impact))
+		turf_list += turf
 	var/soundplaycooldown = 0
 	var/debriscooldown = 0
+	var/list/affected_atom = list()
 	for(var/i = 1 to ammo_used_per_firing)
 		var/turf/impact_tile = pick(turf_list) //no sleep
 		turf_list -= impact_tile//moved it from here
-		var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob)
-		for(var/atom/movable/explosion_effect in impact_tile)
-			if(iscarbon(explosion_effect))
-				var/mob/living/carbon/bullet_effect = explosion_effect
-				bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
-				bullet_effect.adjust_effect(slow_duration, SUPERSLOW)
-				if(isxeno(bullet_effect))
-					var/mob/living/carbon/xenomorph/xenomorph = bullet_effect
-					xenomorph.AddComponent(/datum/component/toxic_buildup,acid_per_hit, xenomorph.armor_deflection*max_armor_reduction)
-					xenomorph.plasma_stored = max(xenomorph.plasma_stored - plasma_drain_hit, 0)
-					if(xenomorph.interference < max_interference)
-						xenomorph.interference = max(max_interference, xenomorph.interference)
-					xenomorph.AddComponent(/datum/component/healing_reduction, healing_reduction_duration)
-				bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
-			else
-				explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)//moved this
-		if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
-			playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
-			soundplaycooldown = 3
-		soundplaycooldown--
+		for(var/atom/movable/atom in impact_tile)
+			affected_atom += atom
+		//if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
+		//	playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
+		//	soundplaycooldown = 3
+		//soundplaycooldown--
 		if(!debriscooldown)
 			impact_tile.ceiling_debris_check(1)
 			debriscooldown = 6
 		debriscooldown--
 		new /obj/effect/particle_effect/expl_particles(impact_tile)
-	sleep(11) //speed of sound simulation
+
+	var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob)
+	for(var/atom/movable/explosion_effect in affected_atom)
+		if(iscarbon(explosion_effect))
+			var/mob/living/carbon/bullet_effect = explosion_effect
+			bullet_effect.AddComponent(/datum/component/bonus_damage_stack, holo_stacks, world.time)
+			bullet_effect.adjust_effect(slow_duration, SUPERSLOW)
+			if(isxeno(bullet_effect))
+				var/mob/living/carbon/xenomorph/xenomorph = bullet_effect
+				xenomorph.AddComponent(/datum/component/toxic_buildup,acid_per_hit, xenomorph.armor_deflection*max_armor_reduction)
+				xenomorph.plasma_stored = max(xenomorph.plasma_stored - plasma_drain_hit, 0)
+				if(xenomorph.interference < max_interference)
+					xenomorph.interference = max(max_interference, xenomorph.interference)
+				xenomorph.AddComponent(/datum/component/healing_reduction, healing_reduction_duration)
+			bullet_effect.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration)
+		else
+			explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)//moved this
+		explosion_effect.throw_random_direction(1)
+	//sleep(11) //speed of sound simulation
 	playsound(impact, 'sound/effects/gau.ogg',100,1,60)
 
 //laser battery

From a0c2307c3179e06ff11a64bbc41c7eacdefe1cfb Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Sat, 2 Dec 2023 11:36:06 +0100
Subject: [PATCH 13/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 0ff19bff4543..4fb630b570a0 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -189,7 +189,6 @@
 			debriscooldown = 6
 		debriscooldown--
 		new /obj/effect/particle_effect/expl_particles(impact_tile)
-
 	var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob)
 	for(var/atom/movable/explosion_effect in affected_atom)
 		if(iscarbon(explosion_effect))
@@ -210,6 +209,7 @@
 	//sleep(11) //speed of sound simulation
 	playsound(impact, 'sound/effects/gau.ogg',100,1,60)
 
+
 //laser battery
 
 /obj/structure/ship_ammo/laser_battery

From 0046e15a048c01c7bf33a6cf8aa1aaf24d05364a Mon Sep 17 00:00:00 2001
From: cuberound <122645057+cuberound@users.noreply.github.com>
Date: Sat, 2 Dec 2023 11:39:18 +0100
Subject: [PATCH 14/14] Update dropship_ammo.dm

---
 code/modules/cm_marines/dropship_ammo.dm | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm
index 4fb630b570a0..6f6a0dca0f8d 100644
--- a/code/modules/cm_marines/dropship_ammo.dm
+++ b/code/modules/cm_marines/dropship_ammo.dm
@@ -180,10 +180,6 @@
 		turf_list -= impact_tile//moved it from here
 		for(var/atom/movable/atom in impact_tile)
 			affected_atom += atom
-		//if(!soundplaycooldown) //so we don't play the same sound 20 times very fast.
-		//	playsound(impact_tile, 'sound/effects/gauimpact.ogg',40,1,20)
-		//	soundplaycooldown = 3
-		//soundplaycooldown--
 		if(!debriscooldown)
 			impact_tile.ceiling_debris_check(1)
 			debriscooldown = 6
@@ -206,7 +202,6 @@
 		else
 			explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW)//moved this
 		explosion_effect.throw_random_direction(1)
-	//sleep(11) //speed of sound simulation
 	playsound(impact, 'sound/effects/gau.ogg',100,1,60)