Skip to content

Commit

Permalink
Баффы арты (#583)
Browse files Browse the repository at this point in the history 
* initial commit

* изменил описание снарядам

* убрал коробочные пасты

* переместил в популейт контестс коробки

* сделал ХЕшки фугасами и чуть повысил статы зажиги
  • Loading branch information
@kel593
kel593 authored Oct 23, 2024
1 parent 5d21247 commit d4e09cb
Show file tree
Hide file tree
Showing 3 changed files with 58 additions and 55 deletions.
70 changes: 28 additions & 42 deletions code/game/objects/machinery/mortar.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -539,7 +539,7 @@
tally_type = TALLY_HOWITZER
cool_off_time = 10 SECONDS
reload_time = 1 SECONDS
max_spread = 8
max_spread = 2

/obj/machinery/deployable/mortar/howitzer/AltRightClick(mob/living/user)
if(!Adjacent(user) || user.lying_angle || user.incapacitated() || !ishuman(user))
Expand Down Expand Up @@ -614,28 +614,29 @@
fire_sound = 'sound/weapons/guns/fire/rocket_arty.ogg'
reload_sound = 'sound/weapons/guns/interact/tat36_reload.ogg'
fall_sound = 'sound/weapons/guns/misc/rocket_whistle.ogg'
minimum_range = 25
minimum_range = 20
allowed_shells = list(
/obj/item/mortal_shell/rocket/mlrs,
/obj/item/mortal_shell/rocket/mlrs/gas,
/obj/item/mortal_shell/rocket/mlrs/tangle,
)
tally_type = TALLY_ROCKET_ARTY
cool_off_time = 80 SECONDS
cool_off_time = 60 SECONDS
fire_delay = 0.15 SECONDS
fire_amount = 16
reload_time = 0.25 SECONDS
max_rounds = 32
offset_per_turfs = 25
spread = 5
max_spread = 5
spread = 3.5
max_spread = 6.5

//this checks for box of rockets, otherwise will go to normal attackby for mortars
/obj/machinery/deployable/mortar/howitzer/mlrs/attackby(obj/item/I, mob/user, params)
if(firing)
user.balloon_alert(user, "The barrel is steaming hot. Wait till it cools off")
return

if(!istype(I, /obj/item/storage/box/mlrs_rockets) && !istype(I, /obj/item/storage/box/mlrs_rockets_gas))
if(!istype(I, /obj/item/storage/box/mlrs_rockets) && !istype(I, /obj/item/storage/box/mlrs_rockets_gas) && !istype(I, /obj/item/storage/box/mlrs_rockets_tangle))
return ..()

var/obj/item/storage/box/rocket_box = I
Expand Down Expand Up @@ -782,6 +783,12 @@
icon_state = "mlrs_rocket_gas"
ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs

/obj/item/mortal_shell/rocket/mlrs/tangle
name = "\improper 60mm 'T-33' rocket"
desc = "A 60mm rocket loaded with tanglefoot gas that drains plasma from xeno."
icon_state = "mlrs_rocket_gas"
ammo_type = /datum/ammo/mortar/rocket/smoke/mlrs/tangle

/obj/structure/closet/crate/mortar_ammo
name = "\improper T-50S mortar ammo crate"
desc = "A crate containing live mortar shells with various payloads. DO NOT DROP. KEEP AWAY FROM FIRE SOURCES."
Expand Down Expand Up @@ -932,48 +939,27 @@
desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case."
storage_slots = 16

/obj/item/storage/box/mlrs_rockets/Initialize(mapload)
. = ..()
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
new /obj/item/mortal_shell/rocket/mlrs(src)
/obj/item/storage/box/mlrs_rockets/PopulateContents()
for(var/i in 1 to 16)
new /obj/item/mortal_shell/rocket/mlrs(src)

/obj/item/storage/box/mlrs_rockets_gas
name = "\improper TA-40L X-50 rocket crate"
desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case."
storage_slots = 16

/obj/item/storage/box/mlrs_rockets_gas/Initialize(mapload)
. = ..()
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)
/obj/item/storage/box/mlrs_rockets_gas/PopulateContents()
for(var/i in 1 to 16)
new /obj/item/mortal_shell/rocket/mlrs/gas(src)

/obj/item/storage/box/mlrs_rockets_tangle
name = "\improper TA-40L T-33 rocket crate"
desc = "A large case containing rockets in a compressed setting for the TA-40L MLRS. Drag this sprite into you to open it up!\nNOTE: You cannot put items back inside this case."
storage_slots = 16

/obj/item/storage/box/mlrs_rockets_tangle/PopulateContents()
for(var/i in 1 to 16)
new /obj/item/mortal_shell/rocket/mlrs/tangle(src)

