From de6c369d04585df3c94c43a96643acfa82858d4f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:35:25 -0500 Subject: [PATCH 01/19] 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 7b012432901..f46373c84ef 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/19] 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 f7083541dd5..8a7ce922e2a 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/19] 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 8a7ce922e2a..06b76ae6df3 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/19] 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 06b76ae6df3..b57431cca97 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/19] 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 0148349f47f..3461b9049e3 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/19] 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 b57431cca97..a71ad083bb7 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/19] 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 a71ad083bb7..b57431cca97 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 115e852fbb1233e9e322c198b926cc46163443ad Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 14:55:32 -0500 Subject: [PATCH 08/19] done --- code/modules/defenses/sentry_computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index 906473056e9..d7afd52fc6c 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -2,8 +2,8 @@ * Sentry gun computer which links to defensive structures. */ /obj/item/device/sentry_computer - name = "\improper Sentry Gun Network Laptop" - desc = "A laptop loaded with sentry control software." + name = "\improper AN/PSQ-55 Remote Weapons Console" + desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries." icon = 'icons/obj/structures/props/sentrycomp.dmi' icon_state = "sentrycomp_cl" w_class = SIZE_SMALL From f0b4d03a55c91a7f0cd30344f68c29a4e7cd48cd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 19 Jun 2024 20:13:03 -0500 Subject: [PATCH 09/19] fucking fix you piece of shit --- 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 b57431cca97..a71ad083bb7 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 017baf34ea76b0c17566e638a0087d9e7d6ca0bd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 00:27:34 -0500 Subject: [PATCH 10/19] undoes a fuckup with the master --- code/datums/fluff_emails.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index a71ad083bb7..f7083541dd5 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,9 +3,11 @@ var/title //email title var/entry_text //email content + //emails for the Almayer computers /datum/fluff_email/almayer + /datum/fluff_email/almayer/iwantout title = "RE: I want out." entry_text = {" From 9698a01e39d6b46d868677db91dc74f3787e220d Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:25:08 -0500 Subject: [PATCH 11/19] fixes issue --- code/modules/defenses/sentry_computer.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index d7afd52fc6c..192679b0072 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -2,8 +2,8 @@ * Sentry gun computer which links to defensive structures. */ /obj/item/device/sentry_computer - name = "\improper AN/PSQ-55 Remote Weapons Console" - desc = "A TREE hardened laptop equipped with additional C2 software for the UA-571 family of robot sentries." + name = "\improper Sentry Gun Network Laptop" + desc = "A laptop loaded with sentry control software. icon = 'icons/obj/structures/props/sentrycomp.dmi' icon_state = "sentrycomp_cl" w_class = SIZE_SMALL From c040c590e00d97e0131ae7625654679f262bc3c6 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Mon, 24 Jun 2024 19:08:33 -0500 Subject: [PATCH 12/19] how tf did this get changed --- code/modules/defenses/sentry_computer.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index 192679b0072..906473056e9 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -3,7 +3,7 @@ */ /obj/item/device/sentry_computer name = "\improper Sentry Gun Network Laptop" - desc = "A laptop loaded with sentry control software. + desc = "A laptop loaded with sentry control software." icon = 'icons/obj/structures/props/sentrycomp.dmi' icon_state = "sentrycomp_cl" w_class = SIZE_SMALL From d681f97e20f0200f2d15bf2ca66c59a134d64027 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Tue, 13 Aug 2024 01:40:10 -0500 Subject: [PATCH 13/19] flask draftoid --- code/game/objects/items/reagent_containers/food/drinks.dm | 8 +++++++- code/modules/client/preferences_gear.dm | 4 ++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm index 9f88990e535..c97cea7d9e3 100644 --- a/code/game/objects/items/reagent_containers/food/drinks.dm +++ b/code/game/objects/items/reagent_containers/food/drinks.dm @@ -353,7 +353,7 @@ /obj/item/reagent_container/food/drinks/flask/canteen name = "canteen" - desc = "You take a sip from your trusty USCM canteen..." + desc = "Metal ruggedized canteen, with a reasonable capacity of water. Or, y'know, other liquids." icon_state = "canteen" volume = 60 center_of_mass = "x=17;y=8" @@ -362,6 +362,12 @@ . = ..() reagents.add_reagent("water", 60) +/obj/item/reagent_container/food/drinks/flask/canteen/empty + +/obj/item/reagent_container/food/drinks/flask/canteen/empty/Initialize() + . = ..() + reagents.add_reagent(null) + /obj/item/reagent_container/food/drinks/flask/detflask name = "brown leather flask" desc = "A flask with a leather band around the sides, often seen filled with whiskey and carried by rugged, gritty detectives." diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 868d33a3322..956d54da3c8 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -821,6 +821,10 @@ var/global/list/gear_datums_by_name = list() display_name = "Canteen" path = /obj/item/reagent_container/food/drinks/flask/canteen +/datum/gear/flask/empty_canteen + display_name = "Empty canteen" + path = /obj/item/reagent_container/food/drinks/flask/canteen/empty + /datum/gear/flask/leather display_name = "Leather flask" path = /obj/item/reagent_container/food/drinks/flask/detflask From 71341c85501f28b2651ba998816ca25074449e9e Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Tue, 13 Aug 2024 02:10:13 -0500 Subject: [PATCH 14/19] mre obliteration --- code/modules/cm_marines/equipment/gear.dm | 47 +++++++++++------------ 1 file changed, 23 insertions(+), 24 deletions(-) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 9a943c70726..374fbe98c06 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -198,8 +198,8 @@ /obj/item/reagent_container/food/snacks/protein_pack - name = "stale USCM protein bar" - desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute." + name = "chocolate coated protein bar" + desc = "Sort of chocolate flavored nutrient bar that theoretically provides all of the resources the body needs for a few hours of combat. Excessively sweetened with long-stability sweeteners." icon_state = "yummers" filling_color = "#ED1169" w_class = SIZE_TINY @@ -212,13 +212,12 @@ /obj/item/reagent_container/food/snacks/mre_pack name = "\improper generic MRE pack" - //trash = /obj/item/trash/USCMtray - trash = null + trash = /obj/item/trash/USCMtray w_class = SIZE_SMALL /obj/item/reagent_container/food/snacks/mre_pack/meal1 - name = "\improper USCM Prepared Meal (cornbread)" - desc = "A tray of standard USCM food. Stale cornbread, tomato paste and some green goop fill this tray." + name = "\improper Prepared Meal (cornbread)" + desc = "A tray of machine prepared food. Consists of what is supposedly cornbread, slightly bitter tomato paste, and some green... sauce?" icon_state = "MREa" filling_color = "#ED1169" @@ -228,8 +227,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal2 - name = "\improper USCM Prepared Meal (pork)" - desc = "A tray of standard USCM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray." + name = "\improper Prepared Meal (pork)" + desc = "A tray of machine prepared food. Consists of well prepared pork, oversalted mashed potatoes, and weirdly watery corn." icon_state = "MREb" /obj/item/reagent_container/food/snacks/mre_pack/meal2/Initialize() @@ -238,8 +237,8 @@ bitesize = 2 /obj/item/reagent_container/food/snacks/mre_pack/meal3 - name = "\improper USCM Prepared Meal (pasta)" - desc = "A tray of standard USCM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray." + name = "\improper Prepared Meal (pasta)" + desc = "A tray of machine prepared food. Consists of over-soft spaghetti, flavorless french fries, and poorly reflavored carrots." icon_state = "MREc" /obj/item/reagent_container/food/snacks/mre_pack/meal3/Initialize() @@ -248,8 +247,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal4 - name = "\improper USCM Prepared Meal (pizza)" - desc = "A tray of standard USCM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass." + name = "\improper Prepared Meal (pizza)" + desc = "A tray of machine prepared food. Consists of a square, stale-ish 'pizza' and some limp green beans, combined with some slightly burnt scrambled eggs." icon_state = "MREd" /obj/item/reagent_container/food/snacks/mre_pack/meal4/Initialize() @@ -258,8 +257,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/meal5 - name = "\improper USCM Prepared Meal (chicken)" - desc = "A tray of standard USCM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray." + name = "\improper Prepared Meal (chicken)" + desc = "A tray of machine prepared food. Consists of moist chicken, warm rice and some bitter broccoli that's seen better days." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/meal5/Initialize() @@ -268,8 +267,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal6 - name = "\improper USCM Prepared Meal (tofu)" - desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat." + name = "\improper Prepared Meal (tofu)" + desc = "A tray of machine prepared food. Consists of weirdly grainy tofu, some spicy beans, and a sour, once-zingy sauce." icon_state = "MREf" /obj/item/reagent_container/food/snacks/mre_pack/meal6/Initialize() @@ -278,8 +277,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/xmas1 - name = "\improper USCM M25 'X-MAS' Meal: Sugar Cookies" - desc = "The USCM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines." + name = "\improper Holiday Prepared Meal (sugar cookies)" + desc = "A tray of machine prepared food. The cookies taste... wrong. The milk is alright though. Consists of sugar cookies and milk." icon_state = "mreCookies" black_market_value = 10 @@ -290,8 +289,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas2 - name = "\improper USCM M25 'X-MAS' Meal: Gingerbread Cookies" - desc = "The USCM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit." + name = "\improper Holiday Prepared Meal (gingerbread cookies)" + desc = "Somehow, you feel like there's either too much or too little ginger in each one of these, and never quite a good balance. Consists of a few gingerbread cookies and a packet of frosting." icon_state = "mreGingerbread" black_market_value = 10 @@ -302,8 +301,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas3 - name = "\improper USCM M25 'X-MAS' Meal: Fruitcake" - desc = "The USCM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake." + name = "\improper Holiday Prepared Meal (fruitcake)" + desc = "Battalion has repeatedly assured everyone from private to platoon commander that the rumors of the fruitcake being chewy enough to stop bullets is unfounded. You're not quite sure. Consists of a dense block of pastry filled with dried fruit." icon_state = "mreFruitcake" black_market_value = 10 @@ -314,8 +313,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving - name = "\improper USCM Prepared Meal (turkey)" - desc = "A tray of standard USCM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal." + name = "\improper Prepared Meal (turkey)" + desc = "A tray of machine prepared food. Consists of some overcooked turkey slices, weirdly crunchy mashed potatoes, and slightly underflavored gravy." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving/Initialize() From 6cd3f94625501b1ea7a4196c5f20ccd4dc4d6bdd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 15 Aug 2024 02:36:16 -0500 Subject: [PATCH 15/19] decommits stuff --- .../items/reagent_containers/food/drinks.dm | 8 +----- code/modules/client/preferences_gear.dm | 4 --- code/modules/cm_marines/equipment/gear.dm | 26 +++++++++++++++++-- 3 files changed, 25 insertions(+), 13 deletions(-) diff --git a/code/game/objects/items/reagent_containers/food/drinks.dm b/code/game/objects/items/reagent_containers/food/drinks.dm index c97cea7d9e3..9f88990e535 100644 --- a/code/game/objects/items/reagent_containers/food/drinks.dm +++ b/code/game/objects/items/reagent_containers/food/drinks.dm @@ -353,7 +353,7 @@ /obj/item/reagent_container/food/drinks/flask/canteen name = "canteen" - desc = "Metal ruggedized canteen, with a reasonable capacity of water. Or, y'know, other liquids." + desc = "You take a sip from your trusty USCM canteen..." icon_state = "canteen" volume = 60 center_of_mass = "x=17;y=8" @@ -362,12 +362,6 @@ . = ..() reagents.add_reagent("water", 60) -/obj/item/reagent_container/food/drinks/flask/canteen/empty - -/obj/item/reagent_container/food/drinks/flask/canteen/empty/Initialize() - . = ..() - reagents.add_reagent(null) - /obj/item/reagent_container/food/drinks/flask/detflask name = "brown leather flask" desc = "A flask with a leather band around the sides, often seen filled with whiskey and carried by rugged, gritty detectives." diff --git a/code/modules/client/preferences_gear.dm b/code/modules/client/preferences_gear.dm index 0b7f6adef8f..af1f6a03c9c 100644 --- a/code/modules/client/preferences_gear.dm +++ b/code/modules/client/preferences_gear.dm @@ -821,10 +821,6 @@ var/global/list/gear_datums_by_name = list() display_name = "Canteen" path = /obj/item/reagent_container/food/drinks/flask/canteen -/datum/gear/flask/empty_canteen - display_name = "Empty canteen" - path = /obj/item/reagent_container/food/drinks/flask/canteen/empty - /datum/gear/flask/leather display_name = "Leather flask" path = /obj/item/reagent_container/food/drinks/flask/detflask diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index 374fbe98c06..e4391d2e741 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -198,24 +198,28 @@ /obj/item/reagent_container/food/snacks/protein_pack + name = "stale USCM protein bar" + desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute." name = "chocolate coated protein bar" desc = "Sort of chocolate flavored nutrient bar that theoretically provides all of the resources the body needs for a few hours of combat. Excessively sweetened with long-stability sweeteners." icon_state = "yummers" filling_color = "#ED1169" w_class = SIZE_TINY - /obj/item/reagent_container/food/snacks/protein_pack/Initialize() . = ..() reagents.add_reagent("nutriment", 8) bitesize = 4 - /obj/item/reagent_container/food/snacks/mre_pack name = "\improper generic MRE pack" + //trash = /obj/item/trash/USCMtray + trash = null trash = /obj/item/trash/USCMtray w_class = SIZE_SMALL /obj/item/reagent_container/food/snacks/mre_pack/meal1 + name = "\improper USCM Prepared Meal (cornbread)" + desc = "A tray of standard USCM food. Stale cornbread, tomato paste and some green goop fill this tray." name = "\improper Prepared Meal (cornbread)" desc = "A tray of machine prepared food. Consists of what is supposedly cornbread, slightly bitter tomato paste, and some green... sauce?" icon_state = "MREa" @@ -227,6 +231,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal2 + name = "\improper USCM Prepared Meal (pork)" + desc = "A tray of standard USCM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray." name = "\improper Prepared Meal (pork)" desc = "A tray of machine prepared food. Consists of well prepared pork, oversalted mashed potatoes, and weirdly watery corn." icon_state = "MREb" @@ -237,6 +243,8 @@ bitesize = 2 /obj/item/reagent_container/food/snacks/mre_pack/meal3 + name = "\improper USCM Prepared Meal (pasta)" + desc = "A tray of standard USCM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray." name = "\improper Prepared Meal (pasta)" desc = "A tray of machine prepared food. Consists of over-soft spaghetti, flavorless french fries, and poorly reflavored carrots." icon_state = "MREc" @@ -247,6 +255,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal4 + name = "\improper USCM Prepared Meal (pizza)" + desc = "A tray of standard USCM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass." name = "\improper Prepared Meal (pizza)" desc = "A tray of machine prepared food. Consists of a square, stale-ish 'pizza' and some limp green beans, combined with some slightly burnt scrambled eggs." icon_state = "MREd" @@ -257,6 +267,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/meal5 + name = "\improper USCM Prepared Meal (chicken)" + desc = "A tray of standard USCM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray." name = "\improper Prepared Meal (chicken)" desc = "A tray of machine prepared food. Consists of moist chicken, warm rice and some bitter broccoli that's seen better days." icon_state = "MREe" @@ -267,6 +279,8 @@ bitesize = 3 /obj/item/reagent_container/food/snacks/mre_pack/meal6 + name = "\improper USCM Prepared Meal (tofu)" + desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat." name = "\improper Prepared Meal (tofu)" desc = "A tray of machine prepared food. Consists of weirdly grainy tofu, some spicy beans, and a sour, once-zingy sauce." icon_state = "MREf" @@ -277,6 +291,8 @@ bitesize = 1 /obj/item/reagent_container/food/snacks/mre_pack/xmas1 + name = "\improper USCM M25 'X-MAS' Meal: Sugar Cookies" + desc = "The USCM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines." name = "\improper Holiday Prepared Meal (sugar cookies)" desc = "A tray of machine prepared food. The cookies taste... wrong. The milk is alright though. Consists of sugar cookies and milk." icon_state = "mreCookies" @@ -289,6 +305,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas2 + name = "\improper USCM M25 'X-MAS' Meal: Gingerbread Cookies" + desc = "The USCM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit." name = "\improper Holiday Prepared Meal (gingerbread cookies)" desc = "Somehow, you feel like there's either too much or too little ginger in each one of these, and never quite a good balance. Consists of a few gingerbread cookies and a packet of frosting." icon_state = "mreGingerbread" @@ -301,6 +319,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/xmas3 + name = "\improper USCM M25 'X-MAS' Meal: Fruitcake" + desc = "The USCM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake." name = "\improper Holiday Prepared Meal (fruitcake)" desc = "Battalion has repeatedly assured everyone from private to platoon commander that the rumors of the fruitcake being chewy enough to stop bullets is unfounded. You're not quite sure. Consists of a dense block of pastry filled with dried fruit." icon_state = "mreFruitcake" @@ -313,6 +333,8 @@ bitesize = 8 /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving + name = "\improper USCM Prepared Meal (turkey)" + desc = "A tray of standard USCM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal." name = "\improper Prepared Meal (turkey)" desc = "A tray of machine prepared food. Consists of some overcooked turkey slices, weirdly crunchy mashed potatoes, and slightly underflavored gravy." icon_state = "MREe" From fc4270d1ab3ad6a75818342746f397b04b352363 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 15 Aug 2024 02:53:42 -0500 Subject: [PATCH 16/19] fucking fix you pice of shit --- code/modules/cm_marines/equipment/gear.dm | 25 ++--------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/code/modules/cm_marines/equipment/gear.dm b/code/modules/cm_marines/equipment/gear.dm index e4391d2e741..9a943c70726 100644 --- a/code/modules/cm_marines/equipment/gear.dm +++ b/code/modules/cm_marines/equipment/gear.dm @@ -200,28 +200,25 @@ /obj/item/reagent_container/food/snacks/protein_pack name = "stale USCM protein bar" desc = "The most fake-looking protein bar you have ever laid eyes on, covered in a substitution chocolate. The powder used to make these is a substitute of a substitute of whey substitute." - name = "chocolate coated protein bar" - desc = "Sort of chocolate flavored nutrient bar that theoretically provides all of the resources the body needs for a few hours of combat. Excessively sweetened with long-stability sweeteners." icon_state = "yummers" filling_color = "#ED1169" w_class = SIZE_TINY + /obj/item/reagent_container/food/snacks/protein_pack/Initialize() . = ..() reagents.add_reagent("nutriment", 8) bitesize = 4 + /obj/item/reagent_container/food/snacks/mre_pack name = "\improper generic MRE pack" //trash = /obj/item/trash/USCMtray trash = null - trash = /obj/item/trash/USCMtray w_class = SIZE_SMALL /obj/item/reagent_container/food/snacks/mre_pack/meal1 name = "\improper USCM Prepared Meal (cornbread)" desc = "A tray of standard USCM food. Stale cornbread, tomato paste and some green goop fill this tray." - name = "\improper Prepared Meal (cornbread)" - desc = "A tray of machine prepared food. Consists of what is supposedly cornbread, slightly bitter tomato paste, and some green... sauce?" icon_state = "MREa" filling_color = "#ED1169" @@ -233,8 +230,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/meal2 name = "\improper USCM Prepared Meal (pork)" desc = "A tray of standard USCM food. Partially raw pork, goopy corn and some watery mashed potatoes fill this tray." - name = "\improper Prepared Meal (pork)" - desc = "A tray of machine prepared food. Consists of well prepared pork, oversalted mashed potatoes, and weirdly watery corn." icon_state = "MREb" /obj/item/reagent_container/food/snacks/mre_pack/meal2/Initialize() @@ -245,8 +240,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/meal3 name = "\improper USCM Prepared Meal (pasta)" desc = "A tray of standard USCM food. Overcooked spaghetti, waterlogged carrots and two french fries fill this tray." - name = "\improper Prepared Meal (pasta)" - desc = "A tray of machine prepared food. Consists of over-soft spaghetti, flavorless french fries, and poorly reflavored carrots." icon_state = "MREc" /obj/item/reagent_container/food/snacks/mre_pack/meal3/Initialize() @@ -257,8 +250,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/meal4 name = "\improper USCM Prepared Meal (pizza)" desc = "A tray of standard USCM food. Cold pizza, wet green beans and a shitty egg fill this tray. Get something other than pizza, lardass." - name = "\improper Prepared Meal (pizza)" - desc = "A tray of machine prepared food. Consists of a square, stale-ish 'pizza' and some limp green beans, combined with some slightly burnt scrambled eggs." icon_state = "MREd" /obj/item/reagent_container/food/snacks/mre_pack/meal4/Initialize() @@ -269,8 +260,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/meal5 name = "\improper USCM Prepared Meal (chicken)" desc = "A tray of standard USCM food. Moist chicken, dry rice and a mildly depressed piece of broccoli fill this tray." - name = "\improper Prepared Meal (chicken)" - desc = "A tray of machine prepared food. Consists of moist chicken, warm rice and some bitter broccoli that's seen better days." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/meal5/Initialize() @@ -281,8 +270,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/meal6 name = "\improper USCM Prepared Meal (tofu)" desc = "The USCM doesn't serve tofu you grass sucking hippie. The flag signifies your defeat." - name = "\improper Prepared Meal (tofu)" - desc = "A tray of machine prepared food. Consists of weirdly grainy tofu, some spicy beans, and a sour, once-zingy sauce." icon_state = "MREf" /obj/item/reagent_container/food/snacks/mre_pack/meal6/Initialize() @@ -293,8 +280,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/xmas1 name = "\improper USCM M25 'X-MAS' Meal: Sugar Cookies" desc = "The USCM M25 Sugar Cookies Meal was designed to give marines a feeling of Christmas joy. But to the bemusement of superior officers, the costs-savings measure of simply fabricating protein bars in the shape of cookies with chocolate substitute chips and the replacement of the expected milk with artificially colored water did not go over well with most marines." - name = "\improper Holiday Prepared Meal (sugar cookies)" - desc = "A tray of machine prepared food. The cookies taste... wrong. The milk is alright though. Consists of sugar cookies and milk." icon_state = "mreCookies" black_market_value = 10 @@ -307,8 +292,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/xmas2 name = "\improper USCM M25 'X-MAS' Meal: Gingerbread Cookies" desc = "The USCM M25 Gingerbread Cookies Meal was designed to give marines convenient and cheap access to gingerbread cookies as a replacement for annual gingerbread making classes due to rising expenses and comically low success rates for the Basic Holidays Festivities Course. However, due to cost saving measures, these cookies seldom inspire happiness, nor holiday spirit." - name = "\improper Holiday Prepared Meal (gingerbread cookies)" - desc = "Somehow, you feel like there's either too much or too little ginger in each one of these, and never quite a good balance. Consists of a few gingerbread cookies and a packet of frosting." icon_state = "mreGingerbread" black_market_value = 10 @@ -321,8 +304,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/xmas3 name = "\improper USCM M25 'X-MAS' Meal: Fruitcake" desc = "The USCM M25 Fruitcake Meal was the third meal designed by an officers' committee as part of the M25 Project; this shows through the terrible hardness and tartness of the bread and raisined fruits. It can be logically deduced that the people who vended this option are worse than the Grinch and the Miser combined, along with the people who designed and prepared this fruitcake." - name = "\improper Holiday Prepared Meal (fruitcake)" - desc = "Battalion has repeatedly assured everyone from private to platoon commander that the rumors of the fruitcake being chewy enough to stop bullets is unfounded. You're not quite sure. Consists of a dense block of pastry filled with dried fruit." icon_state = "mreFruitcake" black_market_value = 10 @@ -335,8 +316,6 @@ /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving name = "\improper USCM Prepared Meal (turkey)" desc = "A tray of standard USCM food. A few slices of turkey and some regenerated mashed potatos with a rather viscous gravy on top. A classic, if rather half-hearted, Thanksgiving meal." - name = "\improper Prepared Meal (turkey)" - desc = "A tray of machine prepared food. Consists of some overcooked turkey slices, weirdly crunchy mashed potatoes, and slightly underflavored gravy." icon_state = "MREe" /obj/item/reagent_container/food/snacks/mre_pack/thanksgiving/Initialize() From 61a3dd296e95d747129c211ab690b193f43bc861 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 20 Nov 2024 23:53:19 -0600 Subject: [PATCH 17/19] ok that should be everything --- .../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..ebbf4ac394e 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 Skirmish", "25mm Barrage", "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 Skirmish", "25mm Barrage") /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 Skirmish") 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 Barrage") 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 From 4a539468b3d53f8bd31aec5d54b7606e1735cb8e Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Thu, 21 Nov 2024 00:02:23 -0600 Subject: [PATCH 18/19] small change --- .../admin/game_master/extra_buttons/fire_support_menu.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 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 ebbf4ac394e..33160bb2924 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 @@ -6,7 +6,7 @@ #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", "25mm Skirmish", "25mm Barrage") +#define MISC_ORDNANCE list("Laser", "Minirocket", "Incendiary Minirocket", "Sentry Drop", "25mm Burst", "25mm Barrage") /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("25mm Skirmish") + if("25mm Burst") var/obj/effect/overlay/temp/blinking_laser/target_lase = new(target_turf) var/obj/structure/ship_ammo/heavygun/ammo = new() From b8713bfd2b07fb7bf539449486287dded598a1f9 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Fri, 22 Nov 2024 17:21:27 -0600 Subject: [PATCH 19/19] fix implementation --- .../admin/game_master/extra_buttons/fire_support_menu.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 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 33160bb2924..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", "25mm Skirmish", "25mm Barrage", "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", "25mm Burst", "25mm Barrage") +#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("25mm Burst") + 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("25mm Barrage") + 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()