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

CAS Ammo updates and cleanup #5604

Merged
merged 4 commits into from
Jan 5, 2021
Merged

CAS Ammo updates and cleanup #5604

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0fe3959
CAS Ammo updates and cleanup
TiviPlus Dec 30, 2020
3307fc8
Bump
TiviPlus Dec 30, 2020
12a0a1d
Minor changes
TiviPlus Jan 1, 2021
35483e7
Merge branch 'master' into casupdates
TiviPlus Jan 5, 2021
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
Prev Previous commit
Next Next commit
Minor changes
  • Loading branch information
@TiviPlus
TiviPlus committed Jan 1, 2021
commit 12a0a1d6cb8cbb00ea7a0a4d216d9464b0e5e6da
5 changes: 2 additions & 3 deletions code/game/objects/structures/dropship_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,6 @@
for(var/i=1 to attack_width)
strafed = strafelist[1]
strafelist -= strafed
strafed.ceiling_debris_check(1)
strafed.ex_act(EXPLODE_LIGHT)
new /obj/effect/particle_effect/expl_particles(strafed)
new /obj/effect/temp_visual/heavyimpact(strafed)
Expand Down Expand Up @@ -234,7 +233,7 @@
name = "\improper AIM-224 'Widowmaker'"
desc = "The AIM-224 is the latest in air to air missile technology. Earning the nickname of 'Widowmaker' from various dropship pilots after improvements to its guidence warhead prevents it from being jammed leading to its high kill rate. Not well suited for ground bombardment, but its high velocity makes it reach its target quickly."
icon_state = "single"
travelling_time = 3 SECONDS //not powerful, but reaches target fast
travelling_time = 4 SECONDS //not powerful, but reaches target fast
ammo_id = ""
point_cost = 150

Expand Down Expand Up @@ -303,7 +302,7 @@
explosion(impact, 2, 3, 4, 6, small_animation = TRUE) //relatively weak
flame_radius(5, impact, 60, 30) //cooking for a long time
var/datum/effect_system/smoke_spread/phosphorus/warcrime = new
warcrime.set_up(6, loc, 7)
warcrime.set_up(6, impact, 7)
warcrime.start()
qdel(src)

Expand Down
1 change: 0 additions & 1 deletion code/game/objects/structures/dropship_equipment.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -651,7 +651,6 @@
update_icon()

/obj/structure/dropship_equipment/weapon/proc/open_fire(obj/selected_target, attackdir)
set waitfor = FALSE
var/turf/target_turf = get_turf(selected_target)
if(firing_sound)
playsound(loc, firing_sound, 70, 1)
Expand Down