diff --git a/code/__DEFINES/is_helpers.dm b/code/__DEFINES/is_helpers.dm index b2b2d40c653..4feff14cb30 100644 --- a/code/__DEFINES/is_helpers.dm +++ b/code/__DEFINES/is_helpers.dm @@ -22,7 +22,7 @@ #define isclothing(A) (istype(A, /obj/item/clothing)) -#define is_pen(W) (istype(W, /obj/item/pen)) +#define is_pen(W) (istype(W, /obj/item/pen) || istype(W, /obj/item/flashlight/pen)) #define isstorage(A) (istype(A, /obj/item/storage)) diff --git a/code/game/objects/items/devices/flashlight.dm b/code/game/objects/items/devices/flashlight.dm index ffdb4d240fd..8cf7ebb72ba 100644 --- a/code/game/objects/items/devices/flashlight.dm +++ b/code/game/objects/items/devices/flashlight.dm @@ -89,13 +89,14 @@ /obj/item/flashlight/pen name = "penlight" - desc = "A pen-sized light, used by medical staff." + desc = "A pen, and a light. Used by medical staff." icon_state = "penlight" item_state = "" w_class = WEIGHT_CLASS_TINY slot_flags = SLOT_BELT | SLOT_EARS flags = CONDUCT brightness_on = 2 + var/colour = "blue" // Ink color /obj/item/flashlight/seclite name = "seclite" diff --git a/code/game/objects/items/weapons/storage/firstaid.dm b/code/game/objects/items/weapons/storage/firstaid.dm index 626a29df431..5f3e96f923c 100644 --- a/code/game/objects/items/weapons/storage/firstaid.dm +++ b/code/game/objects/items/weapons/storage/firstaid.dm @@ -297,7 +297,7 @@ return ..() /obj/item/storage/pill_bottle/attackby(obj/item/I, mob/user, params) - if(is_pen(I) || istype(I, /obj/item/flashlight/pen)) + if(is_pen(I)) rename_interactive(user, I) else return ..() diff --git a/code/modules/reagents/reagent_containers/glass_containers.dm b/code/modules/reagents/reagent_containers/glass_containers.dm index a7065df2e9d..d7db9aa7bb9 100644 --- a/code/modules/reagents/reagent_containers/glass_containers.dm +++ b/code/modules/reagents/reagent_containers/glass_containers.dm @@ -110,7 +110,7 @@ reagents.clear_reagents() /obj/item/reagent_containers/glass/attackby(obj/item/I, mob/user, params) - if(is_pen(I) || istype(I, /obj/item/flashlight/pen)) + if(is_pen(I)) var/t = rename_interactive(user, I) if(!isnull(t)) label_text = t diff --git a/code/modules/reagents/reagent_containers/iv_bag.dm b/code/modules/reagents/reagent_containers/iv_bag.dm index 0f6f187ae17..9782863e450 100644 --- a/code/modules/reagents/reagent_containers/iv_bag.dm +++ b/code/modules/reagents/reagent_containers/iv_bag.dm @@ -149,7 +149,7 @@ . += "inject" /obj/item/reagent_containers/iv_bag/attackby(obj/item/I, mob/user, params) - if(is_pen(I) || istype(I, /obj/item/flashlight/pen)) + if(is_pen(I)) rename_interactive(user, I) // PRE-FILLED IV BAGS BELOW