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 478de71a9fc28b77c20078e3a6a7fcf67fa93163 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 14:43:33 -0500 Subject: [PATCH 08/12] should be working --- .../vending/vendor_types/squad_prep/squad_prep.dm | 1 + code/modules/defenses/sentry_computer.dm | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm index 42aa2e13b8..1e9a8715a2 100644 --- a/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm +++ b/code/game/machinery/vending/vendor_types/squad_prep/squad_prep.dm @@ -451,6 +451,7 @@ list("Roller Bed", round(scale * 2), /obj/item/roller, VENDOR_ITEM_REGULAR), list("Machete Scabbard (Full)", round(scale * 5), /obj/item/storage/large_holster/machete/full, VENDOR_ITEM_REGULAR), list("Binoculars", round(scale * 1), /obj/item/device/binoculars, VENDOR_ITEM_REGULAR), + list("AN/PSQ-55 Sentry Console", round(scale * 1), /obj/item/device/sentry_computer, VENDOR_ITEM_REGULAR), list("Spare PDT/L Battle Buddy Kit", round(scale * 3), /obj/item/storage/box/pdt_kit, VENDOR_ITEM_REGULAR), list("Rail Flashlight", round(scale * 5), /obj/item/attachable/flashlight, VENDOR_ITEM_REGULAR), ) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index 906473056e..f5ea089571 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -132,7 +132,7 @@ var/displayname = sentrygun.name if(length(sentrygun.nickname)) displayname = sentrygun.nickname - var/message = "[displayname]:[get_area(sentrygun)] Engaged" + var/message = "[displayname]:[get_area(sentrygun)] ENGAGED" if(can_identify_target) message += " [sentrygun.target]" INVOKE_ASYNC(src, PROC_REF(send_message), message) @@ -148,7 +148,7 @@ if(length(sentrygun.nickname)) displayname = sentrygun.nickname var/areaname = get_area(sentrygun) - var/message = "[displayname]:[areaname] Low ammo [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]." + var/message = "[displayname]:[areaname] RNDS CRITICAL [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]." INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -160,7 +160,7 @@ if(length(sentrygun.nickname)) displayname = sentrygun.nickname var/areaname = get_area(sentrygun) - var/message = "[displayname]:[areaname] out of ammo." + var/message = "[displayname]:[areaname] EMPTY." INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -289,7 +289,7 @@ if(length(sentry.nickname)) displayname = sentry.nickname var/areaname = get_area(sentry) - var/message = "[displayname]:[areaname] lost contact." + var/message = "[displayname]:[areaname] NO SIGNAL." INVOKE_ASYNC(src, PROC_REF(send_message), message) playsound(src, 'sound/machines/buzz-two.ogg', 25, FALSE) From 93accd769f269f312a68dd57e36b74cf833a3fe8 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Thu, 13 Jun 2024 14:50:17 -0500 Subject: [PATCH 09/12] fixes that --- code/game/objects/items/devices/radio/encryptionkey.dm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/game/objects/items/devices/radio/encryptionkey.dm b/code/game/objects/items/devices/radio/encryptionkey.dm index 1e10978350..a945aa76b8 100644 --- a/code/game/objects/items/devices/radio/encryptionkey.dm +++ b/code/game/objects/items/devices/radio/encryptionkey.dm @@ -98,10 +98,10 @@ /obj/item/device/encryptionkey/mcom name = "\improper Marine Command Radio Encryption Key" icon_state = "cap_key" - channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = TRUE, SQUAD_MARINE_2 = TRUE, SQUAD_MARINE_3 = TRUE, SQUAD_MARINE_4 = TRUE, SQUAD_MARINE_5 = TRUE, SQUAD_MARINE_CRYO = TRUE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_SENTRY = TRUE) /obj/item/device/encryptionkey/mcom/alt - channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE) + channels = list(RADIO_CHANNEL_COMMAND = TRUE, SQUAD_MARINE_1 = FALSE, SQUAD_MARINE_2 = FALSE, SQUAD_MARINE_3 = FALSE, SQUAD_MARINE_4 = FALSE, SQUAD_MARINE_5 = FALSE, SQUAD_MARINE_CRYO = FALSE, RADIO_CHANNEL_ENGI = TRUE, RADIO_CHANNEL_MEDSCI = TRUE, RADIO_CHANNEL_REQ = TRUE, RADIO_CHANNEL_JTAC = TRUE, RADIO_CHANNEL_INTEL = TRUE, RADIO_CHANNEL_SENTRY = TRUE) // MARINE ENGINEERING From b3ef2d22abde7e7266ded4f983f6cb984a453c39 Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Wed, 19 Jun 2024 20:05:38 -0500 Subject: [PATCH 10/12] what where have i been pushing to --- 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 f5ea089571..d999e35acf 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -256,7 +256,7 @@ var/obj/structure/machinery/defenses/defense = defensive_structure pair_sentry(defense) to_chat(user, SPAN_NOTICE("[defense] has been encrypted.")) - var/message = "[defense] added to [src]" + var/message = "[defense] CONNECTED TO [src]" INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -274,7 +274,7 @@ if (do_after(user, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) unpair_sentry(sentry) to_chat(user, SPAN_NOTICE("[sentry] has been decrypted.")) - var/message = "[sentry] removed from from [src]" + var/message = "[sentry] DISCONNECTED FROM [src]" INVOKE_ASYNC(src, PROC_REF(send_message), message) /** From 1bee892471d67b5fd73c46cbaffa2820e732e7c0 Mon Sep 17 00:00:00 2001 From: Steeclad Cat Date: Fri, 21 Jun 2024 22:34:55 -0500 Subject: [PATCH 11/12] undoes the nice soul changes >:( --- code/modules/defenses/sentry_computer.dm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/code/modules/defenses/sentry_computer.dm b/code/modules/defenses/sentry_computer.dm index d999e35acf..bb6f55d72b 100644 --- a/code/modules/defenses/sentry_computer.dm +++ b/code/modules/defenses/sentry_computer.dm @@ -132,7 +132,7 @@ var/displayname = sentrygun.name if(length(sentrygun.nickname)) displayname = sentrygun.nickname - var/message = "[displayname]:[get_area(sentrygun)] ENGAGED" + var/message = "[displayname]:[get_area(sentrygun)] Engaged" if(can_identify_target) message += " [sentrygun.target]" INVOKE_ASYNC(src, PROC_REF(send_message), message) @@ -148,7 +148,7 @@ if(length(sentrygun.nickname)) displayname = sentrygun.nickname var/areaname = get_area(sentrygun) - var/message = "[displayname]:[areaname] RNDS CRITICAL [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]." + var/message = "[displayname]:[areaname] Low ammo [sentrygun.ammo.current_rounds]/[sentrygun.ammo.max_rounds]." INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -160,7 +160,7 @@ if(length(sentrygun.nickname)) displayname = sentrygun.nickname var/areaname = get_area(sentrygun) - var/message = "[displayname]:[areaname] EMPTY." + var/message = "[displayname]:[areaname] out of ammo." INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -256,7 +256,7 @@ var/obj/structure/machinery/defenses/defense = defensive_structure pair_sentry(defense) to_chat(user, SPAN_NOTICE("[defense] has been encrypted.")) - var/message = "[defense] CONNECTED TO [src]" + var/message = "[defense] added to [src]" INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -274,7 +274,7 @@ if (do_after(user, 1 SECONDS, INTERRUPT_NO_NEEDHAND, BUSY_ICON_GENERIC)) unpair_sentry(sentry) to_chat(user, SPAN_NOTICE("[sentry] has been decrypted.")) - var/message = "[sentry] DISCONNECTED FROM [src]" + var/message = "[sentry] removed from [src]" INVOKE_ASYNC(src, PROC_REF(send_message), message) /** @@ -289,7 +289,7 @@ if(length(sentry.nickname)) displayname = sentry.nickname var/areaname = get_area(sentry) - var/message = "[displayname]:[areaname] NO SIGNAL." + var/message = "[displayname]:[areaname] lost contact." INVOKE_ASYNC(src, PROC_REF(send_message), message) playsound(src, 'sound/machines/buzz-two.ogg', 25, FALSE) From c3c0cd72ab77d07e4a7ae87cfde10a218ff66aec Mon Sep 17 00:00:00 2001 From: KoishiVibe Date: Sat, 22 Jun 2024 00:34:57 -0500 Subject: [PATCH 12/12] unfucks this too --- code/datums/fluff_emails.dm | 1 + 1 file changed, 1 insertion(+) diff --git a/code/datums/fluff_emails.dm b/code/datums/fluff_emails.dm index b57431cca9..f7083541dd 100644 --- a/code/datums/fluff_emails.dm +++ b/code/datums/fluff_emails.dm @@ -3,6 +3,7 @@ var/title //email title var/entry_text //email content + //emails for the Almayer computers /datum/fluff_email/almayer