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

Adds and expands on the descriptions of tank hardpoints & magazins #7398

Merged
merged 19 commits into from
Oct 28, 2024
Merged
Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
646a244
descriptions
TheManWithNoHands Oct 27, 2024
cdb14c4
more adds
TheManWithNoHands Oct 27, 2024
364fc39
ehhh
TheManWithNoHands Oct 27, 2024
d594063
more shit
TheManWithNoHands Oct 27, 2024
f121bdb
ahhhh
TheManWithNoHands Oct 27, 2024
717fded
what?
TheManWithNoHands Oct 27, 2024
9fc5a64
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 27, 2024
58c534b
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 27, 2024
1575d4b
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 27, 2024
708679b
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 28, 2024
39cdf47
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 28, 2024
7e1bc90
Update code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
TheManWithNoHands Oct 28, 2024
702c42b
Update code/modules/vehicles/hardpoints/armor/snowplow.dm
TheManWithNoHands Oct 28, 2024
f000c19
Update code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm
TheManWithNoHands Oct 28, 2024
b9c55ee
Update code/modules/vehicles/hardpoints/hardpoint_ammo/minigun_ammo.dm
TheManWithNoHands Oct 28, 2024
2b0f294
Update code/modules/vehicles/hardpoints/secondary/cupola.dm
TheManWithNoHands Oct 28, 2024
1814daf
Update code/modules/vehicles/hardpoints/wheels/treads.dm
TheManWithNoHands Oct 28, 2024
2c7b61a
Update code/modules/vehicles/hardpoints/secondary/grenade_launcher.dm
TheManWithNoHands Oct 28, 2024
1d88406
Update code/modules/vehicles/hardpoints/hardpoint_ammo/autocannon_amm…
TheManWithNoHands Oct 28, 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
8 changes: 8 additions & 0 deletions code/game/machinery/vending/vendor_types/crew/vehicle_crew.dm
Original file line number Diff line number Diff line change
Expand Up @@ -353,6 +353,7 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(

//Not essentials sets but fuck it the code's here
/obj/effect/essentials_set/tank/ltb
desc = "A giant canon firing explosive 86mm shells. You be lucky if this even leaves dust of whatever you hit with it."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/primary/cannon,
/obj/item/ammo_magazine/hardpoint/ltb_cannon,
Expand All @@ -363,20 +364,23 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(
)

/obj/effect/essentials_set/tank/gatling
desc = "A primary LTAA Minigun utelizing AP ammo for tanks. The barrel spins up as it is fired, improving its fire rate and accuracy dramaticly. Capable of shreeding apart even the thickest walls in seconds."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/primary/minigun,
/obj/item/ammo_magazine/hardpoint/ltaaap_minigun,
/obj/item/ammo_magazine/hardpoint/ltaaap_minigun,
)

/obj/effect/essentials_set/tank/dragonflamer
desc = "A heavy flamer that spews out high-combustion napalm in a wide radius. The fuel burns intensely and quickly, which allows for it to be used offensively by armoured vehicles."
spawned_gear_list = list(
/obj/item/hardpoint/primary/flamer,
/obj/item/ammo_magazine/hardpoint/primary_flamer,
/obj/item/ammo_magazine/hardpoint/primary_flamer,
)

/obj/effect/essentials_set/tank/autocannon
desc = "An Automatic Canon for tanks. Capable of firing precise even at long ranges. Loads 20mm explosive shells."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/primary/autocannon,
/obj/item/ammo_magazine/hardpoint/ace_autocannon,
Expand All @@ -386,25 +390,29 @@ GLOBAL_LIST_INIT(cm_vending_clothing_vehicle_crew, list(
)

/obj/effect/essentials_set/tank/tankflamer
desc = "A small LZR-N Flamer Unit. Essentially a modified version of your bog standart flamer."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/secondary/small_flamer,
/obj/item/ammo_magazine/hardpoint/secondary_flamer,
)

/obj/effect/essentials_set/tank/tow
desc = "A quint rocket launcher capable of firing four rockets in quick succession."
harryob marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/secondary/towlauncher,
/obj/item/ammo_magazine/hardpoint/towlauncher,
/obj/item/ammo_magazine/hardpoint/towlauncher,
)

/obj/effect/essentials_set/tank/m56cupola
desc = "A permantly fixed M56D, firing standart issue 10x28mm rounds."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/secondary/m56cupola,
/obj/item/ammo_magazine/hardpoint/m56_cupola,
)

