From fbfa125f4bfdb95481436e592d1051aab2d40271 Mon Sep 17 00:00:00 2001
From: MagmaRam <drpepper42yes@gmail.com>
Date: Sat, 18 May 2013 22:00:15 +0700
Subject: [PATCH] Bugfix: Fixed issues with custom item camera sprites

icond/obj/custom_items.dmi: renamed off sprite for blue camera

code/modules/paperwork/photography.dm: made cameras use variables item_on and item_off for sprites so that other types of cameras (i.e. custom ones) can use their own sprites without getting messed.

/code/modules/customitems/item_defines.dm: set sprites for custom cameras "orange camera" and "old camera" to use item_on and item_off sprites in custom_items.dmi so that they had the correct sprites
---
 code/modules/customitems/item_defines.dm |   4 ++++
 code/modules/paperwork/photography.dm    |  10 ++++++----
 icons/obj/custom_items.dmi               | Bin 42327 -> 42329 bytes
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/code/modules/customitems/item_defines.dm b/code/modules/customitems/item_defines.dm
index 1522d8970b..0c9ffc5839 100644
--- a/code/modules/customitems/item_defines.dm
+++ b/code/modules/customitems/item_defines.dm
@@ -200,6 +200,8 @@ hi
 	icon = 'custom_items.dmi'
 	desc = "A modified detective's camera, painted in bright orange. On the back you see \"Have fun\" written in small accurate letters with something black."
 	icon_state = "orangecamera"
+	icon_on = "orangecamera"
+	icon_off = "camera_off"
 	pictures_left = 30
 
 /obj/item/device/camera/fluff/oldcamera //magmaram: Maria Crash
@@ -207,6 +209,8 @@ hi
 	icon = 'custom_items.dmi'
 	desc = "An old, slightly beat-up digital camera, with a cheap photo printer taped on. It's a nice shade of blue."
 	icon_state = "oldcamera"
+	icon_on = "oldcamera"
+	icon_off = "oldcamera_off"
 	pictures_left = 30
 
 /obj/item/weapon/card/id/fluff/lifetime	//fastler: Fastler Greay; it seemed like something multiple people would have
diff --git a/code/modules/paperwork/photography.dm b/code/modules/paperwork/photography.dm
index d6daad6092..dae7ac1384 100644
--- a/code/modules/paperwork/photography.dm
+++ b/code/modules/paperwork/photography.dm
@@ -122,6 +122,8 @@
 	var/pictures_max = 10
 	var/pictures_left = 10
 	var/on = 1
+	var/icon_on = "camera"
+	var/icon_off = "camera_off"
 
 
 /obj/item/device/camera/attack(mob/living/carbon/human/M as mob, mob/user as mob)
@@ -130,9 +132,9 @@
 /obj/item/device/camera/attack_self(mob/user as mob)
 	on = !on
 	if(on)
-		src.icon_state = "camera"
+		src.icon_state = icon_on
 	else
-		src.icon_state = "camera_off"
+		src.icon_state = icon_off
 	user << "You switch the camera [on ? "on" : "off"]."
 	return
 
@@ -253,8 +255,8 @@
 	pictures_left--
 	desc = "A polaroid camera. It has [pictures_left] photos left."
 	user << "<span class='notice'>[pictures_left] photos left.</span>"
-	icon_state = "camera_off"
+	icon_state = icon_off
 	on = 0
 	spawn(64)
-		icon_state = "camera"
+		icon_state = icon_on
 		on = 1
