From 7740e1bfee696f9644469175300343a58cc77893 Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Thu, 27 Apr 2017 14:33:41 -0500
Subject: [PATCH] fix missing icon for the carbine

---
 code/citadel/cit_guns.dm    |   1 +
 code/citadel/cit_vendors.dm |   1 +
 icons/obj/guns/cit_guns.dmi | Bin 0 -> 1188 bytes
 3 files changed, 2 insertions(+)
 create mode 100644 icons/obj/guns/cit_guns.dmi

diff --git a/code/citadel/cit_guns.dm b/code/citadel/cit_guns.dm
index 820fd233d7..6a51ad4bd2 100644
--- a/code/citadel/cit_guns.dm
+++ b/code/citadel/cit_guns.dm
@@ -1,6 +1,7 @@
 /obj/item/weapon/gun/energy/laser/carbine
 	name = "laser carbine"
 	desc = "A ruggedized laser carbine featuring much higher capacity and improved handling when compared to a normal laser gun."
+	icon = 'icons/obj/guns/cit_guns.dmi'
 	icon_state = "lasernew"
 	item_state = "laser"
 	origin_tech = "combat=4;magnets=4"
diff --git a/code/citadel/cit_vendors.dm b/code/citadel/cit_vendors.dm
index 32cd034b8b..7fee8705f1 100644
--- a/code/citadel/cit_vendors.dm
+++ b/code/citadel/cit_vendors.dm
@@ -76,6 +76,7 @@
 
 	refill_canister = /obj/item/weapon/vending_refill/soviet
 
+
 #undef STANDARD_CHARGE
 #undef CONTRABAND_CHARGE
 #undef COIN_CHARGE
diff --git a/icons/obj/guns/cit_guns.dmi b/icons/obj/guns/cit_guns.dmi
new file mode 100644
index 0000000000000000000000000000000000000000..e1b2e8ac1a582c60cf36a7cc2f6dea6a7e0eaa25
GIT binary patch
literal 1188
zcmV;V1Y7%wP)<h;3K|Lk000e1NJLTq003YB003YJ1^@s6;+S_h0001)dQ@0+L}hbh
za%pgMX>V=-0C=30%e@N1Fc^j5Ip0+r+Ev6RU9(7wWN2?eg86I${gEVCdiM?;b+Fqx
z@IEE3?alOPIzw-cDJ(NI>hp!f8eI0!P?Ch_F!;Qmlx=2c6r)WXXI={uF2n?lio`S8
ziTC{#-XGq^fvclH9tG+ssQ(8%z4G=umn0mIc7ujGNh;Cy4Vuo-2k1>{6u=#s!~g&T
z#z{m$RCt{2+&^d=XBfxv?-?69m_j>T?x5#ET2e!+ie5cjmO=-0krypZmqMTcmo^Qw
z(4}-JbaAs}i7BRA$rLZSkikQzMg-&Fn1G-KUx^%g*BhMDcrbXl4)S}oWXZY6HpbEK
z1L7X}{=C-v=egIuJAsIZh=_=c8ms7rjYcB_SXx@L06zNZ%`Dy62EZ;)(i{IezuEWL
zK@emB&1SQ3+5KGgyzI$d{07h)-`eb7{&Bf+$;-BOCIEQ-m0fz{Z*NA0$}hB0qtVEG
z-)C`gk!rO{9LIcq??aYb^X&ZQF?;#qf%uP4-^O)a09IC3-kO=2dDMGc)0o33l}Z`F
z?CvhNCnk9KTEus$$M^OocOJmUFVMM;QvTQP?=ttrCeN1Pm*2fSe)XGT<&QNQjm-4!
zeu5y#;y5M@Lu$1ezV8FD+?prd*e2cB?i&O6zK?C&c%Jvj#OCGuK8KZCl<E2JJT37A
zxbpz+AN8OwU~6ZBa-+oE$LHAEnc&$n+<knm@cx$R-C-E!J=Tchn0mcVyWM7LYKkxn
zsZ=U?d>FIe`uaNeqKFHnQob%p5*)`NNfM%{*ie00SwRqFl}d#)P4nJutgfyS$8p~s
zlO#Fxz>ec|y|35nc^rlz^?IETu3u*+Nk+N>#+%Kil_W_9VB2=r%2unz^z<~)84XF2
zP^;BQ)AYb->BqKh(lo`kZQAX2*SdDQ&3ni7Db6qpIwus96878Qi_NU1R4QfWL=4X#
z3C}a?DQK+s2d2`aD6*Q(X8!7359A{viXyAGBF%P#mH^di_4q!?8I?DHNhyb&7=s|l
zT-VLh5x~O2f;Bfc*EO4|)oOX;3|hj`rlBv3uC%hYwgwDN3%v~xMUiFZ!)8D8-lVia
z%TZ4~hP6NcJC1|vx_LvGbYXhC$^C~_plJYAa4}=1(xFq)`zzmdU0m1A8)DFu)G#Bd
zcM2+ljYFqm`}Ejs{|skueFmM8;5g2KzhX^#I_m#<M#)eW6$C*xXv(U}7ZDK=5fKp)
z5fKp)5t085efjX`Ytz~G-c`v-2YTZ#ueDC}(&VtuCma{^oWmeRFU=mfGp?u~ZtQU7
z$MZ}&aOtb_T>0#uuK1+QUcSiGCr`1<lYQfpmLy4jyUw7vh@l$*pj>{~>G^-&=kGPT
z;*(b7`2-OW5fKp)5fKp)5fKp)5fKp)5fKp?Aw%Cof7;*QKl1*4m+U5FS3NK57oYa;
zcUFuKyQBG@{=WvqA|fIpA|fIpA|fIpA|fIpr|Lf~z6YX_fUB?o0000<MNUMnLSTaM
Cz)x!c

literal 0
HcmV?d00001