From 85b183f02fd3d7ec31d09f33f72b671e76d73496 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Mon, 2 Oct 2023 22:18:30 -0700 Subject: [PATCH 1/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 264400caa0dd..5ca4d5897c34 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -283,8 +283,8 @@ //this one is air-to-air only /obj/structure/ship_ammo/rocket/widowmaker - name = "\improper AIM-224/B 'Widowmaker'" - desc = "The AIM-224/B 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." + 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." icon_state = "single" travelling_time = 30 //not powerful, but reaches target fast ammo_id = "" @@ -325,8 +325,8 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/harpoon - name = "\improper AGM-84 'Harpoon'" - desc = "The AGM-84 Harpoon 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." + 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." icon_state = "harpoon" ammo_id = "s" travelling_time = 50 @@ -340,8 +340,8 @@ QDEL_IN(src, 0.5 SECONDS) /obj/structure/ship_ammo/rocket/napalm - name = "\improper XN-99 'Napalm'" - desc = "The XN-99 'Napalm' is an incendiary missile used to turn specific targeted areas into giant balls of fire for a long time." + 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." icon_state = "napalm" ammo_id = "n" point_cost = 500 @@ -373,8 +373,8 @@ //minirockets /obj/structure/ship_ammo/minirocket - name = "mini rocket stack" - desc = "A pack of laser guided mini rockets." + 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 ammuntion count." icon_state = "minirocket" icon = 'icons/obj/structures/props/almayer_props.dmi' equipment_type = /obj/structure/dropship_equipment/weapon/minirocket_pod @@ -410,8 +410,8 @@ /obj/structure/ship_ammo/minirocket/incendiary - name = "incendiary mini rocket stack" - desc = "A pack of laser guided incendiary mini rockets." + name = "\improper AGR-59-I 'Mini-Mike'" + desc = "The AGR-59-I 'Mini-Mike' incindiary 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 ammuntion count." icon_state = "minirocket_inc" point_cost = 500 fire_mission_delay = 3 //high cooldown From b299dd688b4f11e6b8e65518cdbf4e64f70b3fb1 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Mon, 2 Oct 2023 22:44:31 -0700 Subject: [PATCH 2/9] Update dropship_ammo.dm typos are cringe --- code/modules/cm_marines/dropship_ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 5ca4d5897c34..4f60314b219c 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -374,7 +374,7 @@ /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 ammuntion count." + 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." icon_state = "minirocket" icon = 'icons/obj/structures/props/almayer_props.dmi' equipment_type = /obj/structure/dropship_equipment/weapon/minirocket_pod @@ -411,7 +411,7 @@ /obj/structure/ship_ammo/minirocket/incendiary name = "\improper AGR-59-I 'Mini-Mike'" - desc = "The AGR-59-I 'Mini-Mike' incindiary 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 ammuntion count." + desc = "The AGR-59-I 'Mini-Mike' incindiary 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." icon_state = "minirocket_inc" point_cost = 500 fire_mission_delay = 3 //high cooldown From b7475d476f961df761096ef36f93ae869e0b9521 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 5 Oct 2023 13:19:56 -0700 Subject: [PATCH 3/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 4f60314b219c..f7d672f2cde4 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -210,7 +210,7 @@ //laser battery /obj/structure/ship_ammo/laser_battery - name = "high-capacity 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." travelling_time = 10 @@ -422,7 +422,7 @@ fire_spread(impact, create_cause_data(initial(name), source_mob), 3, 25, 20, "#EE6515") /obj/structure/ship_ammo/sentry - name = "multi-purpose area denial 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." icon_state = "launchable_sentry" equipment_type = /obj/structure/dropship_equipment/weapon/launch_bay From a32740f238072ecb504c52859efd131b8b053762 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:26:44 -0700 Subject: [PATCH 4/9] Update dropship_equipment.dm --- code/modules/cm_marines/dropship_equipment.dm | 30 +++++++++---------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 707811e77ce1..737ae45e27a9 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -437,7 +437,7 @@ equip_categories = list(DROPSHIP_ELECTRONICS) /obj/structure/dropship_equipment/electronics/chaff_launcher - name = "chaff launcher" + name = "\improper AN/ALE-203 Chaff Launcher" icon_state = "chaff_launcher" point_cost = 0 @@ -445,7 +445,7 @@ #define LIGHTING_MAX_LUMINOSITY_SHIPLIGHTS 12 /obj/structure/dropship_equipment/electronics/spotlights - name = "spotlight" + name = "\improper AN/LEN-15 Spotlight" icon_state = "spotlights" desc = "A set of high-powered spotlights to illuminate large areas. Fits on electronics attach points of dropships. Moving this will require a powerloader." is_interactable = TRUE @@ -490,12 +490,12 @@ /obj/structure/dropship_equipment/electronics/flare_launcher - name = "flare launcher" + name = "\improper AN/ALE-557 Flare Launcher" icon_state = "flare_launcher" point_cost = 0 /obj/structure/dropship_equipment/electronics/targeting_system - name = "targeting system" + name = "\improper AN/AAQ-178 Weapon Targeting System" icon_state = "targeting_system" desc = "A targeting system for dropships. It improves firing accuracy on laser targets. Fits on electronics attach points. You need a powerloader to lift this." point_cost = 800 @@ -507,7 +507,7 @@ icon_state = initial(icon_state) /obj/structure/dropship_equipment/electronics/landing_zone_detector - name = "\improper LZ detector" + name = "\improper AN/AVD-60 LZ detector" desc = "An electronic device linked to the dropship's camera system that lets you observe your landing zone mid-flight." icon_state = "lz_detector" point_cost = 50 @@ -559,7 +559,7 @@ /obj/structure/dropship_equipment/adv_comp/docking - name = "docking computer" + name = "/improper AN/AKW-222 Docking Computer" icon_state = "docking_comp" point_cost = 0 @@ -702,8 +702,8 @@ /obj/structure/dropship_equipment/weapon/rocket_pod - name = "missile pod" - icon_state = "rocket_pod" + name = "\improper LAU-444 Guided Missile Launcher" + icon_state = "rocket_pod" //I want to take whoever used rocket and missile interchangably 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." firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 5 @@ -722,9 +722,9 @@ /obj/structure/dropship_equipment/weapon/minirocket_pod - name = "minirocket pod" + name = "\improper LAU-229 Rocket Pod" icon_state = "minirocket_pod" - desc = "A mini rocket pod capable of launching six laser-guided mini rockets. Moving this will require some sort of lifter." + desc = "A rocket pod capable of launching six laser-guided mini rockets. Moving this will require some sort of lifter." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 10 //1 seconds @@ -743,7 +743,7 @@ ammo_equipped = null /obj/structure/dropship_equipment/weapon/laser_beam_gun - name = "laser beam gun" + name = "\improper LWU-6B Laser Cannon" 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." icon = 'icons/obj/structures/props/almayer_props64.dmi' @@ -761,7 +761,7 @@ else icon_state = "laser_beam" /obj/structure/dropship_equipment/weapon/launch_bay - name = "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." icon = 'icons/obj/structures/props/almayer_props.dmi' @@ -782,7 +782,7 @@ /obj/structure/dropship_equipment/medevac_system - name = "medevac system" + name = "\improper RMU-4M Medevac System" desc = "A winch system to lift injured marines on medical stretchers onto the dropship. Acquire lift target through the dropship equipment console." equip_categories = list(DROPSHIP_CREW_WEAPON) icon_state = "medevac_system" @@ -1014,7 +1014,7 @@ // Fulton extraction system /obj/structure/dropship_equipment/fulton_system - name = "fulton recovery system" + name = "\improper RMU-19 Fulton Recovery System" desc = "A winch system to collect any fulton recovery balloons in high altitude. Make sure you turn it on!" equip_categories = list(DROPSHIP_CREW_WEAPON) icon_state = "fulton_system" @@ -1131,7 +1131,7 @@ // Rappel deployment system /obj/structure/dropship_equipment/rappel_system - name = "rappel deployment system" + name = "/improper HPU-1 Rappel Deployment System" equip_categories = list(DROPSHIP_CREW_WEAPON) icon_state = "rappel_module_packaged" point_cost = 50 From 697ba1045cd6d14e3871a716c5d850ca3ff18b8f Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:43:53 -0700 Subject: [PATCH 5/9] Update dropship_equipment.dm --- code/modules/cm_marines/dropship_equipment.dm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 737ae45e27a9..7be1067af70c 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -153,7 +153,7 @@ /// Turret holder for dropship automated sentries /obj/structure/dropship_equipment/sentry_holder equip_categories = list(DROPSHIP_WEAPON, DROPSHIP_CREW_WEAPON) - name = "sentry deployment system" + name = "\improper A/A-32-P Sentry Defense System" desc = "A box that deploys a sentry turret. Fits on both the external weapon and crew compartment attach points of dropships. You need a powerloader to lift it." density = FALSE health = null @@ -284,7 +284,7 @@ /// Holder for the dropship mannable machinegun system /obj/structure/dropship_equipment/mg_holder - name = "machine gun deployment system" + name = "\improper MTU-4B Doorgunner Hardpoint System" desc = "A box that deploys a crew-served scoped M56D heavy machine gun. Fits on both the external weapon and crew compartment attach points of dropships. You need a powerloader to lift it." density = FALSE equip_categories = list(DROPSHIP_WEAPON, DROPSHIP_CREW_WEAPON) @@ -686,7 +686,7 @@ /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." + 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" icon_state = "30mm_cannon" firing_sound = 'sound/effects/gau_incockpit.ogg' point_cost = 400 @@ -703,8 +703,8 @@ /obj/structure/dropship_equipment/weapon/rocket_pod name = "\improper LAU-444 Guided Missile Launcher" - icon_state = "rocket_pod" //I want to take whoever used rocket and missile interchangably 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." + icon_state = "rocket_pod" //I want to force whoever used rocket and missile interchangably 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." firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 5 point_cost = 600 @@ -724,7 +724,7 @@ /obj/structure/dropship_equipment/weapon/minirocket_pod name = "\improper LAU-229 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." + 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." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 10 //1 seconds @@ -745,7 +745,7 @@ /obj/structure/dropship_equipment/weapon/laser_beam_gun name = "\improper LWU-6B Laser Cannon" 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." + 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." icon = 'icons/obj/structures/props/almayer_props64.dmi' firing_sound = 'sound/effects/phasein.ogg' firing_delay = 50 //5 seconds @@ -763,7 +763,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." + 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." icon = 'icons/obj/structures/props/almayer_props.dmi' firing_sound = 'sound/weapons/gun_flare_explode.ogg' firing_delay = 10 //1 seconds From 667d547dfc0ed2a101340fbb7bbf3298253dc359 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Thu, 5 Oct 2023 20:43:58 -0700 Subject: [PATCH 6/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index f7d672f2cde4..1a392486930e 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -136,7 +136,7 @@ /obj/structure/ship_ammo/heavygun name = "\improper PGU-100 Multi-Purpose 30mm ammo 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." + 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." equipment_type = /obj/structure/dropship_equipment/weapon/heavygun ammo_count = 400 max_ammo_count = 400 @@ -195,7 +195,7 @@ /obj/structure/ship_ammo/heavygun/antitank name = "PGU-105 30mm Anti-tank ammo 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's 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." + 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's 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." travelling_time = 60 ammo_count = 400 max_ammo_count = 400 @@ -212,7 +212,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." + desc = "A high-capacity laser battery used to power laser beam weapons. Can be loaded into the LWU-6B Laser Cannon." travelling_time = 10 ammo_count = 100 max_ammo_count = 100 @@ -284,7 +284,7 @@ //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." + 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." icon_state = "single" travelling_time = 30 //not powerful, but reaches target fast ammo_id = "" @@ -298,7 +298,7 @@ /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." + 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." icon_state = "banshee" ammo_id = "b" point_cost = 300 @@ -312,7 +312,7 @@ /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." + 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." icon_state = "paveway" travelling_time = 20 //A fast payload due to its very tight blast zone ammo_id = "k" @@ -326,7 +326,7 @@ /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." + 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. Can be loaded into the LAU-444 Guided Missile Launcher." icon_state = "harpoon" ammo_id = "s" travelling_time = 50 @@ -341,7 +341,7 @@ /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." + 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" ammo_id = "n" point_cost = 500 @@ -355,7 +355,7 @@ /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." + 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" ammo_id = "f" travelling_time = 50 @@ -374,7 +374,7 @@ /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." + 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." icon_state = "minirocket" icon = 'icons/obj/structures/props/almayer_props.dmi' equipment_type = /obj/structure/dropship_equipment/weapon/minirocket_pod @@ -411,7 +411,7 @@ /obj/structure/ship_ammo/minirocket/incendiary name = "\improper AGR-59-I 'Mini-Mike'" - desc = "The AGR-59-I 'Mini-Mike' incindiary 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." + desc = "The AGR-59-I 'Mini-Mike' incindiary 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." icon_state = "minirocket_inc" point_cost = 500 fire_mission_delay = 3 //high cooldown @@ -423,7 +423,7 @@ /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." + 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." icon_state = "launchable_sentry" equipment_type = /obj/structure/dropship_equipment/weapon/launch_bay ammo_count = 1 From 60faae1dc5a40d9c811ee84e0e10978de5eae099 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:43:00 -0700 Subject: [PATCH 7/9] Update dropship_ammo.dm --- code/modules/cm_marines/dropship_ammo.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 1a392486930e..53a5fb1ad548 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -193,7 +193,7 @@ /obj/structure/ship_ammo/heavygun/antitank - name = "PGU-105 30mm Anti-tank ammo crate" + name = "\improper PGU-105 30mm Anti-tank ammo 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's 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." travelling_time = 60 From 17fb7b4e9ec046038f1279001690b7afa626969d Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:54:44 -0700 Subject: [PATCH 8/9] Update dropship_equipment.dm typo fixes --- code/modules/cm_marines/dropship_equipment.dm | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/code/modules/cm_marines/dropship_equipment.dm b/code/modules/cm_marines/dropship_equipment.dm index 7be1067af70c..223cb29a6ab8 100644 --- a/code/modules/cm_marines/dropship_equipment.dm +++ b/code/modules/cm_marines/dropship_equipment.dm @@ -1,5 +1,5 @@ -/// Dropship equipments, mainly weaponry but also utility implements +/// Dropship equipment, mainly weaponry but also utility implements /obj/structure/dropship_equipment density = TRUE anchored = TRUE @@ -284,7 +284,7 @@ /// Holder for the dropship mannable machinegun system /obj/structure/dropship_equipment/mg_holder - name = "\improper MTU-4B Doorgunner Hardpoint System" + name = "\improper MTU-4B Door Gunner Hardpoint System" desc = "A box that deploys a crew-served scoped M56D heavy machine gun. Fits on both the external weapon and crew compartment attach points of dropships. You need a powerloader to lift it." density = FALSE equip_categories = list(DROPSHIP_WEAPON, DROPSHIP_CREW_WEAPON) @@ -419,13 +419,13 @@ /obj/structure/dropship_equipment/fuel/fuel_enhancer - name = "fuel enhancer" + name = "\improper fuel enhancer" desc = "A fuel enhancement system for dropships. It improves the thrust produced by the fuel combustion for faster travels. Fits inside the engine attach points. You need a powerloader to lift it." icon_state = "fuel_enhancer" point_cost = 800 /obj/structure/dropship_equipment/fuel/cooling_system - name = "cooling system" + name = "\improper cooling system" desc = "A cooling system for dropships. It produces additional cooling reducing delays between launch. Fits inside the engine attach points. You need a powerloader to lift it." icon_state = "cooling_system" point_cost = 800 @@ -559,7 +559,7 @@ /obj/structure/dropship_equipment/adv_comp/docking - name = "/improper AN/AKW-222 Docking Computer" + name = "\improper AN/AKW-222 Docking Computer" icon_state = "docking_comp" point_cost = 0 @@ -703,7 +703,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 interchangably to come back and look at this god damn mess. + 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." firing_sound = 'sound/effects/rocketpod_fire.ogg' firing_delay = 5 @@ -1131,7 +1131,7 @@ // Rappel deployment system /obj/structure/dropship_equipment/rappel_system - name = "/improper HPU-1 Rappel Deployment System" + name = "\improper HPU-1 Rappel Deployment System" equip_categories = list(DROPSHIP_CREW_WEAPON) icon_state = "rappel_module_packaged" point_cost = 50 From e34c8a9164ca0b8530ed65eace9161a4bed65739 Mon Sep 17 00:00:00 2001 From: blackdragonTOW <31581761+blackdragonTOW@users.noreply.github.com> Date: Fri, 6 Oct 2023 11:59:16 -0700 Subject: [PATCH 9/9] Update dropship_ammo.dm typos --- code/modules/cm_marines/dropship_ammo.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/cm_marines/dropship_ammo.dm b/code/modules/cm_marines/dropship_ammo.dm index 53a5fb1ad548..ef59e643e4cf 100644 --- a/code/modules/cm_marines/dropship_ammo.dm +++ b/code/modules/cm_marines/dropship_ammo.dm @@ -18,10 +18,10 @@ var/ammo_count /// Maximal ammunition count var/max_ammo_count - /// What to call the ammo in the ammo transfering message + /// What to call the ammo in the ammo transferring message var/ammo_name = "round" var/ammo_id - /// Whether the ammo inside this magazine can be transfered to another magazine. + /// Whether the ammo inside this magazine can be transferred to another magazine. var/transferable_ammo = FALSE /// How many tiles the ammo can deviate from the laser target var/accuracy_range = 3 @@ -146,7 +146,7 @@ fire_mission_delay = 2 var/bullet_spread_range = 4 //how far from the real impact turf can bullets land var/shrapnel_type = /datum/ammo/bullet/shrapnel/gau //For siming 30mm bullet impacts. - var/directhit_damage = 105 //how much damage is to be inficted to a mob, this is here so that we can hit resting mobs. + var/directhit_damage = 105 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. var/penetration = 10 //AP value pretty much /obj/structure/ship_ammo/heavygun/get_examine_text(mob/user) @@ -195,7 +195,7 @@ /obj/structure/ship_ammo/heavygun/antitank name = "\improper PGU-105 30mm Anti-tank ammo 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's 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 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." travelling_time = 60 ammo_count = 400 max_ammo_count = 400 @@ -204,7 +204,7 @@ point_cost = 325 fire_mission_delay = 2 shrapnel_type = /datum/ammo/bullet/shrapnel/gau/at - directhit_damage = 80 //how much damage is to be inficted to a mob, this is here so that we can hit resting mobs. + directhit_damage = 80 //how much damage is to be inflicted to a mob, this is here so that we can hit resting mobs. penetration = 40 //AP value pretty much //laser battery @@ -411,7 +411,7 @@ /obj/structure/ship_ammo/minirocket/incendiary name = "\improper AGR-59-I 'Mini-Mike'" - desc = "The AGR-59-I 'Mini-Mike' incindiary 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." + 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." icon_state = "minirocket_inc" point_cost = 500 fire_mission_delay = 3 //high cooldown