#undef TALLY_MORTAR
#undef TALLY_HOWITZER
Expand Down
20 changes: 16 additions & 4 deletions code/modules/projectiles/ammo_datums/artillery.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@
icon_state = "howi"

/datum/ammo/mortar/howi/drop_nade(turf/T)
cell_explosion(T, 175, 50)
cell_explosion(T, 200, 100)

/datum/ammo/mortar/howi/incend/drop_nade(turf/T)
cell_explosion(T, 45, 30)
Expand Down Expand Up @@ -96,7 +96,7 @@

/datum/ammo/mortar/rocket/incend/drop_nade(turf/T)
cell_explosion(T, 50, 20)
flame_radius(5, T)
flame_radius(6, T)
playsound(T, 'sound/weapons/guns/fire/flamethrower2.ogg', 35, 1, 4)

/datum/ammo/mortar/rocket/minelayer/drop_nade(turf/T)
Expand All @@ -115,20 +115,32 @@
smoke.start()

/datum/ammo/mortar/rocket/mlrs
shell_speed = 2.5
shell_speed = 3

/datum/ammo/mortar/rocket/mlrs/drop_nade(turf/T)
cell_explosion(T, 70, 25)

/datum/ammo/mortar/rocket/smoke/mlrs
shell_speed = 2.5
shell_speed = 3
smoketype = /datum/effect_system/smoke_spread/mustard

/datum/ammo/mortar/rocket/smoke/mlrs/drop_nade(turf/T)
var/datum/effect_system/smoke_spread/smoke = new smoketype()
cell_explosion(T, 30, 15)
playsound(T, 'sound/effects/smoke.ogg', 25, 1, 4)
smoke.set_up(5, T, 6)
flame_radius(4, T)
smoke.start()

/datum/ammo/mortar/rocket/smoke/mlrs/tangle
shell_speed = 3
smoketype = /datum/effect_system/smoke_spread/plasmaloss

/datum/ammo/mortar/rocket/smoke/mlrs/tangle/drop_nade(turf/T)
var/datum/effect_system/smoke_spread/smoke = new smoketype()
cell_explosion(T, 10, 2)
playsound(T, 'sound/effects/smoke.ogg', 25, 1, 4)
smoke.set_up(5, T, 6)
smoke.start()

/datum/ammo/bullet/atgun_spread
Expand Down
23 changes: 14 additions & 9 deletions code/modules/reqs/explosives.dm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -133,22 +133,27 @@
/datum/supply_packs/explosives/mlrs_rockets
name = "TA-40L MLRS Rocket Pack (x16)"
contains = list(/obj/item/storage/box/mlrs_rockets)
cost = 60
cost = 40

/datum/supply_packs/explosives/mlrs_rockets_gas
name = "TA-40L X-50 MLRS Rocket Pack (x16)"
contains = list(/obj/item/storage/box/mlrs_rockets_gas)
cost = 60
cost = 50

/datum/supply_packs/explosives/mlrs_rockets_tangle
name = "TA-40L T-33 MLRS Rocket Pack (x16)"
contains = list(/obj/item/storage/box/mlrs_rockets_tangle)
cost = 50

/datum/supply_packs/explosives/ai_target_module
name = "AI artillery targeting module"
contains = list(/obj/item/ai_target_beacon)
cost = 100
cost = 50

/datum/supply_packs/explosives/knee_mortar
name = "T-10K Knee Mortar"
contains = list(/obj/item/mortar_kit/knee)
cost = 125
cost = 50

/datum/supply_packs/explosives/knee_mortar_ammo
name = "TA-10K knee mortar HE shell"
Expand All @@ -164,24 +169,24 @@
/datum/supply_packs/explosives/howitzer
name = "TA-100Y howitzer"
contains = list(/obj/item/mortar_kit/howitzer)
cost = 600
cost = 500

/datum/supply_packs/explosives/howitzer_ammo_he
name = "TA-100Y howitzer HE shell"
contains = list(/obj/item/mortal_shell/howitzer/he)
cost = 40
cost = 30

/datum/supply_packs/explosives/howitzer_ammo_incend
name = "TA-100Y howitzer incendiary shell"
contains = list(/obj/item/mortal_shell/howitzer/incendiary)
cost = 40
cost = 30

/datum/supply_packs/explosives/howitzer_ammo_wp
name = "TA-100Y howitzer white phosporous smoke shell"
contains = list(/obj/item/mortal_shell/howitzer/white_phos)
cost = 60
cost = 45

/datum/supply_packs/explosives/howitzer_ammo_plasmaloss
name = "TA-100Y howitzer tanglefoot shell"
contains = list(/obj/item/mortal_shell/howitzer/plasmaloss)
cost = 60
cost = 45

0 comments on commit d4e09cb

Please sign in to comment.