From 3fbf3926bf582247db1666096231009710c23778 Mon Sep 17 00:00:00 2001 From: Hopekz Date: Tue, 4 Jul 2023 16:07:37 -0500 Subject: [PATCH 1/5] Rewrites flavor and adds lore to fountain pen --- code/game/objects/items/tools/misc_tools.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 1bcebd9f1ea3..82b340c564f0 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -276,7 +276,8 @@ pen_colour = "white" /obj/item/tool/pen/fountain - desc = "A luxurious fountain pen, embossed with gold accents. Its intricate mechanics allow the user to switch between various ink colors with a simple twist." + desc = "A lavish testament to the ingenuity of ARMAT's craftsmanship, this fountain pen is a paragon of design and functionality. Detailed with golden accents and intricate mechanics, the pen allows for a swift change between a myriad of ink colors with a simple twist. A product of precision engineering, each mechanism inside the pen is designed to provide a seamless, effortless transition from one color to the next, creating an instrument of luxurious versatility." + desc_lore = "More than just a tool for writing, ARMAT's fountain pen is a symbol of distinction and authority within the ranks of the United States Colonial Marine Corps (USCM). It is a legacy item, exclusively handed out to the top-tier command personnel, each pen a tribute to the recipient's leadership and dedication.\n \nARMAT, renowned for their weapons technology, took a different approach in crafting this piece. The fountain pen, though seemingly a departure from their usual field, is deeply ingrained with the company's engineering philosophy, embodying precision, functionality, and robustness.\n \nThe golden accents are not mere embellishments; they're an identifier, setting apart these pens and their owners from the rest. The gold is meticulously alloyed with a durable metallic substance, granting it resilience to daily wear and tear. Such resilience is symbolic of the tenacity and perseverance required of USCM command personnel.\n \nEach pen is equipped with an intricate color changing mechanism, allowing the user to switch between various ink colors. This feature, inspired by the advanced targeting systems of ARMAT's weaponry, uses miniaturized actuators and precision-ground components to smoothly transition the ink flow. A simple twist of the pen's body activates the change, rotating the internal ink cartridges into place with mechanical grace, ready for the user's command.\n \nThe ink colors are not chosen arbitrarily. Each represents a different echelon within the USCM, allowing the pen's owner to write in the hue that corresponds with their rank or the rank of the recipient of their written orders. This acts as a silent testament to the authority of their words, as if each stroke of the pen echoes through the halls of USCM authority.\n \nDespite its ornate appearance, the pen is as robust as any ARMAT weapon, reflecting the company's commitment to reliability and durability. The metal components are corrosion-resistant, ensuring the pen's longevity, even under the challenging conditions often faced by USCM high command.\n \nThe fusion of luxury and utility, the blend of gold and metal, is an embodiment of the hard-won elegance of command, of the fusion between power and grace. It's more than a writing instrument - it's an emblem of leadership, an accolade to the dedication and strength of those who bear it. ARMAT's fountain pen stands as a monument to the precision, integrity, and courage embodied by the USCM's highest-ranking officers." name = "fountain pen" icon_state = "fountain_pen" item_state = "fountain_pen" From 56fe96684ab4b265dd4d0f6cca56467312ef0e4d Mon Sep 17 00:00:00 2001 From: Hopekz Date: Tue, 4 Jul 2023 19:11:43 -0500 Subject: [PATCH 2/5] Owner now has a laser engraving on the pen --- code/game/objects/items/tools/misc_tools.dm | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index 82b340c564f0..b4a050607c23 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -284,6 +284,21 @@ matter = list("metal" = 20, "gold" = 10) var/static/list/colour_list = list("red", "blue", "green", "yellow", "purple", "pink", "brown", "black", "orange") // Can add more colors as required var/current_colour_index = 1 + var/owner = "hard to read text" + +/obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user) + . = ..() + var/turf/T = get_turf(src) + if(locate(/mob/living/carbon/human) in T) + var/mob/new_owner = (locate(/mob/living/carbon/human) in T) + owner = new_owner.real_name + if(locate(/obj/structure/machinery/cryopod) in T) + var/obj/structure/machinery/cryopod/new_owners_pod = (locate(/obj/structure/machinery/cryopod) in T) + owner = new_owners_pod.occupant.real_name + +/obj/item/tool/pen/fountain/get_examine_text(mob/user) + . = ..() + . += "There's a laser engraving of [owner] on it." /obj/item/tool/pen/fountain/attack_self(mob/living/carbon/human/user) if(on) From 984e275c6127485d44dcd3a70216e0b0c5890bae Mon Sep 17 00:00:00 2001 From: Hopekz Date: Wed, 12 Jul 2023 21:15:48 -0500 Subject: [PATCH 3/5] Single letter police got me --- code/game/objects/items/tools/misc_tools.dm | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index b4a050607c23..c8c6011942a9 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -288,12 +288,12 @@ /obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user) . = ..() - var/turf/T = get_turf(src) - if(locate(/mob/living/carbon/human) in T) - var/mob/new_owner = (locate(/mob/living/carbon/human) in T) + var/turf/current_turf = get_turf(src) + if(locate(/mob/living/carbon/human) in current_turf) + var/mob/new_owner = (locate(/mob/living/carbon/human) in current_turf) owner = new_owner.real_name - if(locate(/obj/structure/machinery/cryopod) in T) - var/obj/structure/machinery/cryopod/new_owners_pod = (locate(/obj/structure/machinery/cryopod) in T) + if(locate(/obj/structure/machinery/cryopod) in current_turf) + var/obj/structure/machinery/cryopod/new_owners_pod = (locate(/obj/structure/machinery/cryopod) in current_turf) owner = new_owners_pod.occupant.real_name /obj/item/tool/pen/fountain/get_examine_text(mob/user) From 3ed5d203dfad0a92f57dc5c4e87ec284f649d5e9 Mon Sep 17 00:00:00 2001 From: Hopekz Date: Sat, 22 Jul 2023 03:53:39 -0500 Subject: [PATCH 4/5] Update code/game/objects/items/tools/misc_tools.dm Co-authored-by: harryob --- code/game/objects/items/tools/misc_tools.dm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index c8c6011942a9..a4ba968a5a34 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -289,11 +289,11 @@ /obj/item/tool/pen/fountain/Initialize(mapload, mob/living/carbon/human/user) . = ..() var/turf/current_turf = get_turf(src) - if(locate(/mob/living/carbon/human) in current_turf) - var/mob/new_owner = (locate(/mob/living/carbon/human) in current_turf) + var/mob/living/carbon/human/new_owner = locate() in current_turf + if(new_owner) owner = new_owner.real_name - if(locate(/obj/structure/machinery/cryopod) in current_turf) - var/obj/structure/machinery/cryopod/new_owners_pod = (locate(/obj/structure/machinery/cryopod) in current_turf) + var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf + if(new_owners_pod) owner = new_owners_pod.occupant.real_name /obj/item/tool/pen/fountain/get_examine_text(mob/user) From aef77d60c615ed079102fed10ea58837a6f33bb5 Mon Sep 17 00:00:00 2001 From: Hopekz Date: Tue, 25 Jul 2023 00:51:11 -0500 Subject: [PATCH 5/5] Update code/game/objects/items/tools/misc_tools.dm Co-authored-by: harryob --- code/game/objects/items/tools/misc_tools.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/tools/misc_tools.dm b/code/game/objects/items/tools/misc_tools.dm index a4ba968a5a34..505006285881 100644 --- a/code/game/objects/items/tools/misc_tools.dm +++ b/code/game/objects/items/tools/misc_tools.dm @@ -294,7 +294,7 @@ owner = new_owner.real_name var/obj/structure/machinery/cryopod/new_owners_pod = locate() in current_turf if(new_owners_pod) - owner = new_owners_pod.occupant.real_name + owner = new_owners_pod.occupant?.real_name /obj/item/tool/pen/fountain/get_examine_text(mob/user) . = ..()