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

Jump to bottom

GAU Buff - Shooting twice the bullet per bullet #5065

Merged
merged 9 commits into from
Dec 12, 2023
Merged

GAU Buff - Shooting twice the bullet per bullet #5065

Changes from 8 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
522efa0
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
9a1a151
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
a3168e3
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
3331209
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
62949ff
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
123d0e8
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
c1c8058
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
de91cfe
Update dropship_ammo.dm
blackdragonTOW Nov 29, 2023
4242a6b
Update code/modules/cm_marines/dropship_ammo.dm
blackdragonTOW Dec 3, 2023
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
42 changes: 22 additions & 20 deletions code/modules/cm_marines/dropship_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,28 +166,30 @@
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)
for(var/j = 1 to 2) //rather than halving the sleep, were doubling the bullets shot "bang"
blackdragonTOW marked this conversation as resolved.
Show resolved Hide resolved
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
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)

Expand Down