| Name: | [active1.fields["name"]] |
| ID: | [active1.fields["id"]] |
@@ -446,7 +446,7 @@ What a mess.*/
sleep(30)
if((istype(active1, /datum/data/record) && GLOB.data_core.general.Find(active1)))//make sure the record still exists.
var/obj/item/photo/photo = active1.fields["photo_front"]
- new /obj/item/poster/wanted(src.loc, photo.img, wanted_name, info)
+ new /obj/item/poster/wanted(loc, photo.picture.picture_image, wanted_name, info)
printing = 0
//RECORD DELETE
@@ -611,7 +611,7 @@ What a mess.*/
if(photo)
qdel(active1.fields["photo_front"])
//Lets center it to a 32x32.
- var/icon/I = photo.img
+ var/icon/I = photo.picture.picture_image
var/w = I.Width()
var/h = I.Height()
var/dw = w - 32
@@ -622,7 +622,7 @@ What a mess.*/
if(active1.fields["photo_front"])
if(istype(active1.fields["photo_front"], /obj/item/photo))
var/obj/item/photo/P = active1.fields["photo_front"]
- print_photo(P.img, active1.fields["name"])
+ print_photo(P.picture.picture_image, active1.fields["name"])
if("show_photo_side")
if(active1.fields["photo_side"])
if(istype(active1.fields["photo_side"], /obj/item/photo))
@@ -633,7 +633,7 @@ What a mess.*/
if(photo)
qdel(active1.fields["photo_side"])
//Lets center it to a 32x32.
- var/icon/I = photo.img
+ var/icon/I = photo.picture.picture_image
var/w = I.Width()
var/h = I.Height()
var/dw = w - 32
@@ -644,7 +644,7 @@ What a mess.*/
if(active1.fields["photo_side"])
if(istype(active1.fields["photo_side"], /obj/item/photo))
var/obj/item/photo/P = active1.fields["photo_side"]
- print_photo(P.img, active1.fields["name"])
+ print_photo(P.picture.picture_image, active1.fields["name"])
if("mi_crim_add")
if(istype(active1, /datum/data/record))
var/t1 = stripped_input(usr, "Please input minor crime names:", "Secure. records", "", null)
@@ -759,10 +759,9 @@ What a mess.*/
var/obj/item/photo/P = null
if(issilicon(user))
var/mob/living/silicon/tempAI = user
- var/datum/picture/selection = tempAI.GetPhoto()
+ var/datum/picture/selection = tempAI.GetPhoto(user)
if(selection)
- P = new()
- P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
+ P = new(null, selection)
else if(istype(user.get_active_held_item(), /obj/item/photo))
P = user.get_active_held_item()
return P
@@ -778,7 +777,7 @@ What a mess.*/
small_img.Scale(8, 8)
ic.Blend(small_img,ICON_OVERLAY, 13, 13)
P.icon = ic
- P.img = temp
+ P.picture.picture_image = temp
P.desc = "The photo on file for [name]."
P.pixel_x = rand(-10, 10)
P.pixel_y = rand(-10, 10)
diff --git a/code/game/machinery/doppler_array.dm b/code/game/machinery/doppler_array.dm
index 9d522f8f1c..940734c0c2 100644
--- a/code/game/machinery/doppler_array.dm
+++ b/code/game/machinery/doppler_array.dm
@@ -129,4 +129,4 @@ GLOBAL_LIST_EMPTY(doppler_arrays)
linked_techweb = SSresearch.science_tech
/proc/techweb_scale_bomb(lightradius)
- return (lightradius ** 0.5) * 3000
+ return lightradius ** 1.36
diff --git a/code/game/machinery/newscaster.dm b/code/game/machinery/newscaster.dm
index aa847a4624..bb4868d054 100644
--- a/code/game/machinery/newscaster.dm
+++ b/code/game/machinery/newscaster.dm
@@ -126,9 +126,9 @@ GLOBAL_LIST_EMPTY(allCasters)
newMsg.is_admin_message = adminMessage
newMsg.locked = !allow_comments
if(photo)
- newMsg.img = photo.img
+ newMsg.img = photo.picture.picture_image
newMsg.caption = photo.scribble
- newMsg.photo_file = save_photo(photo.img)
+ newMsg.photo_file = save_photo(photo.picture.picture_image)
for(var/datum/newscaster/feed_channel/FC in network_channels)
if(FC.channel_name == channel_name)
FC.messages += newMsg
@@ -145,8 +145,8 @@ GLOBAL_LIST_EMPTY(allCasters)
wanted_issue.scannedUser = scanned_user
wanted_issue.isAdminMsg = adminMsg
if(photo)
- wanted_issue.img = photo.img
- wanted_issue.photo_file = save_photo(photo.img)
+ wanted_issue.img = photo.picture.picture_image
+ wanted_issue.photo_file = save_photo(photo.picture.picture_image)
if(newMessage)
for(var/obj/machinery/newscaster/N in GLOB.allCasters)
N.newsAlert()
@@ -794,10 +794,7 @@ GLOBAL_LIST_EMPTY(allCasters)
if(photo && !user.transferItemToLoc(photo, src))
photo = null
if(issilicon(user))
- var/list/nametemp = list()
- var/find
- var/datum/picture/selection
- var/obj/item/camera/siliconcam/targetcam = null
+ var/obj/item/camera/siliconcam/targetcam
if(isAI(user))
var/mob/living/silicon/ai/R = user
targetcam = R.aicamera
@@ -809,19 +806,12 @@ GLOBAL_LIST_EMPTY(allCasters)
targetcam = R.aicamera
else
to_chat(user, "You cannot interface with silicon photo uploading!")
- if(targetcam.aipictures.len == 0)
+ if(!targetcam.stored.len)
to_chat(usr, "No images saved")
return
- for(var/datum/picture/t in targetcam.aipictures)
- nametemp += t.fields["name"]
- find = input("Select image (numbered in order taken)") in nametemp
- var/obj/item/photo/P = new/obj/item/photo()
- for(var/datum/picture/q in targetcam.aipictures)
- if(q.fields["name"] == find)
- selection = q
- break
- P.photocreate(selection.fields["icon"], selection.fields["img"], selection.fields["desc"])
- P.sillynewscastervar = 1
+ var/datum/picture/selection = targetcam.selectpicture(user)
+ var/obj/item/photo/P = new(null, selection)
+ P.sillynewscastervar = TRUE
photo = P
qdel(P)
diff --git a/code/game/machinery/telecomms/computers/message.dm b/code/game/machinery/telecomms/computers/message.dm
index 74881cb064..5996bcea6b 100644
--- a/code/game/machinery/telecomms/computers/message.dm
+++ b/code/game/machinery/telecomms/computers/message.dm
@@ -141,7 +141,7 @@
break
// Del - Sender - Recepient - Message
// X - Al Green - Your Mom - WHAT UP!?
- dat += "| X | [pda.sender] | [pda.recipient] | [pda.message][pda.photo ? " (Photo)":""] | "
+ dat += "| X | [pda.sender] | [pda.recipient] | [pda.message][pda.picture ? " (Photo)":""] | "
dat += " "
//Hacking screen.
if(2)
diff --git a/code/game/machinery/telecomms/machines/message_server.dm b/code/game/machinery/telecomms/machines/message_server.dm
index 45661add0d..3b2dbed96f 100644
--- a/code/game/machinery/telecomms/machines/message_server.dm
+++ b/code/game/machinery/telecomms/machines/message_server.dm
@@ -124,7 +124,7 @@
var/sender = "Unspecified"
var/recipient = "Unspecified"
var/message = "Blank" // transferred message
- var/icon/photo // attached photo
+ var/datum/picture/picture // attached photo
/datum/data_pda_msg/New(param_rec, param_sender, param_message, param_photo)
if(param_rec)
@@ -134,17 +134,17 @@
if(param_message)
message = param_message
if(param_photo)
- photo = param_photo
+ picture = param_photo
/datum/data_pda_msg/Topic(href,href_list)
..()
if(href_list["photo"])
var/mob/M = usr
- M << browse_rsc(photo, "pda_photo.png")
+ M << browse_rsc(picture.picture_image, "pda_photo.png")
M << browse("PDA Photo" \
+ "" \
+ " " \
- + "", "window=pdaphoto;size=192x192")
+ + " |