From a75362cecc55b87a16448a7442904dcbc52f9a8c Mon Sep 17 00:00:00 2001
From: LetterJay <jgilbert1991@gmail.com>
Date: Wed, 11 Oct 2017 08:05:49 -0500
Subject: [PATCH] COLLAR

---
 code/citadel/custom_loadout/custom_items.dm |  23 +++++++++++++++++++-
 icons/obj/custom.dmi                        | Bin 1460 -> 1467 bytes
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/code/citadel/custom_loadout/custom_items.dm b/code/citadel/custom_loadout/custom_items.dm
index 5041532a02..1935ab20bb 100644
--- a/code/citadel/custom_loadout/custom_items.dm
+++ b/code/citadel/custom_loadout/custom_items.dm
@@ -102,7 +102,7 @@
 	w_class = WEIGHT_CLASS_SMALL
 	attack_verb = list("slapped")
 	resistance_flags = FLAMMABLE
-	squeak_override = list('sound/items/bikehorn.ogg'= 1)
+	squeak_override = list('sound/misc/server-ready.ogg'= 1)
 
 
 /*Zigfie*/
@@ -134,6 +134,15 @@
 	item_state = "that"
 	dog_fashion = /datum/dog_fashion/head/santa
 
+//Removed all of the space flags from this suit so it utilizes nothing special.
+/obj/item/clothing/suit/space/santa/fluff
+	name = "Santa's suit"
+	desc = "Festive!"
+	icon_state = "santa"
+	item_state = "santa"
+	slowdown = 0
+
+
 
 /*Brian*/
 
@@ -153,3 +162,15 @@
 	icon_state = "russianflask"
 	item_state = "russianflask"
 	volume = 60
+
+
+
+
+/*Sylas*/
+/obj/item/clothing/neck/petcollar/stripe //don't really wear this though please c'mon seriously guys
+	name = "collar"
+	desc = "It's a collar..."
+	icon = 'icons/obj/custom.dmi'
+	icon_state = "petcollar-stripe"
+	item_color = "petcollar-stripe"
+	tagname = null
diff --git a/icons/obj/custom.dmi b/icons/obj/custom.dmi
index 1c519473ae7ba975c338e39406f1e75bb7378a74..9f87008aa57861e82a0b19f21f28b096b7af6436 100644
GIT binary patch
delta 745
zcmV<F0v7$W3%d)DBmqycB}4)w|7HM@S1|v^0Mm*Az`(%V!A`6I0004WQchC<K<3zH
z0001$laK;{e@M5uq$sn15)CFO8k7}W{anCd0Ra5XP|=4@2n7HD0(nV9K~!jg?U?nG
zoG=uCxhs^m;n=#jS9iB%>)xxoySux~)!p6O)ZLZi;2&$k9y<%0EG)bEVW;^P$j*d$
zU)~F3CI|v2-zX@o#8yx!N^AuMm04yW%W{>f)kJ1Vf5^Zggh5Hgdy51>XoI2@sj3=r
z<5grKK;a1)AVrP@N)Z}u^%^y6)vi;wUi}6Q8#Qjyw76OG77^8DNEV2h3Dk(vvQ_Ig
zZQHf)(6LkJE?v8I@6oeY?>-p{qS2@pi^Vk5rY6w0U;hCE2Mr!FblC6_BS)2t9y4~_
z_z4r;e+D_U03|SK@|3C5rq7r;YxbPE^X4yDxM=Z`rOTGPXTeV(Bm~|Hp*Sm6u3BBP
zX6?H58#Zp*yk+aQ?K^hv+P!CQW&)(pG|d}6F4(vKz`;X@kCYxgcKpQ2Q>V|IJ$L@X
z#Y^rC!~joGN_i57%U7;myME*5t=o6*-n;+cf8nFYPo8?8(;xx}AxVHHL3#H4#miT(
z-@JYI{=>&lpTB(lrhNB2Mg9U9hh+Hi)BTeD`u#`w>v_?91t_+zQw%5x)m|*{p;DF#
zT?fuV6F`a}*kY#xP;n3ic>FeGgFi_b5KDwc@BBgveC7ZqO2kNDPqJ+Y7he#{$|O;e
ze?;66`?D7KLVXW%s$dzO!{Ko90sw(wpbND>=}N*doC`HR7Elei58zv90U&?|I@86s
zTdD!Va<e?`iVqBWerSM(=T9n@X{8D81Ay_7J1yA|KE7QWXj!nLQY-+#GEIwJd;!-u
zn<57?FpkgRa5x+ehm#i=IlYYl-XHizGY9kyKoAAqW0<sF6K_AV{vZS)UBEv#aX1_f
b=fCA2Rlw%-4w*6q00000NkvXXu0mjfH%C~d

delta 738
zcmV<80v-Lk3$zQ6Bmq*fB}4)z0Hvh>zrT@JF#pB?(~1GWz`!K7I~f1~00DGTPE!Ct
z=GbNc0057ZjRJswh#ZwBC@Pf|T>V_Yz6StIyGuzp49$T600MPML_t(&f$f&%lbb*o
zhq)`1ws55G?bY2ar0%`CySux)T;1KhrS7iWa`1<B*-J8kus}$dX=dIhJK@7Jzh~cf
zfmwzD@{NMRO5q9$SuR{bLFF(j;Ca4E)oN^LMess`00uFC9s4buAOtpuVv!_C5i52@
z76KgaPytrtNFWyB)mE=jvsUdob?en{(6CYCCQXZ*HE$7-EQVA8o0&k0h%H;SZqv41
z`wksDb?(x&TlXG4d-d*<p&%NK%CT5X#@F-$`u6KTVBny^Lxv6;K4RpklF?(vjvGH=
zqSe3$7T^MZCQY6)b=ve9GiS}7Gk4zn1q&A~Ub1xAa_cU537Dk7-XWZ`V&$sUC2Q8M
zTfbrBrp;TnZri?N=dRs*_GTu)3R#xz@fCu7`wtvEbofZ=(PPI?oIG{<%-M72FI>E2
zt$_9M6s5H%X}Eml>b2`PZr-|m=kC4x4<0^x{N$;B{W<j`P!z>UfHy&W_WZ@mSFhi^
zefR#u$4{TXeElYVw>?GP0;K{c!;hcVm+aT?KjL58i{>f7*{Vu0;36dQu`q{3`BbQ?
zkQg+9LJ|1;*r|dLAC3ZZ{RC%&Hz^f3wg|62@e3&M*aIcmqL2h+lZhc%KEsriaV*EN
z=EZS;K5Ky|)b}8#iZJ5=008m=q#+FtM4Q)A{vGEL331CO&<xm4pe}#}xKEQS-GIvV
zazqWlU_E^@nd`C$LpNOFJwWl|kxLVpEb>WjG{ev|*Cu2ILWZsz;pH=CkF#mAFGI-r
z00000004P`%gH#vZ4MyU(|0`G?P%;nVLEgv+N`eS;$(~vT@dQI7ytkO0RCtG0Xggq
U845}rVE_OC07*qoM6N<$f|yre5&!@I