From 48cdd74808d61c4ee755a54934a517b6915be7e3 Mon Sep 17 00:00:00 2001 From: QuoteFox <49098813+quotefox@users.noreply.github.com> Date: Mon, 9 Nov 2020 15:27:51 +0000 Subject: [PATCH] Ridding crop sprite. made a ridding crop sprite. because it was using a chain before. --- code/game/objects/items/weaponry.dm | 2 +- icons/mob/inhands/weapons/melee_lefthand.dmi | Bin 2300 -> 2444 bytes icons/mob/inhands/weapons/melee_righthand.dmi | Bin 2310 -> 2444 bytes 3 files changed, 1 insertion(+), 1 deletion(-) diff --git a/code/game/objects/items/weaponry.dm b/code/game/objects/items/weaponry.dm index 2fa53e04..d2a805ac 100644 --- a/code/game/objects/items/weaponry.dm +++ b/code/game/objects/items/weaponry.dm @@ -668,7 +668,7 @@ for further reading, please see: https://github.com/tgstation/tgstation/pull/301 name = "bdsm whip" desc = "A less lethal version of the whip the librarian has. Still hurts, but just the way you like it." icon_state = "whip" - item_state = "chain" + item_state = "crop" lefthand_file = 'icons/mob/inhands/weapons/melee_lefthand.dmi' righthand_file = 'icons/mob/inhands/weapons/melee_righthand.dmi' slot_flags = ITEM_SLOT_BELT diff --git a/icons/mob/inhands/weapons/melee_lefthand.dmi b/icons/mob/inhands/weapons/melee_lefthand.dmi index 092881ee01d67305482b803b86870a841116e3b5..e1bb509f732422b0a94e95755651faa9e98e5442 100644 GIT binary patch delta 2374 zcmYk43p~^7AIC@k5|c|7C2~?Osb*O+cQUk7B$sAq7|K`^7Uq)ehmqs&#L7@@K#Pk|Cu?hK zb8~ZVZ*MqVW)~@g<7KjbkV!(_xq^Od-IT=*Rz&CA9sV41zWmNsX1N$ocQ25`%n*J{ z@Dsg#V~`=ym#z__VhE8DAW(ea-CMRQ9GG(YEHDF6uT5UTV$^oVmY^M=BvcxzddQ>I z_P8=ES^n$SV-ykQ$;e=z#L#r{3Zn+>Lhcf#7v=Pr5DV4cpJGhYq8&;P6#hJk{RK3cso)@H5sKk_%nr5F8ez0IXCE4=V37-K*U>ERmUKrby`0O{` zg6Jx>o1eaqojYJrA4 zOPVD;N}zYj!BVv_W8XyVG=^)o1qT3uKIZ326c6(rT~pJG{i)dkEOPll!Ig-PD|!k< zYJP72O)_Q{K+(Mw@_6z5bYNe+B=$^R`;~rU>&Sf#Y?WV|m&uV*T{DwW2z)^uu`E(8 z@A=_Tvhcv8R+Y?GyE&vpG;E|t7sy;Br*fNjVvkG0ettBTuOO0DbB7ZAo)Kru~SzkOv; zD`+rCw&B=*Z6Uynrv30ru4;zl#kd0M_q-^N_fa3nhaW7a-y|Yxb#462;ktRcXR&b? zxz2e{4CVyQp$Wol?VD#p{F;GHAAjNxBJbakn(qug3Cbepx6Dt)a;QWzbmD zEX1)3dGcGR{$37hu0i+myM1Rjm9=oUl8e;n?D6hg>T8^ z6PXN-h6tiUYRpLTA56Ase1#UQf1}2m5Dt{)^9eU^rxoOBJ z&pU7brI9^BdB&HSx;yZ$Vn_Hzne_Ub6)#W2*G*?NJ^#CV+i}7^L*;}$Den(UuI<69 zFb)zi02jQCnQ)TVt|Pz0puOyiHm99_8}HUPD{G{R2iOfFMZ^D?}8vkj&d!!Fl4P2}Rr=phay$2kEf zPp&)k6+5{mgrRB-g|U;rcnz7AAdKd(FMNOBuA~+3=GkDALZ*9EWE}Zsddq#|0bv+& zPRjW>JG;vU=Ns>m{GC9{T;8xqT}>y~jHjhJc0>m#5@pfkphYJhlFp=WykO97v_vEB)Algj7U65wk| zxXbJ&t9x?;ysr}MsPF8WzWC<5VNG!ida=B?c0Y{2?Cc&Sj`5m+f44Lo%O0hL^ouDZ zc;^?h(L<<{JfNu5tcnjJZUuAU|C`*Om+#WXmYc#yqjM<^7TKdc8?z8Naxc zaGe?~P77UBhEeTF>l!+Bm5uXjnb+e}%cYQ0RQnU(%6CQ~tUI{PSz|4_8y8jG&EHBfFn!fe=b?-@RGkB=yIT`dm9vFhcA}A((6d{X`5_(}i zWA#9;M`b?wtif+>Jjt&aSyeveM*U^Q!y@1<+RuO2%dThPmRVuXsvFP^8Tbzpj%Dnm z52d|GFg0AckmzcsUs^a)SsT9m6d+8_uNJH?iSrpA+e7V)5J6%=;eb=Syamoq@NOQ+ z(vEx6pp?AWpleyUEg3j$*Qtx+I3i( zGw_uYx9RV1F`7uH%>a#4A;m9m1Bm0UfoFtZC7d#|hE)!c62?xJ-V-ae$v;?j)SK8} zeIpyYv3Kb0o&oHn^y>N3`iWmmv&XbsNKxRu;gjDG(I#d`?@Nw^7qD2xm~)eS3DA0; z*TrDGRkaL}En|?AJ{x+U&mNqn4@E^Y8|zm+JeE3O9$WlDX8x97J1!?5+P#?1Ix8S6Qo?w*CH+!$Y0RG@Vl{GDQ9!9F`b<><)E?!O`^ MXLn@%>A=)K0PtLSZ2$lO delta 2229 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 diff --git a/icons/mob/inhands/weapons/melee_righthand.dmi b/icons/mob/inhands/weapons/melee_righthand.dmi index ede430390c72383e7b0250430b34cac72726902f..0612e31b974fe73582d554aeeba0c8ca1adc7225 100644 GIT binary patch delta 2377 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