From de6c369d04585df3c94c43a96643acfa82858d4f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sun, 2 Jun 2024 03:35:25 -0500 Subject: [PATCH 01/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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/12] 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 b6ff33cc7fa313c1a49b5f1751266048bcd3273f Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:22:38 -0500 Subject: [PATCH 11/12] moar boot --- code/game/objects/prop.dm | 36 ++++++++++++++++++++++-------------- 1 file changed, 22 insertions(+), 14 deletions(-) diff --git a/code/game/objects/prop.dm b/code/game/objects/prop.dm index ac94e8ab03..d27f683b66 100644 --- a/code/game/objects/prop.dm +++ b/code/game/objects/prop.dm @@ -272,22 +272,30 @@ name = "generic Boots! magazine" desc = "The only official USCM magazine!" +/obj/item/prop/magazine/boots/n054 + name = "Boots!: Issue No.54, ARMAT Strikes Back" + desc = "This edition's about the old lawsuit over the M41A being billed as being self-cleaning, supposedly. Specifically, ARMAT's response to the allegations." + +/obj/item/prop/magazine/boots/n055 + name = "Boots!: Issue No.55, Veteran Pilot Tips" + desc = "The subtitle reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.' Flipping through it quickly, most are baloney. The rest of the issue isn't that interesting either, except for a neat M3 Armor trick for improved comfort." + +/obj/item/prop/magazine/boots/n056 + name = "Boots!: Issue No.56, Smart Smartgunning" + desc = "This issue is somewhat infamous. Unfortunately, it's one of the reprints, which have had the offending 'Pancake Scandal' pages removed and replaced with an advisory for smartgun care." + +/obj/item/prop/magazine/boots/n067 + name = "Boots!: Issue No.67, Make The Best Of It" + desc= "Number 57's one of the issues where the Marine Corps really laid it on a little too thick. It's completely filled with advice on how to make the best of situations on the Frontier." + /obj/item/prop/magazine/boots/n117 - name = "Boots!: Issue No.117" - desc = "The only official USCM magazine, the headline reads 'STOP CANNING' the short paragraph further explains the dangers of marines throwing CN-20 Nerve gas into bathrooms as a prank." + name = "Boots!: Issue No.117, STOP CANNING" + desc = "A rapidly printed issue in the wake of the canning incident, with several pages dedicated to the dangers of marines throwing CN-20 Nerve Gas into bathrooms as a prank. It lists some other alternatives, which are all for wimps." /obj/item/prop/magazine/boots/n150 - name = "Boots!: Issue No.150" - desc = "The only official USCM magazine, the headline reads 'UPP Rations, The truth.' the short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks." + name = "Boots!: Issue No.150, UPP Rations, The Truth" + desc = "The short paragraph further explains UPP field rations aren't standardized and are produced at a local level. Because of this, captured and confiscated UPP rations have included some odd choices such as duck liver, century eggs, lutefisk, pickled pig snout, canned tripe, and dehydrated candied radish snacks." /obj/item/prop/magazine/boots/n160 - name = "Boots!: Issue No.160" - desc = "The only official USCM magazine, the headline reads 'Corporate Liaison 'emotionally exhausted' from screwing so many people over.'" - -/obj/item/prop/magazine/boots/n054 - name = "Boots!: Issue No.54" - desc = "The only official USCM magazine, the headline reads 'ARMAT strikes back against litigants in M41A-MK2 self cleaning case'" - -/obj/item/prop/magazine/boots/n055 - name = "Boots!: Issue No.55" - desc = "The only official USCM magazine, the headline reads 'TEN tips to keep your UD4 cockpit both safer and more relaxing.'" + name = "Boots!: Issue No.160, Corporate Liason, Ten Years On" + desc = "Featuring an interview with a Weyland Yutani corporate liason, after ten years with a marine unit. An insert features a redeemable survey card for... a fifty dollar MCX gift card." From 04d198851fed5177160d8c4e4a7958ddc5aa85d9 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 02:24:41 -0500 Subject: [PATCH 12/12] weird bug --- 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..906473056e 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