From de6c369d04585df3c94c43a96643acfa82858d4f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:35:25 -0500 Subject: [PATCH 01/10] fuck that shit --- code/game/objects/structures/flora.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 7b01243290..f46373c84e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -706,15 +706,15 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. var/new_slowdown = H.next_move_slowdown + rand(4,7) H.next_move_slowdown = new_slowdown if(prob(10)) - to_chat(H, SPAN_WARNING("It is very hard to move trough this [src]...")) + to_chat(H, SPAN_WARNING("It is very hard to move through this [src]...")) if(8 to 9) var/new_slowdown = H.next_move_slowdown + rand(8,11) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got tangeled in [src]!")) + to_chat(H, SPAN_WARNING("You got tangled in [src]!")) if(10) var/new_slowdown = H.next_move_slowdown + rand(12,20) H.next_move_slowdown = new_slowdown - to_chat(H, SPAN_WARNING("You got completely tangeled in [src]! Oh boy...")) + to_chat(H, SPAN_WARNING("You got completely tangled in [src]! Oh boy...")) /obj/structure/flora/jungle/thickbush/attackby(obj/item/I as obj, mob/user as mob) //hatchets and shiet can clear away undergrowth @@ -724,9 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it - to_chat(user, SPAN_DANGER("You flail away at the undergrowth, but it's too thick here.")) + to_chat(user, SPAN_DANGER("You chop away at the undergrowth, but it's too thick here.")) else - user.visible_message(SPAN_DANGER("[user] flails away at the [src] with [I]."),SPAN_DANGER("You flail away at the [src] with [I].")) + user.visible_message(SPAN_DANGER("[user] chops away at the [src] with [I]."),SPAN_DANGER("You chop away at the [src] with [I].")) playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1) health -= damage if(health < 0) From 8ea6f23b97f04f9a6a0471c8526085222c5868b5 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 11:45:08 -0500 Subject: [PATCH 02/10] emails --- code/datums/fluff_emails.dm | 51 +++++++++++++++++++++++++++++++++++++ 1 file changed, 51 insertions(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index f7083541dd..8a7ce922e2 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,6 +3,57 @@ var/title //email title var/entry_text //email content +//emails for the Golden Arrow. Implementation... soon? +/datum/fluff_email/golden_arrow + +/datum/fluff_email/golden_arrow/section_a + title = "Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + swear to god dude this is such bs. fuckin "enhanced readiness" my ass, + transfer someone over so we're not workin with half strength platoons out here! god! +
+
+ I can tell even the gunny ain't happy about this shit, the Lt's putting on a smile + but we all seen her and that friggin picture of her girlfriend she got in her wallet or whatever. + What happened to overtime pay? + + "} + +/datum/fluff_email/golden_arrow/section_a/reply1 + title = "RE: Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + [...] +
+
+ Okay, listen, yeah I know it's bullshit but we've got all their support gear to play with and + it's at least less fucked in the barracks if we overnight somewhere. Too many stinking bodies is + hell on earth, right? + Also. C'mon, dude. I know what you really want. You're looking at getting that bet money from Carmen + right? :) + + "} + +/datum/fluff_email/golden_arrow/section_a/reply2 + title = "RE: RE: Section A shore leave???" + entry_text = {" + LOG//:WEBMASTER/RETRIEVE/EMAIL + LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' + [...] +
+
+ [...] + we've got their support gear to play with but where'd all the ordinance go???? Lt says the + ammo supply for the M83A2s is fine, but 'new regulations' require him to store it under + the automated quartermaster's supervision??? if that's true, why're the M40s laying out?? +
+
+ also fuck you, i earned that shit. the spicy peanut milk fuckin sucked. + + "} //emails for the Almayer computers /datum/fluff_email/almayer From b69183dace5284882e8fde821494f9f90a72de40 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:40:54 -0500 Subject: [PATCH 03/10] FUCK. --- code/datums/fluff_emails.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index 8a7ce922e2..06b76ae6df 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -23,7 +23,7 @@ /datum/fluff_email/golden_arrow/section_a/reply1 title = "RE: Section A shore leave???" - entry_text = {" + entry_text = {" LOG//:WEBMASTER/RETRIEVE/EMAIL LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' [...] @@ -39,7 +39,7 @@ /datum/fluff_email/golden_arrow/section_a/reply2 title = "RE: RE: Section A shore leave???" - entry_text = {" + entry_text = {" LOG//:WEBMASTER/RETRIEVE/EMAIL LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' [...] From d5078fe5c8f707939cf93a5208d5582013b18490 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:41:44 -0500 Subject: [PATCH 04/10] unfucks that. --- code/datums/fluff_emails.dm | 52 ------------------------------------- 1 file changed, 52 deletions(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index 06b76ae6df..b57431cca9 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,58 +3,6 @@ var/title //email title var/entry_text //email content -//emails for the Golden Arrow. Implementation... soon? -/datum/fluff_email/golden_arrow - -/datum/fluff_email/golden_arrow/section_a - title = "Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - swear to god dude this is such bs. fuckin "enhanced readiness" my ass, - transfer someone over so we're not workin with half strength platoons out here! god! -
-
- I can tell even the gunny ain't happy about this shit, the Lt's putting on a smile - but we all seen her and that friggin picture of her girlfriend she got in her wallet or whatever. - What happened to overtime pay? - - "} - -/datum/fluff_email/golden_arrow/section_a/reply1 - title = "RE: Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - [...] -
-
- Okay, listen, yeah I know it's bullshit but we've got all their support gear to play with and - it's at least less fucked in the barracks if we overnight somewhere. Too many stinking bodies is - hell on earth, right? - Also. C'mon, dude. I know what you really want. You're looking at getting that bet money from Carmen - right? :) - - "} - -/datum/fluff_email/golden_arrow/section_a/reply2 - title = "RE: RE: Section A shore leave???" - entry_text = {" - LOG//:WEBMASTER/RETRIEVE/EMAIL - LOG//:DISPLAY/'Welcome to the secured USS Golden Arrow Intranet.' - [...] -
-
- [...] - we've got their support gear to play with but where'd all the ordinance go???? Lt says the - ammo supply for the M83A2s is fine, but 'new regulations' require him to store it under - the automated quartermaster's supervision??? if that's true, why're the M40s laying out?? -
-
- also fuck you, i earned that shit. the spicy peanut milk fuckin sucked. - - "} - //emails for the Almayer computers /datum/fluff_email/almayer From edf2edec75b65798b85c231957d7bb56fe766f79 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 13:55:01 -0500 Subject: [PATCH 05/10] try to fix the problem --- code/game/objects/structures/flora.dm | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/game/objects/structures/flora.dm b/code/game/objects/structures/flora.dm index 0148349f47..3461b9049e 100644 --- a/code/game/objects/structures/flora.dm +++ b/code/game/objects/structures/flora.dm @@ -724,15 +724,9 @@ ICEY GRASS. IT LOOKS LIKE IT'S MADE OF ICE. damage = rand(8,18) if(indestructable) //this bush marks the edge of the map, you can't destroy it -<<<<<<< HEAD - to_chat(user, SPAN_DANGER("You chop away at the undergrowth, but it's too thick here.")) - else - user.visible_message(SPAN_DANGER("[user] chops away at the [src] with [I]."),SPAN_DANGER("You chop away at the [src] with [I].")) -======= to_chat(user, SPAN_DANGER("You chop at the undergrowth, but it's too thick here.")) else user.visible_message(SPAN_DANGER("[user] chops at the [src] with [I]."),SPAN_DANGER("You chop at the [src] with [I].")) ->>>>>>> 48aca9e1b50768a553d2ee81fac139b060e7d0d0 playsound(src.loc, 'sound/effects/vegetation_hit.ogg', 25, 1) health -= damage if(health < 0) From a361ab21dd886c311b32b8c4f8aad89f59352d5b Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 14:36:27 -0500 Subject: [PATCH 06/10] i dont know why hpefully fixed???? --- code/datums/fluff_emails.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index b57431cca9..a71ad083bb 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -6,7 +6,6 @@ //emails for the Almayer computers /datum/fluff_email/almayer - /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 0f713b93032bc81ada7cfbef0d073998d9798312 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 14:37:51 -0500 Subject: [PATCH 07/10] hopefully fixed wait no this needs to mathc --- code/datums/fluff_emails.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index a71ad083bb..b57431cca9 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -6,6 +6,7 @@ //emails for the Almayer computers /datum/fluff_email/almayer + /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 562df9ee4d332cdb82f4e46ffe93af0536b92bf8 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 15:11:58 -0500 Subject: [PATCH 08/10] flamer --- code/datums/supply_packs/spec_ammo.dm | 18 +++++++++--------- code/game/machinery/autolathe_datums.dm | 4 ++-- code/game/objects/items/storage/backpack.dm | 2 +- .../objects/items/storage/large_holster.dm | 6 +++--- code/game/objects/items/storage/pouch.dm | 2 +- .../crates_lockers/largecrate_supplies.dm | 4 ++-- code/modules/cm_marines/equipment/guncases.dm | 3 ++- code/modules/projectiles/gun_attachables.dm | 3 +-- code/modules/projectiles/guns/flamer/flamer.dm | 12 ++++++------ code/modules/projectiles/magazines/flamer.dm | 16 ++++++++-------- 10 files changed, 35 insertions(+), 35 deletions(-) diff --git a/code/datums/supply_packs/spec_ammo.dm b/code/datums/supply_packs/spec_ammo.dm index 7931a4d402..f176b2d682 100644 --- a/code/datums/supply_packs/spec_ammo.dm +++ b/code/datums/supply_packs/spec_ammo.dm @@ -184,10 +184,10 @@ containername = "M4RA Scout Impact Magazine Crate" group = "Weapons Specialist Ammo" -//M240-T +//M240E1 /datum/supply_packs/ammo_pyro_mix - name = "M240-T Mixed Fuel Tank Crate (extended x1, type-B x1, type-X x1)" + name = "M240E1 Mixed Fuel Tank Crate (extended x1, type-B x1, type-X x1)" contains = list( /obj/item/ammo_magazine/flamer_tank/large, /obj/item/ammo_magazine/flamer_tank/large/B, @@ -195,11 +195,11 @@ ) cost = 60 containertype = /obj/structure/closet/crate/ammo/alt/flame - containername = "\improper M240-T Mixed Fuel Tank Crate" + containername = "\improper M240E1 Mixed Fuel Tank Crate" group = "Weapons Specialist Ammo" /datum/supply_packs/ammo_pyro_extended - name = "M240-T Extended Fuel Tank Crate (extended x3)" + name = "M240E1 Extended Fuel Tank Crate (extended x3)" contains = list( /obj/item/ammo_magazine/flamer_tank/large, /obj/item/ammo_magazine/flamer_tank/large, @@ -207,25 +207,25 @@ ) cost = 30 containertype = /obj/structure/closet/crate/ammo/alt/flame - containername = "M240-T Extended Fuel Tank Crate" + containername = "M240E1 Extended Fuel Tank Crate" group = "Weapons Specialist Ammo" /datum/supply_packs/ammo_pyro_b - name = "M240-T Type-B Fuel Tank Crate (x1)" + name = "M240E1 Type-B Fuel Tank Crate (x1)" contains = list( /obj/item/ammo_magazine/flamer_tank/large/B, ) cost = 30 containertype = /obj/structure/closet/crate/ammo/alt/flame - containername = "M240-T Type-B Fuel Tank Crate" + containername = "M240E1 Type-B Fuel Tank Crate" group = "Weapons Specialist Ammo" /datum/supply_packs/ammo_pyro_x - name = "M240-T Type-X Fuel Tank Crate (x1)" + name = "M240E1 Type-X Fuel Tank Crate (x1)" contains = list( /obj/item/ammo_magazine/flamer_tank/large/X, ) cost = 40 containertype = /obj/structure/closet/crate/ammo/alt/flame - containername = "M240-T Type-X Fuel Tank Crate" + containername = "M240E1 Type-X Fuel Tank Crate" group = "Weapons Specialist Ammo" diff --git a/code/game/machinery/autolathe_datums.dm b/code/game/machinery/autolathe_datums.dm index fa6fec094c..10ab7049a5 100644 --- a/code/game/machinery/autolathe_datums.dm +++ b/code/game/machinery/autolathe_datums.dm @@ -322,12 +322,12 @@ category = AUTOLATHE_CATEGORY_EXPLOSIVES /datum/autolathe/recipe/armylathe/flamer_tank - name = "Custom M240A1 Fuel Tank" + name = "Custom M240 Fuel Tank" path = /obj/item/ammo_magazine/flamer_tank/custom category = AUTOLATHE_CATEGORY_EXPLOSIVES /datum/autolathe/recipe/armylathe/large_flamer_tank - name = "Custom M240-T Fuel Tank" + name = "Custom M240E1 Fuel Tank" path = /obj/item/ammo_magazine/flamer_tank/custom/large category = AUTOLATHE_CATEGORY_EXPLOSIVES diff --git a/code/game/objects/items/storage/backpack.dm b/code/game/objects/items/storage/backpack.dm index 81e838b30b..69051a8b3e 100644 --- a/code/game/objects/items/storage/backpack.dm +++ b/code/game/objects/items/storage/backpack.dm @@ -901,7 +901,7 @@ // Pyrotechnician Spec backpack fuel tank /obj/item/storage/backpack/marine/engineerpack/flamethrower name = "\improper USCM Pyrotechnician G6-2 fueltank" - desc = "A specialized fueltank worn by USCM Pyrotechnicians for use with the M240-T incinerator unit. A small general storage compartment is installed." + desc = "A specialized tank pack for the M240E1 incinerator unit. A small general storage compartment is installed." icon_state = "flamethrower_tank" max_fuel = 500 fuel_type = "utnapthal" diff --git a/code/game/objects/items/storage/large_holster.dm b/code/game/objects/items/storage/large_holster.dm index 81e483ef96..1e74a78645 100644 --- a/code/game/objects/items/storage/large_holster.dm +++ b/code/game/objects/items/storage/large_holster.dm @@ -187,7 +187,7 @@ /obj/item/storage/large_holster/fuelpack name = "\improper Broiler-T flexible refueling system" - desc = "A specialized back harness that carries the Broiler-T flexible refueling system. Designed by and for USCM Pyrotechnicians." + desc = "Reinforced backpack tank complex for the M240E1 Incinerator, used by some USCMC units making more aggressive use of the M240 Incinerator." icon = 'icons/obj/items/clothing/backpacks.dmi' icon_state = "flamethrower_broiler" flags_atom = FPRINT|CONDUCT @@ -263,7 +263,7 @@ var/obj/item/weapon/gun/flamer/M240T/flamer = user.get_active_hand() if(!istype(flamer)) - to_chat(user, "You must be holding the M240-T incinerator unit to use [src]") + to_chat(user, "You must be holding the M240E1 incinerator unit to use [src]") return if(!active_fuel) @@ -337,7 +337,7 @@ /obj/item/storage/large_holster/fuelpack/get_examine_text(mob/user) . = ..() if(contents.len) - . += "It is storing a M240-T incinerator unit." + . += "It is storing a M240E1 incinerator unit." if (get_dist(user, src) <= 1) if(fuel) . += "The [fuel.caliber] currently contains: [round(fuel.get_ammo_percent())]% fuel." diff --git a/code/game/objects/items/storage/pouch.dm b/code/game/objects/items/storage/pouch.dm index 36149138a6..b9a40fe38e 100644 --- a/code/game/objects/items/storage/pouch.dm +++ b/code/game/objects/items/storage/pouch.dm @@ -80,7 +80,7 @@ /obj/item/storage/pouch/flamertank name = "fuel tank strap pouch" - desc = "Two ring straps to loop around M240-pattern napalm tanks. Handle with care." + desc = "Two ring straps to loop around M240-pattern napthal tanks. Handle with care." storage_slots = 2 icon_state = "fueltank_pouch" storage_flags = STORAGE_FLAGS_POUCH diff --git a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm index b9486e4f09..9d653987c3 100644 --- a/code/game/objects/structures/crates_lockers/largecrate_supplies.dm +++ b/code/game/objects/structures/crates_lockers/largecrate_supplies.dm @@ -126,8 +126,8 @@ supplies = list(/obj/item/weapon/gun/revolver/m44 = 6, /obj/item/weapon/gun/pistol/m4a3 = 12) /obj/structure/largecrate/supply/weapons/flamers - name = "\improper M240A1 incinerator weapons chest (x4)" - desc = "A weapons chest containing four M240A1 incinerator units." + name = "\improper M240 incinerator weapons chest (x4)" + desc = "A weapons chest containing four M240 incinerator units." supplies = list(/obj/item/weapon/gun/flamer = 4) /obj/structure/largecrate/supply/weapons/hpr diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index 7184827fda..b3f2225459 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -141,7 +141,7 @@ //------------ /obj/item/storage/box/guncase/flamer name = "\improper M240 incinerator case" - desc = "A gun case containing the M240A1 incinerator unit. It does come loaded, but you'll still have to find extra tanks as you go." + desc = "A gun case containing the M240 incinerator unit, underbarrel extinguisher, and two spare tanks." storage_slots = 4 can_hold = list(/obj/item/weapon/gun/flamer, /obj/item/ammo_magazine/flamer_tank, /obj/item/attachable/attached_gun/extinguisher) @@ -152,6 +152,7 @@ new /obj/item/attachable/attached_gun/extinguisher(src) /obj/item/storage/box/guncase/flamer/special + desc = "A gun case containing the M240 incinerator unit, underbarrel extinguisher, and spare tank." storage_slots = 3 /obj/item/storage/box/guncase/flamer/special/fill_preset_inventory() diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 4f0daf2a2b..3ed9ecfcd7 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -3092,8 +3092,7 @@ Defined in conflicts.dm of the #defines folder. /obj/item/attachable/attached_gun/flamer_nozzle name = "XM-VESG-1 flamer nozzle" - desc = "A special nozzle designed to alter flamethrowers to be used in a more offense orientated manner. As the inside of the nozzle is coated in a special gel and resin substance that takes the fuel that passes through and hardens it. Upon exiting the barrel, a cluster of burning gel is projected instead of a stream of burning naphtha." - desc_lore = "The Experimental Volatile-Exothermic-Sphere-Generator clip-on nozzle attachment for the M240A1 incinerator unit was specifically designed to allow marines to launch fireballs into enemy foxholes and bunkers. Despite the gel and resin coating, the flaming ball of naptha tears apart due the drag caused by launching it through the air, leading marines to use the attachment as a makeshift firework launcher during shore leave." + desc = "The Experimental Volatile Exothermic Sphere Generator is a replacement nozzle attachment which allows for the firing of semi-solidified napthal balls instead of a continuous stream." icon_state = "flamer_nozzle" attach_icon = "flamer_nozzle_a_1" w_class = SIZE_MEDIUM diff --git a/code/modules/projectiles/guns/flamer/flamer.dm b/code/modules/projectiles/guns/flamer/flamer.dm index 756a590704..ffd7084a3e 100644 --- a/code/modules/projectiles/guns/flamer/flamer.dm +++ b/code/modules/projectiles/guns/flamer/flamer.dm @@ -4,8 +4,8 @@ //FLAMETHROWER /obj/item/weapon/gun/flamer - name = "\improper M240A1 incinerator unit" - desc = "M240A1 incinerator unit has proven to be one of the most effective weapons at clearing out soft-targets. This is a weapon to be feared and respected as it is quite deadly." + name = "\improper M240 incinerator unit" + desc = "The M240 incinerator is a carbine-length flamethrower. It is fed by a highly pressurized ultra-thick napthal tank. The initial stream is more effective than the ground tiles.\nUnique-Action to toggle the pilot light." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m240" item_state = "m240" @@ -260,8 +260,8 @@ current_mag = /obj/item/ammo_magazine/flamer_tank /obj/item/weapon/gun/flamer/M240T - name = "\improper M240-T incinerator unit" - desc = "An improved version of the M240A1 incinerator unit, the M240-T model is capable of dispersing a larger variety of fuel types." + name = "\improper M240E1 incinerator unit" + desc = "Tmproved version of the M240 incinerator unit, the M240E1 enhancement is capable of dispersing a larger variety of fuel types." icon_state = "m240t" item_state = "m240t" unacidable = TRUE @@ -372,8 +372,8 @@ return FALSE /obj/item/weapon/gun/flamer/M240T/auto // With NEW advances in science, we've learned how to drain a pyro's tank in 6 seconds, or your money back! - name = "\improper M240-T2 incinerator unit" - desc = "A prototyped model of the M240-T incinerator unit, it was discontinued after its automatic mode was deemed too expensive to deploy in the field." + name = "\improper XM240E1 incinerator unit" + desc = "A prototyped model of the M240E1 incinerator unit, it was discontinued after its automatic mode was deemed too expensive to deploy in the field." start_semiauto = FALSE start_automatic = TRUE diff --git a/code/modules/projectiles/magazines/flamer.dm b/code/modules/projectiles/magazines/flamer.dm index 787a058564..bfd88d51fd 100644 --- a/code/modules/projectiles/magazines/flamer.dm +++ b/code/modules/projectiles/magazines/flamer.dm @@ -4,7 +4,7 @@ /obj/item/ammo_magazine/flamer_tank name = "incinerator tank" - desc = "A fuel tank used to store fuel for use in the M240 incinerator unit. Handle with care." + desc = "A fuel tank used to store the M240 incinerator unit's UT-Napthal. Handle with care." icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' icon_state = "flametank_custom" item_state = "flametank" @@ -147,7 +147,7 @@ /obj/item/ammo_magazine/flamer_tank/EX name = "incinerator tank (EX)" - desc = "A fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240-T incinerator unit. Handle with care." + desc = "A fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240E1 incinerator unit. Handle with care." caliber = "Napalm EX" flamer_chem = "napalmex" @@ -185,7 +185,7 @@ // Pyro regular flamer tank just bigger than the base flamer tank. /obj/item/ammo_magazine/flamer_tank/large name = "large incinerator tank" - desc = "A large fuel tank used to store fuel for use in the M240-T incinerator unit. Handle with care." + desc = "A large fuel tank used to store fuel for use in the M240E1 incinerator unit. Handle with care." icon_state = "flametank_large_custom" item_state = "flametank_large" max_rounds = 250 @@ -202,8 +202,8 @@ // This is the green flamer fuel for the pyro. /obj/item/ammo_magazine/flamer_tank/large/B - name = "large incinerator tank (B)" - desc = "A large fuel tank of Ultra Thick Napthal Fuel type B, a special variant of napalm that is easily extinguished, but disperses over a wide area while burning slowly. The composition reacts with inorganic materials to break them down, causing severe damage. For use in the M240-T incinerator unit. Handle with care." + name = "large incinerator tank (Grn)" + desc = "A large tank of Chemically Reactive Antistructure, M240E1 compatible. Reacts aggressively with inorganic compounds, for use against protected structures or protected personnel. Easier to extinguish, and thermal effect is lessened." caliber = "Napalm B" flamer_chem = "napalmb" @@ -212,7 +212,7 @@ // This is the blue flamer fuel for the pyro. /obj/item/ammo_magazine/flamer_tank/large/X name = "large incinerator tank (X)" - desc = "A large fuel tank of Ultra Thick Napthal Fuel type X, a sticky combustible liquid chemical that burns extremely hot, for use in the M240-T incinerator unit. Handle with care." + desc = "A large tank of U-T Napthal-X, M240E1 compatible. Intended to cause maximum thermal damage to hit targets." caliber = "Napalm X" flamer_chem = "napalmx" @@ -220,7 +220,7 @@ /obj/item/ammo_magazine/flamer_tank/large/EX name = "large incinerator tank (EX)" - desc = "A large fuel tank of Ultra Thick Napthal Fuel type EX, a sticky combustible liquid chemical that burns so hot it melts straight through flame-resistant material, for use in the M240-T incinerator unit. Handle with care." + desc = "A large tank of U-T Napthal-EX, M240E1 compatible. Formulated for maximum temperature and capable of reacting with nearly any substance." caliber = "Napalm EX" flamer_chem = "napalmex" @@ -229,7 +229,7 @@ //Custom pyro tanks /obj/item/ammo_magazine/flamer_tank/custom/large name = "large custom incinerator tank" - desc = "A large fuel tank for use in the M240-T incinerator unit. This one has been modified with a pressure regulator and a large internal propellant tank. Must be manually attached." + desc = "A large fuel tank for use in the M240E1 incinerator unit. This one has been modified with a pressure regulator and a large internal propellant tank. Must be manually attached." gun_type = /obj/item/weapon/gun/flamer/M240T max_rounds = 250 From 8131aa6ea88940969dc570c3c3e4c9d125648eff Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 6 Jun 2024 15:31:30 -0500 Subject: [PATCH 09/10] gun 2 --- code/datums/ammo/bullet/lever_action.dm | 2 +- code/datums/supply_packs/ammo.dm | 4 ++-- code/datums/supply_packs/weapons.dm | 4 ++-- .../machinery/vending/vendor_types/requisitions.dm | 2 +- .../vending/vendor_types/squad_prep/squad_leader.dm | 2 +- code/game/objects/items/storage/belt.dm | 4 ++-- code/modules/cm_marines/equipment/guncases.dm | 4 ++-- code/modules/projectiles/gun_attachables.dm | 4 ++-- code/modules/projectiles/guns/lever_action.dm | 7 +++---- code/modules/projectiles/guns/specialist/sniper.dm | 4 ++-- code/modules/projectiles/magazines/lever_action.dm | 10 +++++----- 11 files changed, 23 insertions(+), 24 deletions(-) diff --git a/code/datums/ammo/bullet/lever_action.dm b/code/datums/ammo/bullet/lever_action.dm index 2770231b68..c844353ca0 100644 --- a/code/datums/ammo/bullet/lever_action.dm +++ b/code/datums/ammo/bullet/lever_action.dm @@ -50,7 +50,7 @@ handful_state = "marksman_lever_action_bullet" /datum/ammo/bullet/lever_action/xm88 - name = ".458 SOCOM round" + name = "smart heavy rifle bullet" damage = 80 penetration = ARMOR_PENETRATION_TIER_2 diff --git a/code/datums/supply_packs/ammo.dm b/code/datums/supply_packs/ammo.dm index 164511c25c..f3c55a8f22 100644 --- a/code/datums/supply_packs/ammo.dm +++ b/code/datums/supply_packs/ammo.dm @@ -37,11 +37,11 @@ group = "Ammo" /datum/supply_packs/ammo_rounds_box_xm88 - name = ".458 bullets box crate (x300 rounds)" + name = "smart anti-materiel bullets box crate (x300 rounds)" contains = list(/obj/item/ammo_box/magazine/lever_action/xm88) cost = 40 containertype = /obj/structure/closet/crate/ammo - containername = "\improper .458 bullets crate" + containername = "\improper smart anti-materiel bullets crate" group = "Ammo" //------------------------Magazine Boxes crates---------------- diff --git a/code/datums/supply_packs/weapons.dm b/code/datums/supply_packs/weapons.dm index 927db853e9..9a3daba2ab 100644 --- a/code/datums/supply_packs/weapons.dm +++ b/code/datums/supply_packs/weapons.dm @@ -114,10 +114,10 @@ /obj/item/storage/box/guncase/xm88, /obj/item/storage/box/guncase/xm88, ) - name = "XM88 Heavy Rifle crate (XM88 x2)" + name = "XM88A Heavy Rifle crate (XM88A x2)" cost = 40 containertype = /obj/structure/closet/crate/weapon - containername = "\improper XM88 Heavy Rifle crate" + containername = "\improper XM88A Heavy Rifle crate" group = "Weapons" /* Uncomment me if it's decided to let the m707 be purchasable through req diff --git a/code/game/machinery/vending/vendor_types/requisitions.dm b/code/game/machinery/vending/vendor_types/requisitions.dm index 3591a7caec..398555ac71 100644 --- a/code/game/machinery/vending/vendor_types/requisitions.dm +++ b/code/game/machinery/vending/vendor_types/requisitions.dm @@ -39,7 +39,7 @@ list("VP78 Pistol", round(scale * 4), /obj/item/storage/box/guncase/vp78, VENDOR_ITEM_REGULAR), list("SU-6 Smart Pistol", round(scale * 3), /obj/item/storage/box/guncase/smartpistol, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", round(scale * 2), /obj/item/storage/box/guncase/mou53, VENDOR_ITEM_REGULAR), - list("XM88 Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR), + list("XM88A Heavy Rifle", round(scale * 3), /obj/item/storage/box/guncase/xm88, VENDOR_ITEM_REGULAR), list("M41AE2 Heavy Pulse Rifle", round(scale * 2.5), /obj/item/storage/box/guncase/lmg, VENDOR_ITEM_REGULAR), list("M41A Pulse Rifle MK1", round(scale * 3), /obj/item/storage/box/guncase/m41aMK1, VENDOR_ITEM_REGULAR), list("M56D Heavy Machine Gun", round(scale * 2), /obj/item/storage/box/guncase/m56d, VENDOR_ITEM_REGULAR), diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm index 81c1941c34..227d6c64ba 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_leader.dm @@ -12,7 +12,7 @@ GLOBAL_LIST_INIT(cm_vending_gear_leader, list( list("M56D Heavy Machine Gun", 0, /obj/item/storage/box/guncase/m56d, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("M79 Grenade Launcher", 0, /obj/item/storage/box/guncase/m79, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("MOU-53 Shotgun", 0, /obj/item/storage/box/guncase/mou53, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), - list("XM88 Heavy Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), + list("XM88A Heavy Rifle", 0, /obj/item/storage/box/guncase/xm88, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("Basic Engineering Supplies", 0, /obj/item/storage/box/kit/engineering_supply_kit, MARINE_CAN_BUY_KIT, VENDOR_ITEM_REGULAR), list("ARMORS", 0, null, null, null), diff --git a/code/game/objects/items/storage/belt.dm b/code/game/objects/items/storage/belt.dm index 693acd61ef..8ccfc15b9a 100644 --- a/code/game/objects/items/storage/belt.dm +++ b/code/game/objects/items/storage/belt.dm @@ -813,8 +813,8 @@ return ..() /obj/item/storage/belt/shotgun/xm88 - name = "\improper M300 pattern .458 SOCOM loading rig" - desc = "An ammunition belt designed to hold the large .458 SOCOM caliber bullets for the XM88 heavy rifle." + name = "\improper M300 pattern XM88A loading rig" + desc = "An ammunition belt designed to hold the massive 10x38mm combustible case bullets for the XM88A heavy rifle." icon_state = "boomslang-belt" item_state = "marinebelt" w_class = SIZE_LARGE diff --git a/code/modules/cm_marines/equipment/guncases.dm b/code/modules/cm_marines/equipment/guncases.dm index b3f2225459..843a37afbc 100644 --- a/code/modules/cm_marines/equipment/guncases.dm +++ b/code/modules/cm_marines/equipment/guncases.dm @@ -125,8 +125,8 @@ new /obj/item/storage/belt/gun/m44/lever_action/attach_holster(src) /obj/item/storage/box/guncase/xm88 - name = "\improper XM88 heavy rifle case" - desc = "A gun case containing the XM88 Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle." + name = "\improper XM88A heavy rifle case" + desc = "A gun case containing the XM88A Heavy Rifle, a prototype weapon designed for use against heavily armored infantry targets and light vehicles. Contains an ammunition belt, two boxes of ammunition, the XS-9 Targeting Relay attachment, and the stock for the rifle." storage_slots = 6 can_hold = list(/obj/item/weapon/gun/lever_action/xm88, /obj/item/attachable/stock/xm88, /obj/item/attachable/scope/mini/xm88, /obj/item/ammo_magazine/lever_action/xm88, /obj/item/storage/belt/shotgun/xm88) diff --git a/code/modules/projectiles/gun_attachables.dm b/code/modules/projectiles/gun_attachables.dm index 3ed9ecfcd7..294c6b01cd 100644 --- a/code/modules/projectiles/gun_attachables.dm +++ b/code/modules/projectiles/gun_attachables.dm @@ -1785,8 +1785,8 @@ Defined in conflicts.dm of the #defines folder. scatter_unwielded_mod = SCATTER_AMOUNT_TIER_4 /obj/item/attachable/stock/xm88 - name = "\improper XM88 padded stock" - desc = "A specially made compound polymer stock reinforced with aluminum rods and thick rubber padding to shield the user from recoil. Fitted specifically for the XM88 Heavy Rifle." + name = "\improper XM88A padded stock" + desc = "A specially made compound polymer stock reinforced with aluminum rods and thick rubber padding to shield the user from recoil. Fitted specifically for the XM88A Heavy Rifle." icon_state = "boomslang-stock" wield_delay_mod = WIELD_DELAY_NORMAL hud_offset_mod = 6 diff --git a/code/modules/projectiles/guns/lever_action.dm b/code/modules/projectiles/guns/lever_action.dm index d93796fbb1..1ff0873635 100644 --- a/code/modules/projectiles/guns/lever_action.dm +++ b/code/modules/projectiles/guns/lever_action.dm @@ -341,7 +341,7 @@ their unique feature is that a direct hit will buff your damage and firerate /obj/item/weapon/gun/lever_action/r4t/set_gun_attachment_offsets() attachable_offset = list("muzzle_x" = 33, "muzzle_y" = 19, "rail_x" = 11, "rail_y" = 21, "under_x" = 24, "under_y" = 16, "stock_x" = 15, "stock_y" = 14) -//===================THE XM88===================\\ +//===================THE XM88A===================\\ #define FLOATING_PENETRATION_TIER_0 0 #define FLOATING_PENETRATION_TIER_1 1 @@ -350,9 +350,8 @@ their unique feature is that a direct hit will buff your damage and firerate #define FLOATING_PENETRATION_TIER_4 4 /obj/item/weapon/gun/lever_action/xm88 - name = "\improper XM88 heavy rifle" - desc = "An experimental man-portable anti-material rifle chambered in .458 SOCOM. It must be manually chambered for every shot.\nIt has a special property - when you obtain multiple direct hits in a row, its armor penetration and damage will increase." - desc_lore = "Originally developed by ARMAT Battlefield Systems for the government of the state of Greater Brazil for use in the Favela Wars (2161 - Ongoing) against mechanized infantry. The platform features an onboard computerized targeting system, sensor array, and an electronic autoloader; these features work in tandem to reduce and render inert armor on the users target with successive hits. The Almayer was issued a small amount of XM88s while preparing for Operation Swamp Hopper with the USS Nan-Shan." + name = "\improper XM88A heavy rifle" + desc = "Experimental AMR from ARMAT chambered in 10x38mm combustible case smart anti-materiel rounds, must be manually chambered for every shot. \nOnboard computer modifies targeting to improve ballistic impact by analyzing feedback from successive hits." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' // overriden with camos anyways icon_state = "boomslang" item_state = "boomslang" diff --git a/code/modules/projectiles/guns/specialist/sniper.dm b/code/modules/projectiles/guns/specialist/sniper.dm index e5728c5307..47f5ececab 100644 --- a/code/modules/projectiles/guns/specialist/sniper.dm +++ b/code/modules/projectiles/guns/specialist/sniper.dm @@ -284,8 +284,8 @@ // end of actions sniper spe can take. /obj/item/weapon/gun/rifle/sniper/M42A - name = "\improper M42A scoped rifle" - desc = "A heavy sniper rifle manufactured by Armat Systems. It has a scope system and fires armor penetrating rounds out of a 15-round magazine.\n'Peace Through Superior Firepower'" + name = "\improper M42A scope rifle" + desc = "A scoped 10x28mm semi automatic rifle. The ARMAT M42A can file a complaint up to 3,800 meters, and feeds from 15rnd magazines. Comes with a multiple magnification scope, but is painfully useless up close." icon = 'icons/obj/items/weapons/guns/guns_by_faction/uscm.dmi' icon_state = "m42a" item_state = "m42a" diff --git a/code/modules/projectiles/magazines/lever_action.dm b/code/modules/projectiles/magazines/lever_action.dm index 2eb2d25a28..0a19538fb1 100644 --- a/code/modules/projectiles/magazines/lever_action.dm +++ b/code/modules/projectiles/magazines/lever_action.dm @@ -46,8 +46,8 @@ Similar to shotguns.dm but not exactly. handful_state = "tracking_lever_action_bullet" /obj/item/ammo_magazine/lever_action/xm88 - name = "box of .458 SOCOM rounds" - desc = "A box filled with handfuls of .458 SOCOM rounds, designed for use with the XM88 heavy rifle." + name = "box of smart anti-materiel rounds" + desc = "A box filled with handfuls of 10x38mm combustible case rounds, designed for use with the XM88A heavy rifle." icon = 'icons/obj/items/weapons/guns/ammo_by_faction/uscm.dmi' icon_state = "458-box" item_state = "458-box" @@ -67,7 +67,7 @@ Similar to shotguns.dm but not exactly. chamber_closed = 0 /obj/item/ammo_magazine/internal/lever_action/xm88 - name = "\improper XM88 heavy rifle tube" + name = "\improper XM88A heavy rifle tube" desc = "An internal magazine. It is not supposed to be seen or removed." default_ammo = /datum/ammo/bullet/lever_action/xm88 caliber = ".458" @@ -116,8 +116,8 @@ Handfuls of lever_action rounds. For spawning directly on mobs in roundstart, ER handful_state = "marksman_lever_action_bullet" /obj/item/ammo_magazine/handful/lever_action/xm88 - name = "handful of .458 SOCOM rounds (.458)" - desc = "A handful of .458 SOCOM rounds, chambered for the XM88 heavy rifle." + name = "handful of smart anti-materiel rounds (10x38mm)" + desc = "A handful of combustible case 10x38mm rounds, chambered for the XM88A heavy rifle." caliber = ".458" icon_state = "marksman_lever_action_bullet_9" default_ammo = /datum/ammo/bullet/lever_action/xm88 From bcc56ce5bb63b0ac297e4f96f27f470f727786bf Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 01:33:14 -0500 Subject: [PATCH 10/10] completion --- code/datums/fluff_emails.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index b57431cca9..f7083541dd 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,6 +3,7 @@ var/title //email title var/entry_text //email content + //emails for the Almayer computers /datum/fluff_email/almayer