/obj/effect/essentials_set/tank/tankgl
desc = "A magazin feed grenade launcher capable of holding 10 grenades. This model loads M40 grenades."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
spawned_gear_list = list(
/obj/item/hardpoint/secondary/grenade_launcher,
/obj/item/ammo_magazine/hardpoint/tank_glauncher,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/armor/snowplow.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/armor/snowplow
name = "\improper Snowplow"
desc = "Clears a path in the snow for friendlies"
desc = "Clears a path in the snow for friendlies. It doesnt seem to have much use beyond that."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved

icon_state = "snowplow"
disp_icon = "tank"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_magazine/hardpoint/ace_autocannon
name = "Tank Autocannon Magazine"
desc = "A primary armament autocannon magazine"
name = "AC3-E Autocannon Magazine"
desc = "A 40 round magazin holding 20mm shells for the AC3-E autocanon"
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
caliber = "20mm"
icon_state = "ace_autocannon"
w_class = SIZE_LARGE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_magazine/hardpoint/m56_cupola
name = "M56 Cupola Magazine"
desc = "A secondary armament MG magazine"
desc = "A box of 500, 10x28mm caseless tungsten rounds for the M56D heavy machine gun system."
caliber = "10x28mm" //Correlates to smartguns
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi'
icon_state = "cupola_1"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/hardpoint_ammo/gl_ammo.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_magazine/hardpoint/tank_glauncher
name = "M92T Grenade Launcher Magazine"
desc = "A secondary armament grenade magazine."
desc = "A magazin loaded with M40 grenades. Used to reaload the Magazin feed M92T Grenade launcher."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
caliber = "grenade"
icon_state = "glauncher_2"
w_class = SIZE_LARGE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/obj/item/ammo_magazine/hardpoint/ltaaap_minigun
name = "LTAA-AP Minigun Magazine"
icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi'
desc = "A primary armament minigun magazine."
desc = "A magazin of 7.62x51mm AP ammo for a heavy minigun. Filled to the brimm with highly precice armor-penetration rounds."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved
caliber = "7.62x51mm" //Correlates to miniguns
icon_state = "ltaa"
w_class = SIZE_LARGE //Primary weapon ammo should probably all be the same w_class
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_magazine/hardpoint/primary_flamer
name = "DRG-N Offensive Flamer Unit Fuel Tank"
desc = "A primary armament flamethrower magazine."
desc = "Fuel tanks for the DRG-N Offensive Flamer. It contains a high-combustion napalm, capabale of burning through nearly anything."
caliber = "High-Combustion Napalm" //correlates to flamer mags
icon_state = "drgn_flametank"
w_class = SIZE_LARGE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/ammo_magazine/hardpoint/secondary_flamer
name = "LZR-N Flamer Unit Fuel Tank"
desc = "A secondary armament flamethrower magazine."
desc = "A napalm tank fitted to be accepted by the LZR-N Flamer."
caliber = "UT-Napthal Fuel" //correlates to flamer mags
icon_state = "flametank_large"
w_class = SIZE_LARGE
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/primary/autocannon.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/primary/autocannon
name = "\improper AC3-E Autocannon"
desc = "A primary autocannon for tanks that shoots explosive flak rounds"
desc = "A primary autocannon for tanks that shoots explosive flak rounds."

icon_state = "ace_autocannon"
disp_icon = "tank"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vehicles/hardpoints/primary/minigun.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/primary/minigun
name = "\improper LTAA-AP Minigun"
desc = "A primary weapon for tanks that spews bullets"
desc = "A primary LTAA Minigun utelizing AP ammo for tanks. Its six barrels are heavy and take a bit to fully spin up."

icon_state = "ltaaap_minigun"
disp_icon = "tank"
Expand All @@ -26,7 +26,7 @@
"8" = list(-77, 0)
)

scatter = 18
scatter = 18 //base scatter, modified by stake_delay_mult
gun_firemode = GUN_FIREMODE_AUTOMATIC
gun_firemode_list = list(
GUN_FIREMODE_AUTOMATIC,
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/secondary/cupola.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/secondary/m56cupola
name = "\improper M56 Cupola"
desc = "A secondary weapon for tanks that shoots bullets"
desc = "A secondary weapon for tanks. It's a M56D that was adjusted to be permanantly fixed to its mount. You swear you can still see some weld tacks."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved

icon_state = "m56_cupola"
disp_icon = "tank"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/secondary/grenade_launcher
name = "\improper M92T Grenade Launcher"
desc = "A secondary weapon for tanks that shoots grenades."
desc = "A magazin feed secondary grenade launcher for tanks that shoots M40 grenades."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved

icon_state = "glauncher"
disp_icon = "tank"
Expand Down
2 changes: 1 addition & 1 deletion code/modules/vehicles/hardpoints/secondary/tow.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/secondary/towlauncher
name = "\improper TOW Launcher"
desc = "A secondary weapon for tanks that shoots rockets"
desc = "A secondary weapon for tanks that shoots rockets. It loads multiple rockets at once."

icon_state = "tow_launcher"
disp_icon = "tank"
Expand Down
4 changes: 2 additions & 2 deletions code/modules/vehicles/hardpoints/wheels/treads.dm
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/obj/item/hardpoint/locomotion/treads
name = "\improper Treads"
desc = "Integral to the movement of the vehicle."
desc = "Integral to the movement of the vehicle. Steel reinforced rubber tracks, they allow the tank to move faster but in turn need repairs more often."

icon_state = "treads"
disp_icon = "tank"
Expand All @@ -18,7 +18,7 @@

/obj/item/hardpoint/locomotion/treads/robust
name = "\improper Reinforced Treads"
desc = "These treads are made of a tougher material and are more durable. However, the extra weight slows the tank down."
desc = "These treads are made of soldi steel plates and are more durable. However, the extra weight slows the tank down."
TheManWithNoHands marked this conversation as resolved.
Show resolved Hide resolved

health = 500
acid_resistant = TRUE
Expand Down
Loading