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.

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

Renames Fatty into Oreshnik #694

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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/game/objects/effects/overlays.dm
Original file line number Diff line number Diff line change
Expand Up @@ -335,8 +335,8 @@
/obj/effect/overlay/blinking_laser/keeper
icon_state = "keeper_target"

/obj/effect/overlay/blinking_laser/fatty
icon_state = "fatty_target"
/obj/effect/overlay/blinking_laser/oreshnik
icon_state = "oreshnik_target"

/obj/effect/overlay/blinking_laser/napalm
icon_state = "napalm_target"
Expand Down
14 changes: 7 additions & 7 deletions code/game/objects/structures/dropship_ammo.dm
Original file line number Diff line number Diff line change
Expand Up @@ -421,19 +421,19 @@
cell_explosion(impact, explosion_power, explosion_falloff) //tighter blast radius, but more devastating near center
qdel(src)

/obj/structure/ship_ammo/cas/rocket/fatty
name = "\improper PHGM-17 'Fatty'"
desc = "The PHGM-17 'Fatty' is the most devestating rocket in TGMC arsenal, only second after its big cluster brother in Orbital Cannon. These rocket are also known for highest number of Friendly-on-Friendly incidents due to secondary cluster explosions as well as range of these explosions, TGMC recommends pilots to encourage usage of signal flares or laser for 'Fatty' support. Moving this will require some sort of lifter."
icon_state = "fatty"
/obj/structure/ship_ammo/cas/rocket/oreshnik
name = "\improper RS-26 'Oreshnik'"
desc = "The RS-26 'Oreshnik' is the most devestating prototype rocket in TGMC arsenal, only second after its big cluster brother in Orbital Cannon. These rocket are also known for highest number of Friendly-on-Friendly incidents due to secondary cluster explosions as well as range of these explosions, TGMC recommends pilots to encourage usage of signal flares or laser for 'Oreshnik' support. Moving this will require some sort of lifter."
icon_state = "oreshnik"
travelling_time = 5 SECONDS
ammo_id = "f"
point_cost = 350
explosion_power = 450
explosion_falloff = 120
prediction_type = CAS_AMMO_EXPLOSIVE
cas_effect = /obj/effect/overlay/blinking_laser/fatty
cas_effect = /obj/effect/overlay/blinking_laser/oreshnik

/obj/structure/ship_ammo/cas/rocket/fatty/detonate_on(turf/impact, attackdir = NORTH)
/obj/structure/ship_ammo/cas/rocket/oreshnik/detonate_on(turf/impact, attackdir = NORTH)
impact.ceiling_debris_check(2)
cell_explosion(impact, explosion_power, explosion_falloff) //first explosion is small to trick xenos into thinking its a minirocket.
addtimer(CALLBACK(src, PROC_REF(delayed_detonation), impact), 3 SECONDS)
Expand All @@ -445,7 +445,7 @@
* * (turf/impact): targets impacted turf from first explosion
*/

/obj/structure/ship_ammo/cas/rocket/fatty/proc/delayed_detonation(turf/impact)
/obj/structure/ship_ammo/cas/rocket/oreshnik/proc/delayed_detonation(turf/impact)
var/list/impact_coords = list(list(-3, 3), list(0, 4), list(3,3), list(-4, 0), list(4, 0), list(-3, -3), list(0, -4), list(3, -3))
for(var/i = 1 to 8)
var/list/coords = impact_coords[i]
Expand Down
Binary file modified icons/Marine/mainship_props64.dmi
Binary file not shown.
Binary file modified icons/effects/lases.dmi
Binary file not shown.
Loading