diff --git a/code/WorkInProgress/SkyMarshal/wardrobes.dm b/code/WorkInProgress/SkyMarshal/wardrobes.dm
index 01612e1dd85..b05f747e764 100755
--- a/code/WorkInProgress/SkyMarshal/wardrobes.dm
+++ b/code/WorkInProgress/SkyMarshal/wardrobes.dm
@@ -432,6 +432,7 @@
 		new /obj/item/device/radio/headset/headset_sec(src)
 		new /obj/item/clothing/shoes/brown(src)
 		new /obj/item/clothing/under/det(src)
+		new /obj/item/weapon/camera_film(src)
 
 /obj/item/wardrobe/officer
 	name = "\improper Security Officer Wardrobe"
diff --git a/code/defines/obj/supplypacks.dm b/code/defines/obj/supplypacks.dm
index d1f725a972d..076a0bccd49 100755
--- a/code/defines/obj/supplypacks.dm
+++ b/code/defines/obj/supplypacks.dm
@@ -76,6 +76,8 @@
 	name = "Arts and Crafts supplies"
 	contains = list("/obj/item/weapon/storage/crayonbox",
 	"/obj/item/weapon/camera_test",
+	"/obj/item/weapon/camera_film",
+	"/obj/item/weapon/camera_film",
 	"/obj/item/weapon/storage/photo_album",
 	"/obj/item/weapon/packageWrap",
 	"/obj/item/weapon/reagent_containers/glass/paint/red",
diff --git a/code/defines/obj/weapon.dm b/code/defines/obj/weapon.dm
index 1abcbba3ab6..3e8f5a46c06 100644
--- a/code/defines/obj/weapon.dm
+++ b/code/defines/obj/weapon.dm
@@ -223,7 +223,7 @@
 		var/a = 1
 		a = input(usr,"How much you want take?") as num
 		if((a > src.amount) || (a < 0))
-			usr << "\red You don't have that many credits"
+			usr << "\red You don't have that many credits."
 			return
 		src.amount -= a
 		var/obj/item/weapon/spacecash/S
@@ -254,7 +254,7 @@
 		return
 	if(istype(I,src))
 		src.amount += I:amount
-		user << "You add [I:amount] credits to stack"
+		user << "You add [I:amount] credits to stack."
 		del(I)
 
 
diff --git a/code/game/jobs/job_controller.dm b/code/game/jobs/job_controller.dm
index 2eb8bfb6515..4bdc2b9890e 100644
--- a/code/game/jobs/job_controller.dm
+++ b/code/game/jobs/job_controller.dm
@@ -306,7 +306,7 @@ var/global/datum/controller/occupations/job_master
 			C.access = get_access(rank)
 			C.pin = rand(1000,9999)
 			C.money = 10 * rand(50,200)
-			H << "\bold \red Your station account has [C.money] credits. The pin-code is [C.pin]."
+			H << "<b>\blue Your station account has [C.money] credits. The pin-code is [C.pin].</b>"
 			if(H.mind)
 				H.mind.memory += "Your pin-code is - [C.pin]<br>"
 			H.equip_if_possible(C, H.slot_wear_id)
diff --git a/code/game/objects/items/weapons/cameras.dm b/code/game/objects/items/weapons/cameras.dm
index a4f12d5b597..8acba217c74 100644
--- a/code/game/objects/items/weapons/cameras.dm
+++ b/code/game/objects/items/weapons/cameras.dm
@@ -38,7 +38,7 @@
 /obj/item/weapon/camera_test
 	name = "camera"
 	icon = 'items.dmi'
-	desc = "A one use - polaroid camera. 10 photos left."
+	desc = "A polaroid camera. It has 30 photos left."
 	icon_state = "camera"
 	item_state = "electropack"
 	w_class = 2.0
@@ -47,6 +47,7 @@
 	throwforce = 5
 	throw_speed = 4
 	throw_range = 10
+	var/pictures_max = 30
 	var/pictures_left = 30
 	var/can_use = 1
 
@@ -60,6 +61,13 @@
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
 
+/obj/item/weapon/camera_film
+	name = "film cartridge"
+	icon = 'items.dmi'
+	desc = "A camera film cartridge. Insert it into a camera to reload it."
+	icon_state = "film"
+	item_state = "electropack"
+	w_class = 1.0
 
 /obj/item/weapon/photo/attack_self(var/mob/user as mob)
 		..()
@@ -145,9 +153,11 @@
 	if (can_use)
 		can_use = 0
 		icon_state = "camera_off"
+		usr << "\red You turn the camera off."
 	else
 		can_use = 1
 		icon_state = "camera"
+		usr << "\blue You turn the camera on."
 
 /obj/item/weapon/camera_test/proc/get_mobs(turf/the_turf as turf)
 	var/mob_detail
@@ -206,7 +216,7 @@
 	playsound(src.loc, pick('polaroid1.ogg','polaroid2.ogg'), 75, 1, -3)
 
 	pictures_left--
-	src.desc = "A one use - polaroid camera. [pictures_left] photos left."
+	src.desc = "A polaroid camera. It has [pictures_left] photos left."
 	user << "\blue [pictures_left] photos left."
 	can_use = 0
 	icon_state = "camera_off"
@@ -214,4 +224,16 @@
 		can_use = 1
 		icon_state = "camera"
 
-
+/obj/item/weapon/camera_test/attackby(A as obj, mob/user as mob)
+	if (istype(A, /obj/item/weapon/camera_film))
+		if (src.pictures_left >= pictures_max)
+			user << "\blue It's already full!"
+			return 1
+		else
+			del(A)
+			src.pictures_left = src.pictures_max
+			src.desc = "A polaroid camera. It has [pictures_left] photos left."
+			user << text("\blue You reload the camera film!",)
+			user.update_clothing()
+		return 1
+	return
diff --git a/code/game/objects/storage/belt.dm b/code/game/objects/storage/belt.dm
index 91d2086cbee..47f8c7095cd 100644
--- a/code/game/objects/storage/belt.dm
+++ b/code/game/objects/storage/belt.dm
@@ -149,6 +149,7 @@
 		"/obj/item/weapon/melee/baton",
 		"/obj/item/weapon/melee/classic_baton",
 		"/obj/item/weapon/camera_test",
+		"/obj/item/weapon/camera_film",
 		"/obj/item/weapon/cigpacket",
 		"/obj/item/weapon/zippo",
 		"/obj/item/device/taperecorder",
diff --git a/icons/obj/items.dmi b/icons/obj/items.dmi
index 398dac68c08..354394d5dce 100644
Binary files a/icons/obj/items.dmi and b/icons/obj/items.dmi differ