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

Rebalances OT casings #7217

Merged
merged 22 commits into from
Oct 31, 2024
Merged

Rebalances OT casings #7217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
a4e0ffe
Raising falloff and buffing other values warhead.dm
GoldenDarkness55 Sep 25, 2024
753d1be
OT grenade numbers chem_grenade.dm
GoldenDarkness55 Sep 25, 2024
55df00c
OT c4 plastic.dm
GoldenDarkness55 Sep 25, 2024
f076381
OT claymore mine.dm
GoldenDarkness55 Sep 25, 2024
cb45fc4
OT c4 plastic.dm
GoldenDarkness55 Sep 25, 2024
19d935e
Standard grenades explosive.dm
GoldenDarkness55 Sep 25, 2024
9990288
Claymore mine.dm
GoldenDarkness55 Sep 25, 2024
3edcbaa
OT rocket warhead.dm
GoldenDarkness55 Sep 25, 2024
4dcb611
OT nade big chem_grenade.dm
GoldenDarkness55 Sep 25, 2024
cfc4846
OT mortar warhead.dm
GoldenDarkness55 Sep 25, 2024
0945913
OT rocket warhead.dm
GoldenDarkness55 Sep 25, 2024
2595033
OT claymore mine.dm
GoldenDarkness55 Sep 25, 2024
264d3a3
rocket warhead.dm
GoldenDarkness55 Sep 25, 2024
688598c
mortar falloff warhead.dm
GoldenDarkness55 Sep 26, 2024
4d86bd5
rounded up number mine.dm
GoldenDarkness55 Oct 8, 2024
f22d4b0
OT shrapnel consistency explosive.dm
GoldenDarkness55 Oct 8, 2024
29c101a
Merge branch 'master' into OT-RPG
Nanu308 Oct 22, 2024
4d0aaec
rolled back small rocket dmg buff warhead.dm
GoldenDarkness55 Oct 23, 2024
33c07a5
custom rocket range and accuracy rocket.dm
GoldenDarkness55 Oct 23, 2024
b6c2410
Large grenade falloff +10 chem_grenade.dm
GoldenDarkness55 Oct 23, 2024
951815e
further rocket nerfs warhead.dm
GoldenDarkness55 Oct 23, 2024
3aae674
m40 grenade container volume from 90 to 120, metal cost raised slight…
GoldenDarkness55 Oct 24, 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
5 changes: 3 additions & 2 deletions code/datums/ammo/rocket.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -277,8 +277,9 @@

/datum/ammo/rocket/custom
name = "custom rocket"
accurate_range = 8
max_range = 8
accuracy = HIT_ACCURACY_TIER_5
accurate_range = 7
max_range = 7
GoldenDarkness55 marked this conversation as resolved.
Show resolved Hide resolved

