diff --git a/baystation12.dme b/baystation12.dme index f61266ba9b..30450fa38a 100644 --- a/baystation12.dme +++ b/baystation12.dme @@ -1045,6 +1045,7 @@ #include "code\modules\organs\organ_internal.dm" #include "code\modules\organs\pain.dm" #include "code\modules\organs\wound.dm" +#include "code\modules\paperwork\carbonpaper.dm" #include "code\modules\paperwork\clipboard.dm" #include "code\modules\paperwork\filingcabinet.dm" #include "code\modules\paperwork\folders.dm" diff --git a/code/modules/paperwork/paperbin.dm b/code/modules/paperwork/paperbin.dm index ec6a3a9190..842608c683 100644 --- a/code/modules/paperwork/paperbin.dm +++ b/code/modules/paperwork/paperbin.dm @@ -79,3 +79,29 @@ icon_state = "paper_bin0" else icon_state = "paper_bin1" + + +/obj/item/weapon/paper_bin/carbon + name = "carbonless paper bin" + icon_state = "paper_bin2" + +/obj/item/weapon/paper_bin/carbon/attack_hand(mob/user as mob) + if(amount >= 1) + amount-- + if(amount==0) + update_icon() + + var/obj/item/weapon/paper/carbon/P + if(papers.len > 0) //If there's any custom paper on the stack, use that instead of creating a new paper. + P = papers[papers.len] + papers.Remove(P) + else + P = new /obj/item/weapon/paper/carbon + P.loc = user.loc + user.put_in_hands(P) + user << "You take [P] out of the [src]." + else + user << "[src] is empty!" + + add_fingerprint(user) + return \ No newline at end of file diff --git a/code/modules/paperwork/photocopier.dm b/code/modules/paperwork/photocopier.dm index 2695556c71..04cf6f629c 100644 --- a/code/modules/paperwork/photocopier.dm +++ b/code/modules/paperwork/photocopier.dm @@ -66,7 +66,7 @@ else if(photocopy) for(var/i = 0, i < copies, i++) if(toner > 0) - var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (loc) + var/obj/item/weapon/photo/p = new /obj/item/weapon/photo (src.loc) var/icon/I = icon(photocopy.icon, photocopy.icon_state) var/icon/img = icon(photocopy.img) if(toner > 10) //plenty of toner, go straight greyscale diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index 33e1cb9df2..feec0ae0df 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