diff --git a/code/modules/paperwork/paper_bundle.dm b/code/modules/paperwork/paper_bundle.dm index bb12f76e58..baff965cd6 100644 --- a/code/modules/paperwork/paper_bundle.dm +++ b/code/modules/paperwork/paper_bundle.dm @@ -216,7 +216,9 @@ underlays += img i++ else if(istype(O, /obj/item/weapon/photo)) - img.icon_state = "photo" + var/obj/item/weapon/photo/Ph = O +// img.icon_state = "photo" + img = Ph.tiny photo = 1 overlays += img if(i>1) diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm index fc71edff2a..00d5dc2b95 100644 --- a/code/modules/paperwork/photography.dm +++ b/code/modules/paperwork/photography.dm @@ -29,6 +29,7 @@ w_class = 2.0 var/icon/img //Big photo image var/scribble //Scribble on the back. + var/icon/tiny /obj/item/weapon/photo/attack_self(mob/user as mob) examine() @@ -242,10 +243,15 @@ if(!user.get_inactive_hand()) user.put_in_inactive_hand(P) var/icon/small_img = icon(temp) + var/icon/tiny_img = icon(temp) var/icon/ic = icon('icons/obj/items.dmi',"photo") + var/icon/pc = icon('icons/obj/bureaucracy.dmi', "photo") small_img.Scale(8, 8) + tiny_img.Scale(4, 4) ic.Blend(small_img,ICON_OVERLAY, 10, 13) + pc.Blend(tiny_img,ICON_OVERLAY, 12, 19) P.icon = ic + P.tiny = pc P.img = temp P.desc = mobs P.pixel_x = rand(-10, 10) diff --git a/icons/obj/bureaucracy.dmi b/icons/obj/bureaucracy.dmi index a1d379cad9..3c6d52748c 100644 Binary files a/icons/obj/bureaucracy.dmi and b/icons/obj/bureaucracy.dmi differ