mirror of
https://github.com/SPLURT-Station/S.P.L.U.R.T-Station-13.git
synced 2026-08-30 16:16:47 +01:00
Merge pull request #723 from The-Real-Goku/photography-update
Photography update
This commit is contained in:
@@ -76,7 +76,7 @@
|
||||
/proc/load_photo_from_disk(id, location)
|
||||
var/datum/picture/P = load_picture_from_disk(id)
|
||||
if(istype(P))
|
||||
var/obj/item/photo/p = new(location, P)
|
||||
var/obj/item/photo/old/p = new(location, P)
|
||||
return p
|
||||
|
||||
/proc/load_picture_from_disk(id)
|
||||
|
||||
@@ -48,7 +48,7 @@
|
||||
for(var/i in ids)
|
||||
if(i in current_ids)
|
||||
continue
|
||||
var/obj/item/photo/P = load_photo_from_disk(i)
|
||||
var/obj/item/photo/old/P = load_photo_from_disk(i)
|
||||
if(istype(P))
|
||||
if(!SEND_SIGNAL(src, COMSIG_TRY_STORAGE_INSERT, P, null, TRUE, TRUE))
|
||||
qdel(P)
|
||||
|
||||
@@ -98,7 +98,7 @@
|
||||
load_from_id(data[persistence_id])
|
||||
|
||||
/obj/structure/sign/picture_frame/proc/load_from_id(id)
|
||||
var/obj/item/photo/P = load_photo_from_disk(id)
|
||||
var/obj/item/photo/old/P = load_photo_from_disk(id)
|
||||
if(istype(P))
|
||||
if(istype(framed))
|
||||
framed.forceMove(drop_location())
|
||||
|
||||
Reference in New Issue
Block a user