diff --git a/code/WorkInProgress/Cameras.dm b/code/WorkInProgress/Cameras.dm
index 94f7c576..4038a984 100644
--- a/code/WorkInProgress/Cameras.dm
+++ b/code/WorkInProgress/Cameras.dm
@@ -85,6 +85,54 @@
w_class = 1.0
var/image/fullImage
var/icon/fullIcon
+ var/list/signed = list()
+ var/written = null
+ var/image/my_writing = null
+
+/obj/item/photo/get_desc(var/dist)
+ if(dist>1)
+ return
+ else
+ if(signed || written)
+ . += "
"
+ if(signed.len > 0)
+ for(var/x in signed)
+ . += "It is signed: [x]"
+ . += "
"
+ if (written)
+ . += "At the bottom is written: [written]"
+
+
+/obj/item/photo/attackby(obj/item/W as obj, mob/user as mob)
+ var/obj/item/pen/P = W
+ if(istype(P))
+ var/signwrite = input(user, "Sign or Write?", null, null) as null|anything in list("sign","write")
+ var/t = input(user, "What do you want to [signwrite]?", null, null) as null|text
+ t = copytext(html_encode(t), 1, MAX_MESSAGE_LEN)
+ if(t)
+ if(signwrite == "sign")
+ var/image/signature = image(icon='icons/misc/photo_writing.dmi',icon_state="[signwrite]")
+ signature.color = P.font_color
+ signature.pixel_x = -10*(1-rand())
+ signature.pixel_y = 15*(1-rand())
+ signature.layer = OBJ_LAYER + 0.01
+ src.overlays += signature
+ signed += "[t]"
+ else if (signwrite == "write")
+ var/image/writing = image(icon='icons/misc/photo_writing.dmi',icon_state="[signwrite]")
+ writing.color = P.font_color
+ writing.layer = OBJ_LAYER + 0.01
+
+ if(!written)
+ written = "[t]"
+ else
+ src.overlays -= src.my_writing
+ written = "[src.written] [t]"
+
+ src.my_writing = writing
+ src.overlays += writing
+ return
+ ..()
//////////////////////////////////////////////////////////////////////////////////////////////////
/*/obj/item/camera_test*/
diff --git a/code/WorkInProgress/Railgun.dm b/code/WorkInProgress/Railgun.dm
index 4b35ff0a..f8b4e9bf 100644
--- a/code/WorkInProgress/Railgun.dm
+++ b/code/WorkInProgress/Railgun.dm
@@ -404,8 +404,6 @@ proc/line_ReturnEfficDir(Angle)
ReturnedDir = WEST
return ReturnedDir
-
-
//This returns the tangent reciprocal of x, for use with East and West straights.
proc/tanR(x)
return (cos(x)/sin(x))
diff --git a/icons/misc/photo_writing.dmi b/icons/misc/photo_writing.dmi
new file mode 100644
index 00000000..ea649420
Binary files /dev/null and b/icons/misc/photo_writing.dmi differ