/datum/ammo/rocket/custom/proc/prime(atom/atom, obj/projectile/projectile)
var/obj/item/weapon/gun/launcher/rocket/launcher = projectile.shot_from
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/explosives/explosive.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
var/max_container_volume = 120
var/current_container_volume = 0
var/assembly_stage = ASSEMBLY_EMPTY //The assembly_stage of the assembly
var/list/reaction_limits = list("max_ex_power" = 175, "base_ex_falloff" = 75, "max_ex_shards" = 32,
"max_fire_rad" = 5, "max_fire_int" = 20, "max_fire_dur" = 24,
var/list/reaction_limits = list("max_ex_power" = 180, "base_ex_falloff" = 80, "max_ex_shards" = 40,
"max_fire_rad" = 5, "max_fire_int" = 25, "max_fire_dur" = 24,
"min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3
)
var/falloff_mode = EXPLOSION_FALLOFF_SHAPE_LINEAR
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/explosives/grenades/chem_grenade.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
customizable = TRUE
underslug_launchable = TRUE
allowed_sensors = list(/obj/item/device/assembly/timer)
max_container_volume = 90
matter = list("metal" = 3750)
max_container_volume = 120
matter = list("metal" = 4250)
has_blast_wave_dampener = TRUE

/obj/item/explosive/grenade/custom/prime()
Expand All @@ -22,8 +22,8 @@
icon_state = "large_grenade_custom"
allowed_containers = list(/obj/item/reagent_container/glass)
max_container_volume = 180
reaction_limits = list( "max_ex_power" = 215, "base_ex_falloff" = 90, "max_ex_shards" = 32,
"max_fire_rad" = 5, "max_fire_int" = 20, "max_fire_dur" = 24,
reaction_limits = list( "max_ex_power" = 220, "base_ex_falloff" = 120, "max_ex_shards" = 80,
"max_fire_rad" = 6, "max_fire_int" = 30, "max_fire_dur" = 32,
"min_fire_rad" = 1, "min_fire_int" = 3, "min_fire_dur" = 3
)
underslug_launchable = FALSE
Expand Down
4 changes: 2 additions & 2 deletions code/game/objects/items/explosives/mine.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
antigrief_protection = TRUE
allowed_sensors = list(/obj/item/device/assembly/prox_sensor)
max_container_volume = 120
reaction_limits = list( "max_ex_power" = 105, "base_ex_falloff" = 60, "max_ex_shards" = 32,
"max_fire_rad" = 5, "max_fire_int" = 12, "max_fire_dur" = 18,
reaction_limits = list( "max_ex_power" = 100, "base_ex_falloff" = 80, "max_ex_shards" = 40,
"max_fire_rad" = 4, "max_fire_int" = 20, "max_fire_dur" = 18,
"min_fire_rad" = 2, "min_fire_int" = 3, "min_fire_dur" = 3
)
angle = 60
Expand Down
6 changes: 3 additions & 3 deletions code/game/objects/items/explosives/plastic.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
w_class = SIZE_SMALL
allowed_sensors = list(/obj/item/device/assembly/prox_sensor, /obj/item/device/assembly/signaller, /obj/item/device/assembly/timer)
max_container_volume = 180
reaction_limits = list( "max_ex_power" = 260, "base_ex_falloff" = 90, "max_ex_shards" = 64,
"max_fire_rad" = 6, "max_fire_int" = 26, "max_fire_dur" = 30,
reaction_limits = list( "max_ex_power" = 280, "base_ex_falloff" = 120, "max_ex_shards" = 100,
"max_fire_rad" = 4, "max_fire_int" = 50, "max_fire_dur" = 20,
"min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5
)

var/deploying_time = 50
var/penetration = 1.5 // How much damage adjacent walls receive
var/penetration = 2 // How much damage adjacent walls receive
var/timer = 10 // detonation time
var/min_timer = 10
var/atom/plant_target = null //which atom the plstique explosive is planted on
Expand Down
8 changes: 4 additions & 4 deletions code/game/objects/items/explosives/warhead.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
max_container_volume = 210
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" = 220, "base_ex_falloff" = 160,"max_ex_shards" = 80,
"max_fire_rad" = 4, "max_fire_int" = 45, "max_fire_dur" = 48,
"min_fire_rad" = 2, "min_fire_int" = 4, "min_fire_dur" = 5
)
has_blast_wave_dampener = TRUE
Expand All @@ -24,8 +24,8 @@
icon_state = "warhead_mortar"
max_container_volume = 240
matter = list("metal" = 11250) //3 sheets
reaction_limits = list( "max_ex_power" = 360, "base_ex_falloff" = 90, "max_ex_shards" = 128,
"max_fire_rad" = 8, "max_fire_int" = 40, "max_fire_dur" = 48,
reaction_limits = list( "max_ex_power" = 360, "base_ex_falloff" = 130, "max_ex_shards" = 200,
"max_fire_rad" = 8, "max_fire_int" = 45, "max_fire_dur" = 48,
"min_fire_rad" = 3, "min_fire_int" = 5, "min_fire_dur" = 5
)
has_blast_wave_dampener = TRUE
Expand Down
Loading