From f01fd1f9420eca62992c391c2c045d77bc29c80f Mon Sep 17 00:00:00 2001 From: bgobandit Date: Sun, 15 Nov 2015 16:45:43 -0500 Subject: [PATCH 1/2] Adds the ability to label blood packs. --- .../reagents/reagent_containers/blood_pack.dm | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 088c6ae2236..9e118924710 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -49,4 +49,17 @@ /obj/item/weapon/reagent_containers/blood/empty name = "empty blood pack" desc = "Seems pretty useless... Maybe if there were a way to fill it?" - icon_state = "empty" \ No newline at end of file + icon_state = "empty" + +/obj/item/weapon/reagent_containers/blood/attackby(obj/item/I, mob/user, params) + if (istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/toy/crayon)) + var/t = stripped_input(user, "What would you like to label the blood pack?", name, null, 53) + if(user.get_active_hand() != I) + return + if(!in_range(src, user) && loc != user) + return + if(t) + name = "blood pack - [t]" + else + name = "blood pack" + return \ No newline at end of file From 4dee16a13d104e0a2fc54b99cec9d6ac24d0aa7c Mon Sep 17 00:00:00 2001 From: bgobandit Date: Mon, 16 Nov 2015 16:53:19 -0500 Subject: [PATCH 2/2] canusetopic for ayyranclmaos --- code/modules/reagents/reagent_containers/blood_pack.dm | 2 ++ 1 file changed, 2 insertions(+) diff --git a/code/modules/reagents/reagent_containers/blood_pack.dm b/code/modules/reagents/reagent_containers/blood_pack.dm index 9e118924710..9c410989017 100644 --- a/code/modules/reagents/reagent_containers/blood_pack.dm +++ b/code/modules/reagents/reagent_containers/blood_pack.dm @@ -53,6 +53,8 @@ /obj/item/weapon/reagent_containers/blood/attackby(obj/item/I, mob/user, params) if (istype(I, /obj/item/weapon/pen) || istype(I, /obj/item/toy/crayon)) + if(!user.canUseTopic(src)) + return var/t = stripped_input(user, "What would you like to label the blood pack?", name, null, 53) if(user.get_active_hand() != I) return