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

Option 2 for OT rockets #7072

Closed
wants to merge 2 commits into from
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
6 changes: 3 additions & 3 deletions code/game/objects/items/explosives/warhead.dm
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@
name = "84mm rocket warhead"
desc = "A custom warhead meant for 84mm rocket shells."
icon_state = "warhead_rocket"
max_container_volume = 210
max_container_volume = 180
allow_star_shape = FALSE
matter = list("metal" = 11250) //3 sheets
reaction_limits = list( "max_ex_power" = 240, "base_ex_falloff" = 90,"max_ex_shards" = 64,
"max_fire_rad" = 6, "max_fire_int" = 40, "max_fire_dur" = 48,
reaction_limits = list( "max_ex_power" = 180, "base_ex_falloff" = 90,"max_ex_shards" = 64,
"max_fire_rad" = 3, "max_fire_int" = 30, "max_fire_dur" = 36,
"min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5
)
has_blast_wave_dampener = TRUE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/projectiles/magazines/specialist.dm
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,7 @@
desc = "An 84mm custom rocket."
icon_state = "custom_rocket"
default_ammo = /datum/ammo/rocket/custom
matter = list("metal" = 7500) //2 sheets
matter = list("metal" = 3750) //1 sheet
var/obj/item/explosive/warhead/rocket/warhead
var/obj/item/reagent_container/glass/fuel
var/fuel_requirement = 60
Expand Down
Loading