\ No newline at end of file
diff --git a/icons/obj/custom_items.dmi b/icons/obj/custom_items.dmi
index f0a310d2e8664d2644c536107aa9fd6c6fe74f1b..54dfe1707478f7aa386454c4a66903da076f5b84 100644
GIT binary patch
delta 1000
zcmV<E0~h?)$^zNS0+1wE*m_i0bVOxyV{&P5bZKvH004NLomfq8BR32^+rMJ4d*~%C
z;xvo);!BZ5kwf;-KR|FK&WIk3IG{8hjDLL(X_9)gUeUSPz<ZR$k4JJoH-CNo`|(?m
zd?kOhP=+iKm0|a3yYZ~K**ClGrc)g0`S&aM$gYUOfFq|otOiC##Q+ZDkrWMhOg%+`
zh2ub)C0%iZwkiW<3xkwPU_dPx*}|X_Fu{VBCp+)pFppE7xm3XsTPIk+c?U94x`t4H
z=ZG;jNeZ<h!|wK4g29t#gxhORxUHWs;!1zuaV3N2NAm12LJp#J*T2Nb%VKx?#A&z+
zd|gzP{54pc@eY$)EkKFhE9E>V?nKAB2PI%iKzhP*GQ_8iGo5&v#Ez5;x4z$QJVjia
zeY3mS-Ry4uNA49@Cs@ybY1S!{ld-KUA4V8mB94Z4DwRp1)r-$)hm#d)d0JkuSWJI*
z5&IEyJ*P!6_2h6Q#kvIINQxj`SI=hdsPIU9G4VG+N}i-N`{wS;&F(DJBPzncal)eP
z219HjVF{$INXd0C7CI6fBqUoa!pM$bbWX|C?9SkGJz52IO)zjrYB0af1H*_V&)#PK
zoM3h30bM<PJRaFYhbeLDEiF25TDyN}$xKR;0ewWv1alyzafL-<XFx9)3n{cJGFZlh
zHliD>3iks2h{V10fOghYzUu<_KW`iDtf{Uaj(fRa^Urtpx_Ng$$GxPxAD?36$4k?b
zg<lvGc%@vgaZhuGHqMj-Q>?e&B#HrA<-WJ1#5vqhgqQ;<<Vj3&CVtJC<_v#%A_td6
z^p)`B{vp)$m)sm=)`Zb8w7uulFZPaO7(d^03>vBkEh<>MZ7=C0wi11VexyVfiCq`D
z59QZO^dF+@O@LfT>==_J-gzR&7{OtpD)>avqf=R0)Vl8aBPS>nX$q33AeNrgD|(~%
zUyvVhekXG($jLN&a|t|;)@FaxD;~-ChBLGw3+5B01tD|Jrft~;jDXXGCiIB2vLk58
zccT6>V-rQD@5-!<l1J=Yk&^3`d<HjkWlRK_J(zapGc=giH;e^YA&MKwuon<I8gZa{
z5xha`PI<%LeYpbs<r>R>Tw{4>(Efy(6^4N8ilZUP$_k0x5Yg4;MrD6>1cM>u%ZjC#
zH6HaaCvZU~!>)3Wkgx<y@bXo{(xM}+pxi~%ATH4x7pGUGX?IG*al%qav!q)HhQ08N
zvNKWgk&-D${Y*J?eZu(<XVAk|WPp}5{mjjuo3Gy<nun*y?Z4pBMsP6M@vr~@AOJ~3
WK~#90?45aB71jI4-vhH31VEwGU*?<u

delta 1001
zcmV<F0~Y+*$^zHQ0+1wF)_PP}bVOxyV{&P5bZKvH004NLtyoQOBR32^+rMJ4d*~%C
z;xvox#g`(BB8Tjue}LdfoDn@5aX@K282|bn(roI@dPN7l*}!|0#E(aEJ~n@T`Rnm(
zk$WY7uuz695tU*0VY~6Hx!E_n?WR*4>G}6J@R3~+g#kxSc~}jMjEVsq#v>^j@R)jv
z0t?51G)ubT2yImc$`%GGm%xBpFtUX~C18RDEl+md!C@Y!JaegnBeqVkfb$MyqI3<R
z{>~9&Y?2geMTXt&wFHAF&j`2Io^V?~VZ@bxz~f2=&yVEUVT2q+>#l!^k(b5p_KDMQ
z75KWSD*0=$Hsc*8w_1P_y;sV4PTYx(bq`9wlz{Yv<z$FY8)rK4G>IK47jAvO-FS+)
zHv49Gv%A^d{D<5tu1>I?0n@BgBqw8AS3Zm|x<nie?^G(2M5`B{(GDjo((<&tV6m8g
z>>~Cf=6X(xV(Q7^NQ!j{#E}$1x~`th+)?3?_+sL3f|NW-Y4*+Cr<>hbs7F+Uf#ZZl
z*$sx+M8XnCTal9MUMzGZI7mpgR)moq!RVZlso9;u=X$gX>Y8BSj?`d&od<>yOP;;W
z{5iqu$^*K3`glCDhYnNX)LU9~;Iwvs(UO^zBm?@0mI>xSO5+NP#Lj?TFcwm1Rb;S?
z32j6-SQYLC`W}gU=>hGmseIQ3?tk7k+F4UwKOFaR!R8-t?sfC#evW%dcRxPG$d8w%
zCkwwYCh$tRUgMtT3~ih#2c}qWzeyAWw90*NNr`i~p$IVtQpl5-<V^gUGtC))@<a|U
zi|9APllz-c*I#mTkXaK(!_fAYQ@_|7j$!<K%Q0xEBDAPr?Y6z7lh{i175bhMT_kp0
z<UW*NFVTO9t~UX4A+cjjmU!oh9AgBBiK^feMUPHpX;JIC>yMnEP^2kHo`P6<Qm^QZ
z-hV;9$N8PisURoQ?9C<cJX)K7O|N();~UP<hAfy*loo`{Ih(d+7cc@&6PnN?&dQFU
zCEtnq%ZyDFnZ7HtGD;q?Z$(P3SMnL$(3LR}WcFa%na|K*THi1hWQ8bhAj4ij=xD@&
z>P7Ghtvlrvd-v%I@TY4mf4;`@&Y=AXGb;=M*A+)Yl9d$_xgnyf%Z<u^>Ieoy$d?sM
zF>5^PVNT$JOom<MAR%E1nBe8Bgr!ACT0yysra@ey|Nj@KL>wn9g)~dLg<x0;&nP<+
zB_Ao7BGk{6GuOwPe{lveY()lWNz>1K{IU7+^`Uuqdffg4pFKq}X}h)1001BWNkl<Z
Xc%1B=d0Z9M`^Vn{A}%Pi90Wa~MhNTU