From 522efa0e761d6f480312e715b7ed6bce9e069fd2 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 02:18:37 -0800 Subject: [PATCH 1/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 64 ++++++++++++------------ 1 file changed, 33 insertions(+), 31 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 53a22051299b..166c48682b6c 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -141,7 +141,7 @@ ammo_count = 400 max_ammo_count = 400 transferable_ammo = TRUE - ammo_used_per_firing = 40 + ammo_used_per_firing = 80 point_cost = 275 fire_mission_delay = 2 var/bullet_spread_range = 4 //how far from the real impact turf can bullets land @@ -160,36 +160,38 @@ return "It's loaded with an empty [name]." /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 - 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/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) - impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.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.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration) - else - explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW) - 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 - playsound(impact, 'sound/effects/gau.ogg',100,1,60) + set waitfor = 0 + var/list/turf_list = list() + for(var/turf/T in range(bullet_spread_range, impact)) + turf_list += T + var/soundplaycooldown = 0 + var/debriscooldown = 0 + for(var/i = 1 to ammo_used_per_firing) + sleep(1) + for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" + var/turf/impact_tile = pick(turf_list) + + 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.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration) + else + explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW) + new /obj/effect/particle_effect/expl_particles(impact_tile) + 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-- + sleep(11) //speed of sound simulation + playsound(impact, 'sound/effects/gau.ogg',100,1,60) /obj/structure/ship_ammo/heavygun/antitank From 9a1a151f6a5bbe11c1c119386b472444d0558e67 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 02:49:11 -0800 Subject: [PATCH 2/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 64 ++++++++++++------------ 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 166c48682b6c..e666248459cb 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -160,38 +160,38 @@ return "It's loaded with an empty [name]." /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 - var/soundplaycooldown = 0 - var/debriscooldown = 0 - for(var/i = 1 to ammo_used_per_firing) - sleep(1) - for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" - var/turf/impact_tile = pick(turf_list) - - 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.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration) - else - explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW) - new /obj/effect/particle_effect/expl_particles(impact_tile) - 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-- - sleep(11) //speed of sound simulation - playsound(impact, 'sound/effects/gau.ogg',100,1,60) + set waitfor = 0 + var/list/turf_list = list() + for(var/turf/T in range(bullet_spread_range, impact)) + turf_list += T + var/soundplaycooldown = 0 + var/debriscooldown = 0 + for(var/i = 1 to ammo_used_per_firing) + sleep(1) + for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" + var/turf/impact_tile = pick(turf_list) + + 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.apply_armoured_damage(directhit_damage,ARMOR_BULLET,BRUTE,null,penetration) + else + explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW) + new /obj/effect/particle_effect/expl_particles(impact_tile) + 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-- + sleep(11) //speed of sound simulation + playsound(impact, 'sound/effects/gau.ogg',100,1,60) /obj/structure/ship_ammo/heavygun/antitank From a3168e3d8e6c8653cd9475451faa0b7dc352f68a Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 02:50:48 -0800 Subject: [PATCH 3/9] 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 e666248459cb..9002bfa8b5cc 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -189,7 +189,7 @@ if(!debriscooldown) impact_tile.ceiling_debris_check(1) debriscooldown = 6 - debriscooldown-- + debriscooldown-- sleep(11) //speed of sound simulation playsound(impact, 'sound/effects/gau.ogg',100,1,60) From 33312091c1cb5f8a2c4b9e6d0d3d0e0091fc19ec Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 02:58:31 -0800 Subject: [PATCH 4/9] 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 9002bfa8b5cc..9490cc16eef7 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -172,7 +172,7 @@ var/turf/impact_tile = pick(turf_list) var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) - impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(alldirs), cause_data) + impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.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)) From 62949ffafde40e6bc4e53d092ccce2202fcc3b89 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:02:59 -0800 Subject: [PATCH 5/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 9490cc16eef7..b8ecbb364030 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -166,11 +166,10 @@ turf_list += T var/soundplaycooldown = 0 var/debriscooldown = 0 + var/turf/impact_tile = pick(turf_list) for(var/i = 1 to ammo_used_per_firing) sleep(1) for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" - var/turf/impact_tile = pick(turf_list) - var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data) create_shrapnel(impact_tile,1,0,0,shrapnel_type,cause_data,FALSE,100) //simulates a bullet From 123d0e8aac050975f4ee8a53db547faee0364e4c Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:05:52 -0800 Subject: [PATCH 6/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index b8ecbb364030..f1b267c7d0d7 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -166,8 +166,9 @@ turf_list += T var/soundplaycooldown = 0 var/debriscooldown = 0 - var/turf/impact_tile = pick(turf_list) + for(var/i = 1 to ammo_used_per_firing) + var/turf/impact_tile = pick(turf_list) sleep(1) for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) @@ -181,14 +182,14 @@ else explosion_effect.ex_act(EXPLOSION_THRESHOLD_VLOW) new /obj/effect/particle_effect/expl_particles(impact_tile) - 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-- + 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-- sleep(11) //speed of sound simulation playsound(impact, 'sound/effects/gau.ogg',100,1,60) From c1c80580c4ef296cb2cf9142a4284bf3cdbcf4e8 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 03:11:23 -0800 Subject: [PATCH 7/9] 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 f1b267c7d0d7..cd5b2cf01a34 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -168,9 +168,9 @@ var/debriscooldown = 0 for(var/i = 1 to ammo_used_per_firing) - var/turf/impact_tile = pick(turf_list) sleep(1) for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" + var/turf/impact_tile = pick(turf_list) var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data) create_shrapnel(impact_tile,1,0,0,shrapnel_type,cause_data,FALSE,100) //simulates a bullet From de91cfea843c29d74a02e72c152b7c26dbc4a278 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Wed, 29 Nov 2023 12:46:02 -0800 Subject: [PATCH 8/9] 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 cd5b2cf01a34..4c8d586d4d6f 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -141,7 +141,7 @@ ammo_count = 400 max_ammo_count = 400 transferable_ammo = TRUE - ammo_used_per_firing = 80 + 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 From 4242a6bf7c1954c580e09da92bec8fadc35870fe Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Sat, 2 Dec 2023 20:00:55 -0800 Subject: [PATCH 9/9] Update code/modules/cm_marines/dropship_ammo.dm Co-authored-by: Zonespace <41448081+Zonespace27@users.noreply.github.com> --- 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 4c8d586d4d6f..7e655fce55b6 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -169,7 +169,7 @@ for(var/i = 1 to ammo_used_per_firing) sleep(1) - for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" + for(var/j in 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang" var/turf/impact_tile = pick(turf_list) var/datum/cause_data/cause_data = create_cause_data(initial(name), source_mob) impact_tile.ex_act(EXPLOSION_THRESHOLD_VLOW, pick(GLOB.alldirs), cause_data)