diff --git a/code/modules/paperwork/clipboard.dm b/code/modules/paperwork/clipboard.dm index 81bf5202616..a83db1ab21e 100644 --- a/code/modules/paperwork/clipboard.dm +++ b/code/modules/paperwork/clipboard.dm @@ -8,7 +8,7 @@ icon_state = "clipboard" item_state = "clipboard" w_class = WEIGHT_CLASS_SMALL - var/obj/item/weapon/pen + var/obj/item/weapon/pen/containedpen var/obj/item/weapon/toppaper slot_flags = SLOT_BELT burn_state = FLAMMABLE @@ -22,7 +22,7 @@ set name = "Remove clipboard pen" if(!ishuman(usr) || usr.incapacitated()) return - penPlacement(FALSE, pen) + penPlacement(FALSE, containedpen) /obj/item/weapon/clipboard/proc/isPaperwork(var/obj/item/weapon/W) //This could probably do with being somewhere else but for now it's fine here. if(istype(W, /obj/item/weapon/paper) || istype(W, /obj/item/weapon/paper_bundle)) @@ -46,7 +46,7 @@ obj/item/weapon/clipboard/proc/penPlacement(var/placing, var/obj/item/weapon/pen/P) if(placing == TRUE) - if(pen) + if(containedpen) to_chat(usr, "There's already a pen in [src]!") return if(!isPen(P)) @@ -54,19 +54,19 @@ obj/item/weapon/clipboard/proc/penPlacement(var/placing, var/obj/item/weapon/pen to_chat(usr, "You slide [P] into [src].") usr.unEquip(P) P.forceMove(src) - pen = P + containedpen = P else - if(!pen) + if(!containedpen) to_chat(usr, "There isn't a pen in [src] for you to remove!") return - to_chat(usr, "You remove [pen] from [src].") - usr.put_in_hands(pen) - pen = null + to_chat(usr, "You remove [containedpen] from [src].") + usr.put_in_hands(containedpen) + containedpen = null update_icon() /obj/item/weapon/clipboard/proc/show_clipboard() //Show them what's on the clipboard var/dat = "