diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm index 504bde28c77..a4f12d5b597 100644 --- a/code/game/objects/items/weapons/cameras.dm +++ b/code/game/objects/items/weapons/cameras.dm @@ -47,115 +47,171 @@ throwforce = 5 throw_speed = 4 throw_range = 10 - var/pictures_left = 10 + var/pictures_left = 30 var/can_use = 1 + /obj/item/weapon/photo name = "photo" icon = 'items.dmi' icon_state = "photo" item_state = "clipboard" w_class = 1.0 + var/icon/img //Big photo image + var/scribble //Scribble on the back. +/obj/item/weapon/photo/attack_self(var/mob/user as mob) + ..() + examine() + +/obj/item/weapon/photo/attackby(obj/item/weapon/P as obj, mob/user as mob) + if (istype(P, /obj/item/weapon/pen) || istype(P, /obj/item/toy/crayon)) + var/txt = scrub_input(usr, "What would you like to write on the back?", "Photo Writing", null) as text + txt = copytext(txt, 1, 128) + if ((loc == usr && usr.stat == 0)) + scribble = txt + + ..() + +/obj/item/weapon/photo/examine() + set src in oview(2) + ..() + if (scribble) + usr << "\blue you see something written on photo's back. " + usr << browse_rsc(src.img, "tmp_photo.png") + usr << browse("Photo" \ + + "" \ + + "
Writings on the back:
[scribble]" : ]"\ + + "", "window=book;size=200x[scribble ? 400 : 200]") + onclose(usr, "[name]") + + return +/obj/item/weapon/photo/verb/rename() + set name = "Rename photo" + set category = "Object" + set src in usr + + var/n_name = input(usr, "What would you like to label the photo?", "Photo Labelling", src.name) as text + n_name = copytext(n_name, 1, 32) + if ((loc == usr && usr.stat == 0)) + name = "photo[(n_name ? text("- '[n_name]'") : null)]" + add_fingerprint(usr) + return ////////////////////////////////////////////////////////////////////////////////////////////////// /obj/item/weapon/camera_test/attack(mob/living/carbon/human/M as mob, mob/user as mob) return +/obj/item/weapon/camera_test/proc/get_icon(turf/the_turf as turf) + //Bigger icon base to capture those icons that were shifted to the next tile + //i.e. pretty much all wall-mounted machinery + var/icon/res = icon('96x96.dmi',"") + + var/icon/turficon = build_composite_icon(the_turf) + res.Blend(turficon,ICON_OVERLAY,32,32) + + var/atoms[] = list() + for(var/atom/A in the_turf) + if(A.invisibility) continue + atoms.Add(A) + + //Sorting icons based on levels + var/gap = atoms.len + var/swapped = 1 + while (gap > 1 || swapped) + swapped = 0 + if (gap > 1) + gap = round(gap / 1.247330950103979) + if (gap < 1) + gap = 1 + for (var/i = 1; gap + i <= atoms.len; i++) + var/atom/l = atoms[i] //Fucking hate + var/atom/r = atoms[gap+i] //how lists work here + if (l.layer > r.layer) //no "atoms[i].layer" for me + atoms.Swap(i, gap + i) + swapped = 1 + + for (var/i; i <= atoms.len; i++) + var/atom/A = atoms[i] + if (A) + var/icon/img = build_composite_icon(A) + if(istype(img, /icon)) + res.Blend(img,ICON_OVERLAY,32+A.pixel_x,32+A.pixel_y) + return res + +/obj/item/weapon/camera_test/attack_self(var/mob/user as mob) + ..() + if (can_use) + can_use = 0 + icon_state = "camera_off" + else + can_use = 1 + icon_state = "camera" + +/obj/item/weapon/camera_test/proc/get_mobs(turf/the_turf as turf) + var/mob_detail + for(var/mob/living/carbon/A in the_turf) + if(A.invisibility) continue + var/holding = null + if(A.l_hand || A.r_hand) + if(A.l_hand) holding = "They are holding \a [A.l_hand]" + if(A.r_hand) + if(holding) + holding += " and \a [A.r_hand]" + else + holding = "They are holding \a [A.r_hand]" + + if(!mob_detail) + mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]. " + else + mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]." + return mob_detail + /obj/item/weapon/camera_test/afterattack(atom/target as mob|obj|turf|area, mob/user as mob, flag) if (!can_use || !pictures_left || ismob(target.loc)) return - var/turf/the_turf = get_turf(target) + var/x_c = target.x - 1 + var/y_c = target.y + 1 + var/z_c = target.z - var/icon/photo = icon('items.dmi',"photo") + var/icon/temp = icon('96x96.dmi',"") + var/icon/black = icon('space.dmi', "black") + var/mobs = "" + for (var/i = 1; i <= 3; i++) + for (var/j = 1; j <= 3; j++) + var/turf/T = locate(x_c,y_c,z_c) - var/icon/turficon = build_composite_icon(the_turf) - turficon.Scale(22,20) - - photo.Blend(turficon,ICON_OVERLAY,6,8) - - var/mob_title = null - var/mob_detail = null - - var/item_title = null - var/item_detail = null - - var/itemnumber = 0 - for(var/atom/A in the_turf) - if(istype(A, /obj/item/weapon/photo)) continue - if(A.invisibility) continue - if(ismob(A)) - var/icon/X = build_composite_icon(A) - X.Scale(22,20) - photo.Blend(X,ICON_OVERLAY,6,8) - del(X) - - if(!mob_title) - mob_title = "[A]" + var/mob/dummy = new(T) //Go go visibility check dummy + if(dummy in viewers(world.view, user)) + temp.Blend(get_icon(T),ICON_OVERLAY,31*(j-1-1),31 - 31*(i-1)) else - mob_title += " and [A]" - - if(!mob_detail) - - var/holding = null - if(istype(A, /mob/living/carbon)) - var/mob/living/carbon/temp = A - if(temp.l_hand || temp.r_hand) - if(temp.l_hand) holding = "They are holding \a [temp.l_hand]" - if(temp.r_hand) - if(holding) - holding += " and \a [temp.r_hand]." - else - holding = "They are holding \a [temp.r_hand]." - - if(!mob_detail) - mob_detail = "You can see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]" - else - mob_detail += "You can also see [A] on the photo[A:health < 75 ? " - [A] looks hurt":""].[holding ? " [holding]":"."]" - - else - if(itemnumber < 5) - var/icon/X = build_composite_icon(A) - X.Scale(22,20) - photo.Blend(X,ICON_OVERLAY,6,8) - del(X) - itemnumber++ - - if(!item_title) - item_title = " \a [A]" - else - item_title = " some objects" - - if(!item_detail) - item_detail = "\a [A]" - else - item_detail += " and \a [A]" - - var/finished_title = null - var/finished_detail = null - - if(!item_title && !mob_title) - finished_title = "boring photo" - finished_detail = "This is a pretty boring photo of \a [the_turf]." - else - if(mob_title) - finished_title = "photo of [mob_title][item_title ? " and[item_title]":""]" - finished_detail = "[mob_detail][item_detail ? " Theres also [item_detail].":"."]" - else if(item_title) - finished_title = "photo of[item_title]" - finished_detail = "You can see [item_detail]." + temp.Blend(black,ICON_OVERLAY,31*(j-1),62 - 31*(i-1)) + mobs += get_mobs(T) + del dummy //Alas, nameless creature + x_c++ + y_c-- + x_c = x_c - 3 var/obj/item/weapon/photo/P = new/obj/item/weapon/photo( get_turf(src) ) - - P.icon = photo - P.name = finished_title - P.desc = finished_detail - + var/icon/small_img = icon(temp) + var/icon/ic = icon('items.dmi',"photo") + small_img.Scale(8,8) + ic.Blend(small_img,ICON_OVERLAY,10,13) + P.icon = ic + P.img = temp + P.desc = mobs + P.pixel_x = rand(-10,10) + P.pixel_y = rand(-10,10) playsound(src.loc, pick('polaroid1.ogg','polaroid2.ogg'), 75, 1, -3) pictures_left-- src.desc = "A one use - polaroid camera. [pictures_left] photos left." user << "\blue [pictures_left] photos left." can_use = 0 - spawn(50) can_use = 1 + icon_state = "camera_off" + spawn(50) + can_use = 1 + icon_state = "camera" + diff --git a/icons/effects/96x96.dmi b/icons/effects/96x96.dmi index 6698e0b13d3..88d55cbfd55 100644 Binary files a/icons/effects/96x96.dmi and b/icons/effects/96x96.dmi differ diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi index 303f54015ed..cbcf1c78cc4 100644 Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