From a13e9eeaecfcc7c3b5ec76dcc4770b466d1179f3 Mon Sep 17 00:00:00 2001
From: Alberyk <Alberyk@users.noreply.github.com>
Date: Wed, 2 Sep 2020 21:43:51 -0300
Subject: [PATCH] Adds a generic photo item to the custom loadout (#9833)

---
 .../objects/items/weapons/storage/wallets.dm     |  3 ++-
 .../preference_setup/loadout/loadout_general.dm  |  6 +++++-
 code/modules/paperwork/photography.dm            | 16 +++++++++++++---
 html/changelogs/alberyk-photo.yml                |  6 ++++++
 4 files changed, 26 insertions(+), 5 deletions(-)
 create mode 100644 html/changelogs/alberyk-photo.yml

diff --git a/code/game/objects/items/weapons/storage/wallets.dm b/code/game/objects/items/weapons/storage/wallets.dm
index eaf8366dd57..8b7b645aac1 100644
--- a/code/game/objects/items/weapons/storage/wallets.dm
+++ b/code/game/objects/items/weapons/storage/wallets.dm
@@ -35,7 +35,8 @@
 		/obj/item/stamp,
 		/obj/item/device/paicard,
 		/obj/item/device/encryptionkey,
-		/obj/item/fluff)
+		/obj/item/fluff,
+		/obj/item/generic_photo)
 	slot_flags = SLOT_ID
 
 	var/obj/item/card/id/front_id = null
diff --git a/code/modules/client/preference_setup/loadout/loadout_general.dm b/code/modules/client/preference_setup/loadout/loadout_general.dm
index 602ce196210..665046b549a 100644
--- a/code/modules/client/preference_setup/loadout/loadout_general.dm
+++ b/code/modules/client/preference_setup/loadout/loadout_general.dm
@@ -168,4 +168,8 @@
 	toothpaste["toothpaste and blue toothbrush"] = /obj/item/storage/box/toothpaste
 	toothpaste["toothpaste and green toothbrush"] = /obj/item/storage/box/toothpaste/green
 	toothpaste["toothpaste and red toothbrush"] = /obj/item/storage/box/toothpaste/red
-	gear_tweaks += new/datum/gear_tweak/path(toothpaste)
\ No newline at end of file
+	gear_tweaks += new/datum/gear_tweak/path(toothpaste)
+
+/datum/gear/photo
+	display_name = "photo"
+	path =  /obj/item/generic_photo
\ No newline at end of file
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index fc58b4f0bc8..755fc6e8966 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -15,7 +15,7 @@
 	desc = "A camera film cartridge. Insert it into a camera to reload it."
 	icon_state = "film"
 	item_state = "electropack"
-	w_class = 1.0
+	w_class = ITEMSIZE_SMALL
 
 
 /********
@@ -28,7 +28,7 @@ var/global/photo_count = 0
 	icon = 'icons/obj/bureaucracy.dmi'
 	icon_state = "photo"
 	item_state = "paper"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	var/id
 	var/icon/img	//Big photo image
 	var/scribble	//Scribble on the back.
@@ -123,7 +123,7 @@ var/global/photo_count = 0
 	desc = "A polaroid camera."
 	icon_state = "camera"
 	item_state = "electropack"
-	w_class = 2.0
+	w_class = ITEMSIZE_SMALL
 	flags = CONDUCT
 	slot_flags = SLOT_BELT
 	matter = list(DEFAULT_WALL_MATERIAL = 2000)
@@ -277,3 +277,13 @@ var/global/photo_count = 0
 		p.id = id
 
 	return p
+
+/obj/item/generic_photo //this is just meant for the custom loadout, so people can rename and change the desc this to whatever they want
+	name = "photo"
+	desc = "A photo of some mundane situation."
+	icon = 'icons/obj/bureaucracy.dmi'
+	icon_state = "photo"
+	item_state = "paper"
+	w_class = ITEMSIZE_SMALL
+	drop_sound = 'sound/items/drop/paper.ogg'
+	pickup_sound = 'sound/items/pickup/paper.ogg'
diff --git a/html/changelogs/alberyk-photo.yml b/html/changelogs/alberyk-photo.yml
new file mode 100644
index 00000000000..b75331fc72d
--- /dev/null
+++ b/html/changelogs/alberyk-photo.yml
@@ -0,0 +1,6 @@
+author: Alberyk
+
+delete-after: True
+
+changes: 
+  - rscadd: "Added a generic photo item to the custom loadout."