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

[TM] Tank LTB has been returned #182

Open
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

[TM] Tank LTB has been returned #182

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
4fd3cf3
ltb is back
Perohai Feb 26, 2025
b437b67
Add banda comments
Perohai Feb 26, 2025
48572aa
Forgotten comment
Perohai Feb 26, 2025
58953ad
Give one mag back
Perohai Feb 26, 2025
64d0ba5
ltb damage nerf
Perohai Feb 28, 2025
65bc84b
Fix ltb fire range and firerate
Perohai Mar 1, 2025
1ea9070
Merge branch 'master' into ltb-back
Perohai Mar 1, 2025
012594e
warning xeno if artillery mod
Perohai Mar 2, 2025
a767b27
fix sound on turf
Perohai Mar 3, 2025
b2aa292
fix code style issues
Perohai Mar 3, 2025
30fb25f
add laser on target + fix style skill issue
Perohai Mar 3, 2025
b2acdfb
linter fix ?
Perohai Mar 3, 2025
2408720
Merge branch 'master' into ltb-back
Perohai Mar 3, 2025
61dbcd9
conflict fix ?
Perohai Mar 3, 2025
9968361
Merge branch 'ltb-back' of https://github.com/Perohai/BandaMarines in…
Perohai Mar 3, 2025
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: 3 additions & 1 deletion code/datums/supply_packs/vehicle_ammo.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,16 @@
//*******************************************************************************/

/datum/supply_packs/ammo_ltb_cannon
name = "LTB Cannon magazines (x6)"
name = "LTB Cannon magazines (x3)" //BANDAMARINES EDIT
contains = list(
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/* BANDAMARINES REMOVAL BEGINS
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
BANDAMARINES REMOVAL ENDS */
)
cost = 30
containertype = /obj/structure/closet/crate/ammo
Expand Down
5 changes: 3 additions & 2 deletions code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,8 @@ GLOBAL_LIST_INIT(cm_vending_vehicle_crew_tank, list(
list("M34A2-A Multipurpose Turret", 0, /obj/effect/essentials_set/tank/turret, VEHICLE_INTEGRAL_AVAILABLE, VENDOR_ITEM_MANDATORY),

list("PRIMARY WEAPON", 0, null, null, null),
list("AC3-E Autocannon", 0, /obj/effect/essentials_set/tank/autocannon, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_RECOMMENDED),
list("LTB Canon 86mm", 0, /obj/effect/essentials_set/tank/ltb, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_RECOMMENDED), //BANDAMARINES EDIT
list("AC3-E Autocannon", 0, /obj/effect/essentials_set/tank/autocannon, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_REGULAR),
list("DRG-N Offensive Flamer Unit", 0, /obj/effect/essentials_set/tank/dragonflamer, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_REGULAR),
list("LTAA-AP Minigun", 0, /obj/effect/essentials_set/tank/gatling, VEHICLE_PRIMARY_AVAILABLE, VENDOR_ITEM_REGULAR),

Expand Down Expand Up @@ -369,7 +370,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
// /obj/item/ammo_magazine/hardpoint/ltb_cannon, BANDAMARINES REMOVAL
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут убирать было не обязательно. 5 снарядов еще ок.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Там 5 магазинов по 3 снаряда

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

По 4*

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

нормально. Остальные пускай заказывают.

)

/obj/effect/essentials_set/tank/gatling
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/primary/ltb.dm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@
)

scatter = 2
fire_delay = 20.0 SECONDS
fire_delay = 30.0 SECONDS //BANDAMARINES EDIT
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

посмотрим как по итогу играться будет.