From 4a5cda8a8b5f5c26ea9840402ddfb452fa4684a2 Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Mon, 16 Nov 2015 20:14:30 -0600 Subject: [PATCH 1/5] Introduce the four-color pen Add a fancy pen that lets you choose between black, red, green, and blue ink. --- code/modules/paperwork/pen.dm | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 47ce86e6afd..b78c8420445 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -44,6 +44,31 @@ icon_state = "pen" colour = "white" +/obj/item/weapon/pen/fourcolor + desc = "It's a fancy four-color ink pen." + name = "four-color pen" + icon = 'icons/obj/bureaucracy.dmi' + icon_state = "pen" + item_state = "pen" + +/obj/item/weapon/pen/fourcolor/New() + ..() + colour = "black" + desc = "It's a fancy four-color ink pen, set to [src.colour]." + +/obj/item/weapon/pen/fourcolor/attack_self(mob/living/carbon/user) + switch(colour) + if("black") + colour = "red" + if("red") + colour = "green" + if("green") + colour = "blue" + else + colour = "black" + user << "[src] will now write in [src.colour]." + //user << "[src] will now write in [colour]." // If anyone feels lucky + desc = "It's a fancy four-color ink pen, set to [src.colour]." /obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth) if(!istype(M)) From a33df9b39bd125cdada2354ce51ac5ac4e748ac5 Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Mon, 16 Nov 2015 21:32:13 -0600 Subject: [PATCH 2/5] Make four-color pen available through cargo Adds two of /obj/item/weapon/pen/fourcolor to the Bureaucracy crate. --- code/datums/supplypacks.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/datums/supplypacks.dm b/code/datums/supplypacks.dm index bc3b26bd3b6..070261597e1 100644 --- a/code/datums/supplypacks.dm +++ b/code/datums/supplypacks.dm @@ -1102,6 +1102,8 @@ var/list/all_supply_groups = list(supply_emergency,supply_security,supply_engine /obj/item/hand_labeler_refill, /obj/item/hand_labeler_refill, /obj/item/weapon/paper_bin, + /obj/item/weapon/pen/fourcolor, + /obj/item/weapon/pen/fourcolor, /obj/item/weapon/pen, /obj/item/weapon/pen/blue, /obj/item/weapon/pen/red, From 33350bffe69bd7a6fdfef3d25ff4d9005685ebee Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Tue, 17 Nov 2015 13:07:22 -0600 Subject: [PATCH 3/5] Four-color pen code improvement. Take advantage of inheritance; use defaults instead of New() --- code/modules/paperwork/pen.dm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index b78c8420445..56287367a19 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -45,16 +45,9 @@ colour = "white" /obj/item/weapon/pen/fourcolor - desc = "It's a fancy four-color ink pen." + desc = "It's a fancy four-color ink pen, set to black." name = "four-color pen" - icon = 'icons/obj/bureaucracy.dmi' - icon_state = "pen" - item_state = "pen" - -/obj/item/weapon/pen/fourcolor/New() - ..() colour = "black" - desc = "It's a fancy four-color ink pen, set to [src.colour]." /obj/item/weapon/pen/fourcolor/attack_self(mob/living/carbon/user) switch(colour) @@ -66,9 +59,9 @@ colour = "blue" else colour = "black" - user << "[src] will now write in [src.colour]." - //user << "[src] will now write in [colour]." // If anyone feels lucky - desc = "It's a fancy four-color ink pen, set to [src.colour]." + user << "[src] will now write in [colour]." + //user << "[src] will now write in [colour]." + desc = "It's a fancy four-color ink pen, set to [colour]." /obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth) if(!istype(M)) From 5b429cf2fe227dc182b9252dfa6ebe699298f809 Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Tue, 17 Nov 2015 18:43:40 -0600 Subject: [PATCH 4/5] remove commented-out code from pen.dm fine --- code/modules/paperwork/pen.dm | 1 - 1 file changed, 1 deletion(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index 56287367a19..da4294e8a94 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -60,7 +60,6 @@ else colour = "black" user << "[src] will now write in [colour]." - //user << "[src] will now write in [colour]." desc = "It's a fancy four-color ink pen, set to [colour]." /obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth) From c183c660fc4777a62df21194c3a0aeedf2b8245a Mon Sep 17 00:00:00 2001 From: octareenroon91 Date: Wed, 18 Nov 2015 16:36:42 -0600 Subject: [PATCH 5/5] Typo in four-color pen feedback Change message starting, "pen will now write..." Now it starts grammatically correct: "The pen will now..." --- code/modules/paperwork/pen.dm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/modules/paperwork/pen.dm b/code/modules/paperwork/pen.dm index da4294e8a94..414ece61407 100644 --- a/code/modules/paperwork/pen.dm +++ b/code/modules/paperwork/pen.dm @@ -59,7 +59,7 @@ colour = "blue" else colour = "black" - user << "[src] will now write in [colour]." + user << "\The [src] will now write in [colour]." desc = "It's a fancy four-color ink pen, set to [colour]." /obj/item/weapon/pen/attack(mob/living/M, mob/user,stealth)