From 3050fd76fb389510967fedea92e66287e488b7b5 Mon Sep 17 00:00:00 2001 From: KoishiVibe <111302138+KoishiVibe@users.noreply.github.com> Date: Fri, 22 Nov 2024 19:33:16 -0600 Subject: [PATCH] Dropship Weapons Reflavor (#564) Co-authored-by: KoishiVibe --- .../extra_buttons/fire_support_menu.dm | 8 +-- code/modules/cm_marines/dropship_ammo.dm | 59 +++++++++---------- code/modules/cm_marines/dropship_equipment.dm | 16 ++--- 3 files changed, 40 insertions(+), 43 deletions(-) diff --git a/code/modules/admin/game_master/extra_buttons/fire_support_menu.dm b/code/modules/admin/game_master/extra_buttons/fire_support_menu.dm index 6a6f528d06b..225adcf694e 100644 --- a/code/modules/admin/game_master/extra_buttons/fire_support_menu.dm +++ b/code/modules/admin/game_master/extra_buttons/fire_support_menu.dm @@ -1,12 +1,12 @@ #define FIRE_SUPPORT_CLICK_INTERCEPT_ACTION "fire_support_click_intercept_action" //Various ordnance selections -#define ORDNANCE_OPTIONS list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile", "Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "GAU-21", "Heavy GAU-21", "High Explosive", "Incendiary", "Cluster", "High Explosive","Nerve Gas OB", "Incendiary", "Fragmentation", "Flare", "Nerve Gas Mortar") +#define ORDNANCE_OPTIONS list("Banshee Missile", "CN-20 Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile", "Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "25mm Multipurpose Strike", "25mm Armorpiercing Strike", "High Explosive", "Incendiary", "Cluster", "High Explosive","Nerve Gas OB", "Incendiary", "Fragmentation", "Flare", "Nerve Gas Mortar") #define MISSILE_ORDNANCE list("Banshee Missile", "Harpoon Missile", "Keeper Missile", "Napalm Missile", "Thermobaric Missile", "Widowmaker Missile") #define ORBITAL_ORDNANCE list("High Explosive OB", "Incendiary OB", "Cluster OB") #define MORTAR_ORDNANCE list("High Explosive Shell", "Incendiary Shell", "Fragmentation Shell", "Flare Shell") #define CHEMICAL_ORDNANCE list("CN-20 Missile", "Nerve Gas OB", "Nerve Gas Shell") -#define MISC_ORDNANCE list("Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "GAU-21", "Heavy GAU-21") +#define MISC_ORDNANCE list("Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "25mm Multipurpose Strike", "25mm Armorpiercing Strike") /client/proc/toggle_fire_support_menu() set name = "Fire Support Menu" @@ -206,7 +206,7 @@ QDEL_IN(target_lase, 5 SECONDS) //to stop "unused var" warnings return TRUE - if("GAU-21") + if("25mm Multipurpose Strike") var/obj/effect/overlay/temp/blinking_laser/target_lase = new(target_turf) var/obj/structure/ship_ammo/heavygun/ammo = new() @@ -215,7 +215,7 @@ QDEL_IN(target_lase, 5 SECONDS) //to stop "unused var" warnings return TRUE - if("Heavy GAU-21") + if("25mm Armorpiercing Strike") var/obj/effect/overlay/temp/blinking_laser/target_lase = new(target_turf) var/obj/structure/ship_ammo/heavygun/antitank/ammo = new() diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 9f674e04310..137279da21c 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -134,9 +134,9 @@ //30mm gun /obj/structure/ship_ammo/heavygun - name = "\improper PGU-100 Multi-Purpose 30mm ammo crate" + name = "\improper 25mm multipurpose ammunition crate" icon_state = "30mm_crate" - desc = "A crate full of PGU-100 30mm Multi-Purpose ammo designed to penetrate light (non reinforced) structures, as well as shred infantry, IAVs, LAVs, IMVs, and MRAPs. Works in large areas for use on Class 4 and superior alien insectoid infestations, as well as fitting within the armaments allowed for use against a tier 4 insurgency as well as higher tiers. However, it lacks armor penetrating capabilities, for which Anti-Tank 30mm ammo is needed. Can be loaded into the GAU-21 30mm cannon." + desc = "A 400rnd reinforced crate of Armor Piercing High Explosive and Incendiary 25mm ammunition for use with the GAU-113 rotary autocannon. Best used against light structures, personnel in the open, or thinskin vehicles. Entirely ineffective against heavier armor." equipment_type = /obj/structure/dropship_equipment/weapon/heavygun ammo_count = 400 max_ammo_count = 400 @@ -192,9 +192,9 @@ /obj/structure/ship_ammo/heavygun/antitank - name = "\improper PGU-105 30mm Anti-tank ammo crate" + name = "\improper 25mm armor piercing ammunition crate" icon_state = "30mm_crate_hv" - desc = "A crate full of PGU-105 Specialized 30mm APFSDS Titanium-Tungsten alloy penetrators, made for countering peer and near peer APCs, IFVs, and MBTs in CAS support. It is designed to penetrate up to the equivalent 1350mm of RHA when launched from a GAU-21. It is much less effective against soft targets however, in which case 30mm ball ammunition is recommended. WARNING: discarding petals from the ammunition can be harmful if the dropship does not pull out at the needed speeds. Please consult page 3574 of the manual, available for order at any ARMAT store. Can be loaded into the GAU-21 30mm cannon." + desc = "A 400rnd reinforced crate of 25mm subcaliber armor piercing discarding sabot ammunition. Reduced effect on structures or personnel in the open, but excellent against armor, entrenched personnel, and other hard targets." travelling_time = 60 ammo_count = 400 max_ammo_count = 400 @@ -211,7 +211,7 @@ /obj/structure/ship_ammo/laser_battery name = "\improper BTU-17/LW Hi-Cap Laser Battery" icon_state = "laser_battery" - desc = "A high-capacity laser battery used to power laser beam weapons. Can be loaded into the LWU-6B Laser Cannon." + desc = "A high-capacity laser battery used to power laser beam weapons. Can be loaded into the AN/AEQ-22 laser system." travelling_time = 10 ammo_count = 100 max_ammo_count = 100 @@ -275,8 +275,8 @@ //this one is air-to-air only /obj/structure/ship_ammo/rocket/widowmaker - name = "\improper AIM-224B 'Widowmaker'" - desc = "The AIM-224B missile is a retrofit of the latest in air-to-air missile technology. Earning the nickname of 'Widowmaker' from various dropship pilots after improvements to its guidance warhead prevents it from being jammed leading to its high kill rate. Not well suited for ground bombardment but its high velocity makes it reach its target quickly. This one has been modified to be a free-fall bomb as a result of dropship ammo shortages. Can be loaded into the LAU-444 Guided Missile Launcher." + name = "\improper AIM-90E 'Headlock' air to air missile" + desc = "The AIM-90E is an all-aspect multimodal homing missile. An intelligently fuzed 34 explosive dart payload makes it excellent against airborne targets, however the optical/RADAR seeker can also engage softer ground targets. The E variant improves countermeasure rejection and improves high altitude intercept performance." icon_state = "single" travelling_time = 30 //not powerful, but reaches target fast ammo_id = "" @@ -289,8 +289,8 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/banshee - name = "\improper AGM-227 'Banshee'" - desc = "The AGM-227 missile is a mainstay of the overhauled dropship fleet against any mobile or armored ground targets. It's earned the nickname of 'Banshee' from the sudden wail that it emits right before hitting a target. Useful to clear out large areas. Can be loaded into the LAU-444 Guided Missile Launcher." + name = "\improper AGM-220C 'Hellhound II' tactical missile" + desc = "The AGM-220C is a multipurpose air to ground missile intended for point targets. Terminal homing is provided by an infrared/active RADAR seeker complex, with intelligent fusing determining optimum impact geometry. The C variant improves the RADAR and countermeasure rejection logic." icon_state = "banshee" ammo_id = "b" point_cost = 300 @@ -303,8 +303,8 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/banshee/nerve - name = "\improper AGM-227/C 'Honest John'" - desc = "The AGM-227 Banshee platform is an effective vehicle for a variety of warheads. While most rockets contain just a high-explosive charge, or an incendiary gel mixture for wide-area destruction, the 'Honest John' carries a 38kg CN-20 nerve gas warhead. USCMCWC greatly recommends MOPP gear be worn while handling." + name = "\improper AGM-220H air to ground missile" + desc = "The AGM-220 is a platform for a multitude of warheads. The H variant is specially modified to safely contain a saturation payload of CN-20 nerve agent." icon_state = "banshee" ammo_id = "b" point_cost = 500 //changed from regular banshee even if in 99.99999% of cases PvE will never need this but I was too scared to remove it for fear of something exploding @@ -322,8 +322,8 @@ /obj/structure/ship_ammo/rocket/keeper - name = "\improper GBU-67 'Keeper II'" - desc = "The GBU-67 'Keeper II' is the latest in a generation of laser guided weaponry that spans all the way back to the 20th century. Earning its nickname from a shortening of 'Peacekeeper' which comes from the program that developed its guidance system and the various uses of it during peacekeeping conflicts. Its payload is designed to devastate armored targets. Can be loaded into the LAU-444 Guided Missile Launcher." + name = "\improper Mk.89 SGW smart bomb" + desc = "The Mk.89 SGW is a lowcost alternative to the AGM-220C, iterating on the Mk.88 before it. Infrared seeker, 120mm shaped charge, foldout fins, and a rocket motor. The '89 improves motor burn time and incorporates a basic chaff decoy package." icon_state = "paveway" travelling_time = 20 //A fast payload due to its very tight blast zone ammo_id = "k" @@ -336,8 +336,8 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/harpoon - name = "\improper AGM-184 'Harpoon II'" - desc = "The AGM-184 Harpoon II is an Anti-Ship Missile, designed and used to effectively take down enemy ships with a huge blast wave with low explosive power. This one is modified to use ground signals and can be seen as a cheaper alternative to conventional ordnance. Can be loaded into the LAU-444 Guided Missile Launcher." + name = "\improper AGM-220M 'Hellhound II' fragmentation tactical missile" + desc = "The AGM-220M incorporates a blast-fragmentation warhead with intelligent fuzing set by the dropship at launch. Destonation is set for variable airburst against soft targets or impact against hardened ones. Ineffective against reinforced structures or medium to heavy armor" icon_state = "harpoon" ammo_id = "s" travelling_time = 50 @@ -350,9 +350,9 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/napalm - name = "\improper AGM-99 'Napalm'" - desc = "The AGM-99 'Napalm' is an incendiary missile used to turn specific targeted areas into giant balls of fire for a long time. Can be loaded into the LAU-444 Guided Missile Launcher." - icon_state = "napalm" + name = "\improper AGM-220M 'Hellhound II' incendiary tactical missile" + desc = "An AGM-220 series weapon with an incendiary payload. Best in defoliant and antipersonnel roles, but worthless against armor." + icon_state = "napalm" //maybe i should just change the goddamn thing to be the same sprite and recolor them or something. ammo_id = "n" point_cost = 500 fire_mission_delay = 0 //0 means unusable @@ -364,9 +364,9 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/thermobaric - name = "\improper BLU-200 'Dragons Breath'" - desc = "The BLU-200 Dragons Breath a thermobaric fuel-air bomb. The aerosolized fuel mixture creates a vacuum when ignited causing serious damage to those in its way. Can be loaded into the LAU-444 Guided Missile Launcher." - icon_state = "fatty" + name = "\improper AGM-220N 'Hellhound II' thermobaric tactical missile" + desc = "The AGM-220N is the real monster of the series. It carries a metal augmented charge, generating a thermobaric explosion proven to decisively defeat personnel, light vehicles, and structures, regardless of their entrenchement status. Against armor, the effects are less impressive." + icon_state = "napalm" //screw it, this one i AM changing. ammo_id = "f" travelling_time = 50 point_cost = 300 @@ -383,8 +383,8 @@ //minirockets /obj/structure/ship_ammo/minirocket - name = "\improper AGR-59 'Mini-Mike'" - desc = "The AGR-59 'Mini-Mike' minirocket is a cheap and efficient means of putting hate down range. Though rockets lack a guidance package, it makes up for it in ammunition count. Can be loaded into the LAU-229 Rocket Pod." + name = "\improper M362 70mm blast-frag rocket" + desc = "The M362 blast fragmentation warhead for the Mk.10 'Zeus' unguided rocket system is a good choice for antipersonnel or light structure defeat work. A larger salvo size also enables some class of air defense saturation." icon_state = "minirocket" icon = 'icons/obj/structures/props/almayer_props.dmi' equipment_type = /obj/structure/dropship_equipment/weapon/minirocket_pod @@ -420,8 +420,8 @@ /obj/structure/ship_ammo/minirocket/incendiary - name = "\improper AGR-59-I 'Mini-Mike'" - desc = "The AGR-59-I 'Mini-Mike' incendiary minirocket is a cheap and efficient means of putting hate down range AND setting them on fire! Though rockets lack a guidance package, it makes up for it in ammunition count. Can be loaded into the LAU-229 Rocket Pod." + name = "\improper M322 70mm incendiary rocket" + desc = "Strinctly speaking, the M322 incendiary warhead for the Mk.10 Zeus is no longer supposed to be in service. However, some stocks still exist. Great for antistructure and defoliant work, but poor hard target defeat." icon_state = "minirocket_inc" point_cost = 500 fire_mission_delay = 3 //high cooldown @@ -432,8 +432,8 @@ fire_spread(impact, create_cause_data(initial(name), source_mob), 3, 25, 20, "#EE6515") /obj/structure/ship_ammo/sentry - name = "\improper A/C-49-P Air Deployable Sentry" - desc = "An omni-directional sentry, capable of defending an area from lightly armored hostile incursion. Can be loaded into the LAG-14 Internal Sentry Launcher." + name = "\improper UA/571-P paradrop sentry weapons system" + desc = "The UA/571-P is a variant of the standard UA/571-C, intended for airborne deployment. In this manner it can be used for area denial, early warning, and limited reconnaissance." icon_state = "launchable_sentry" equipment_type = /obj/structure/dropship_equipment/weapon/launch_bay ammo_count = 1 @@ -455,10 +455,7 @@ qdel(src) /obj/structure/ship_ammo/sentry/can_fire_at(turf/impact, mob/user) - for(var/obj/structure/machinery/defenses/def in urange(4, impact)) - to_chat(user, SPAN_WARNING("The selected drop site is too close to another deployed defense!")) - return FALSE - if(istype(impact, /turf/closed)) + if(istype(impact, /turf/closed))// keeping this as a safety. However, being avble to paradrop the suckers wherever you want is much in line, no? :) to_chat(user, SPAN_WARNING("The selected drop site is a sheer wall!")) return FALSE return TRUE diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index e7709a9953a..cc483a5e280 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -730,8 +730,8 @@ SA.detonate_on(impact, src) /obj/structure/dropship_equipment/weapon/heavygun - name = "\improper GAU-21 30mm cannon" - desc = "A dismounted GAU-21 'Rattler' 30mm rotary cannon. It seems to be missing its feed links and has exposed connection wires. Capable of firing 5200 rounds a minute, feared by many for its power. Earned the nickname 'Rattler' from the vibrations it would cause on dropships in its initial production run. Accepts PGU-100/PGU-105 ammo crates" + name = "\improper GAU-113/B 25mm rotary autocannon" + desc = "A dismounted GAU-113/B. Capable of 2-6,000rpm fire rates and firing 25mm ammunition using the binary hypergolic principle. Requires ammunition to actually be anything more than a cool fireworks show. Can be fired without ammunition for airshows or other events." icon_state = "30mm_cannon" firing_sound = 'sound/effects/gau_incockpit.ogg' point_cost = 400 @@ -750,7 +750,7 @@ /obj/structure/dropship_equipment/weapon/rocket_pod name = "\improper LAU-444 Guided Missile Launcher" icon_state = "rocket_pod" //I want to force whoever used rocket and missile interchangeably to come back and look at this god damn mess. - desc = "A missile pod weapon system capable of launching a single laser-guided missile. Moving this will require some sort of lifter. Accepts AGM, AIM, BLU, and GBU missile systems." + desc = "Launch rail system that accepts a single missile weapon. Moving this will require heavy machinery." firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 5 point_cost = 600 @@ -769,9 +769,9 @@ /obj/structure/dropship_equipment/weapon/minirocket_pod - name = "\improper LAU-229 Rocket Pod" + name = "\improper Mk.10 Zeus Rocket Pod" icon_state = "minirocket_pod" - desc = "A rocket pod capable of launching six laser-guided mini rockets. Moving this will require some sort of lifter. Accepts the AGR-59 series of minirockets." + desc = "The Mk.10 Zeus multiple rocket launcher system can fit a variety of 70mm unguided rockets for multiple mission types. Moving this will require heavy machinery." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 10 //1 seconds @@ -791,9 +791,9 @@ ammo_equipped = null /obj/structure/dropship_equipment/weapon/laser_beam_gun - name = "\improper LWU-6B Laser Cannon" + name = "\improper AN/AEQ-22 free electron laser system" icon_state = "laser_beam" - desc = "State of the art technology recently acquired by the USCM, it fires a battery-fed pulsed laser beam at near lightspeed setting on fire everything it touches. Moving this will require some sort of lifter. Accepts the BTU-17/LW Hi-Cap Laser Batteries." + desc = "The AN/AEQ-22 is intended to illuminate ground targets for compatible ordinance or outright destroy them. A secondary soft/hardkill self protection mode for the carrying aircraft is included. In directfire mode, it is rated for anti-materiel and anti-personnel operation, with the pulsed laser inflicting 230kJ per shot." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/phasein.ogg' firing_delay = 50 //5 seconds @@ -812,7 +812,7 @@ /obj/structure/dropship_equipment/weapon/launch_bay name = "\improper LAG-14 Internal Sentry Launcher" icon_state = "launch_bay" - desc = "A launch bay to drop special ordnance. Fits inside the dropship's crew weapon emplacement. Moving this will require some sort of lifter. Accepts the A/C-49-P Air Deployable Sentry as ammunition." + desc = "A launch bay to drop special ordnance. Fits inside the dropship's crew weapon emplacement. Moving this will require some sort of lifter. Accepts the UA/571-P paradrop sentry weapons system." icon = 'icons/obj/structures/props/almayer_props.dmi' firing_sound = 'sound/weapons/gun_flare_explode.ogg' firing_delay = 10 //1 seconds