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

Fire Support Menu GAU and Laser fixes #511

Merged
merged 5 commits into from
Oct 21, 2024
Merged

Fire Support Menu GAU and Laser fixes #511

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a820a4f
incredibly hacky way of making the Laser and GAU's work again in the …
GriffinMan4455 Oct 19, 2024
35bc813
Revert "incredibly hacky way of making the Laser and GAU's work again…
GriffinMan4455 Oct 20, 2024
ba8b672
Testing new solution
GriffinMan4455 Oct 20, 2024
9f1f3bb
commenting to give a shoutout to Drathek
GriffinMan4455 Oct 20, 2024
7504ebc
Went with the first option Drathek suggested since no other weapons g…
GriffinMan4455 Oct 20, 2024
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
4 changes: 2 additions & 2 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 @@ -168,7 +168,7 @@
for(var/i = 1 to ammo_used_per_firing)
sleep(1)
var/turf/impact_tile = pick(turf_list)
var/datum/cause_data/cause_data = create_cause_data(fired_from.name, source_mob)
var/datum/cause_data/cause_data = create_cause_data(fired_from?.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)
Expand Down Expand Up @@ -246,7 +246,7 @@
for(var/i=1 to 16) //This is how many tiles within that area of effect will be randomly ignited
var/turf/U = pick(turf_list)
turf_list -= U
fire_spread_recur(U, create_cause_data(fired_from.name, source_mob), 1, null, 5, 75, "#EE6515")//Very, very intense, but goes out very quick
fire_spread_recur(U, create_cause_data(fired_from?.name, source_mob), 1, null, 5, 75, "#EE6515")//Very, very intense, but goes out very quick

if(!ammo_count && !QDELETED(src))
qdel(src) //deleted after last laser beam is fired and impact the ground.
Expand Down
Loading