From de6c369d04585df3c94c43a96643acfa82858d4f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:35:25 -0500 Subject: [PATCH 01/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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/16] 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 115e852fbb1233e9e322c198b926cc46163443ad Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 14:55:32 -0500 Subject: [PATCH 08/16] 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 906473056e..d7afd52fc6 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/16] 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 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 017baf34ea76b0c17566e638a0087d9e7d6ca0bd Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 00:27:34 -0500 Subject: [PATCH 10/16] 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 a71ad083bb..f7083541dd 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/16] 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 d7afd52fc6..192679b007 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/16] 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 192679b007..906473056e 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/16] 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 9f88990e53..c97cea7d9e 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 868d33a332..956d54da3c 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/16] 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 9a943c7072..374fbe98c0 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/16] 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 c97cea7d9e..9f88990e53 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 0b7f6adef8..af1f6a03c9 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 374fbe98c0..e4391d2e74 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/16] 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 e4391d2e74..9a943c7072 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()