From a598d5e09f34b8600ae8989a678b17657117c911 Mon Sep 17 00:00:00 2001 From: Lumipharon Date: Fri, 5 Jul 2024 20:01:42 +1200 Subject: [PATCH] tank fixes --- code/modules/vehicles/armored/__armored.dm | 4 ++-- icons/obj/armored/3x4/som_ammo_rack.dmi | Bin 2492 -> 2166 bytes 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/code/modules/vehicles/armored/__armored.dm b/code/modules/vehicles/armored/__armored.dm index 5e2ace9a2d32b..2509a3cae5e61 100644 --- a/code/modules/vehicles/armored/__armored.dm +++ b/code/modules/vehicles/armored/__armored.dm @@ -461,7 +461,7 @@ else try_easy_load(I, user) return - if(length(primary_weapon.ammo_magazine) >= primary_weapon.maximum_magazines) + if(length(weapon_to_load.ammo_magazine) >= weapon_to_load.maximum_magazines) balloon_alert(user, "magazine already full") return user.temporarilyRemoveItemFromInventory(I) @@ -518,7 +518,7 @@ return if(istype(I, /obj/item/ammo_magazine)) if(!secondary_weapon) - balloon_alert(user, "no primary weapon") + balloon_alert(user, "no secondary weapon") return if(!(I.type in secondary_weapon.accepted_ammo)) balloon_alert(user, "not accepted ammo") diff --git a/icons/obj/armored/3x4/som_ammo_rack.dmi b/icons/obj/armored/3x4/som_ammo_rack.dmi index 2204923e4e48fcccab5aa62056721ab7c858d469..6aa9eeaf04a77c542ae4586d8b307fd0432613e7 100644 GIT binary patch literal 2166 zcmZuw4LH+l8=n*#=&eFJ1UACBFkG1F;wK^{8gv-I@kL?*Y&^d-~GFv`*+{Z{XG915BDQbIk+4I z0)e{xB(~RM@s3RSODA#d*0O zgV;?D0-(c7_Qu6I2FC`*g#J4&G%6ATNi3%qjmTvft56F@F!Htqw||`4cVTu<6ft+H z`sym5eQt(>(c9WJIrO1@zDag8_@j4)Sf-=|Zrg^tsf>EL3ebvlqx|1Fa2Bg%M;C=R z98NQ@Dy)<#P|;y0esJ}PoRW3w9`M-K`twVKas6{WFZ9crWl?J5_{AkC6U~c==L_XqQAqSPV+)`mNsH8&G=9sAT6cXVb>g5c z^I48MNk0$*k(GCGJnWrVK3zeh3|s7Ubn?71<;)g!F0B)gnx;;Q2I;g@gZ7h^mE>ky z;m%#K%|W^M!Y{ESKFIqR{;S3Jk%d@zzRyBdgJ^AB*T(z^e46px{gQ-bbp`1e#51(G zT;}Um{w?eM%*Yoz%{!GAOU-lqRqyA(V{*cJ!iwi7_P{^01LhCB6ROuEvf-qhb3Jd9 z)0!vHe>95QXN~HpIEE?9Ib0@|)8k{&se~yT7>&F}F%xsNifaVS;qT(j#Wz97XAU&$ zJ3<>BZGp4mbNcr=9EH}Xt6;JQtC{Y+8?0gotp4Ww`=x9jwzVNJ&@>WlQdc~kPs86K zC#3Y$2DMCtV7Cmb8?kB!XYQ6^Iw(9I)Ahew{gZYvs2Pq(K)p4nCG>b=?&nT_q@eS8 zHCn~5dzXW`2S@P7^F199o`raggkmdqz^X6VgNDytYE~)T!V17D?Pf8o)?1GFXVdWE z0k9664fd&0DHj5mq~qlSVAB5=LdLpry?Rd2_`HTWv=V{x(ZA3<*39B4nIZH*Gd~ak*Y>;$P7DUQAH$T*BTzISaPT`12}zg$mW{U zLEj{1bgGB|R`Pc|yT_|{YoBzt8oNZ3_pI*o7iW0(Jq<51AW1DpEonzE)}@#f6U zYPu@$Z^0f`h(9kyr$C{#kJ#Iw+gXw!QqnRGEFb4@-_edBC#dA6nX;{i+bCI5Y-=@E z!wB)>*=ZpFg7H!iU_mgXz_ynEmWb$mT;RA%#NtX88aMi$fi7x40_$$`NOJZDg%R|{ z%({L%Y|EmhFXE^sI1Q*o_&nLu2^be{0{_;3tn{>^Qw+VvW%h3_gO;}x848!4tW6U= z+sDra=~SKGq%6zo3is7u7r-^(a*P`tYYXqMoE)FEZz}485Jb0MXpU-phg3W96IKa6 z7M{zA3o0xaLwBxiBujC+sy@8xFLXj>ys{$`zHD*hOm*+oY`57d-d#jLBl8h{)o8V& z03k8ykv2)y!n>SIuUG7P6WXL}C^2!9ZcO`1wO6%fQR$oTqD&R1rW^CNW+Fz_wuP$= z$NW&1_tWm})9!t$g0LW<`kO{nAOA2Z$eMeuKRB}hOzRT(j6f`MxT0@i$AfN-+SjER z0VTvtY&NuOceNGx(A`U6a)s@T%btOSE+9$fpn0OTx&lxgV@AATPR9NCxB-=wTuOVlI`_Q$F3} zTF&kN#^3`eu{tcS>%9q59=S{>nI$CnjUGaw-2QY8p&jEoXdef1erLXD{gk#$FnpJm zjQGZHWl^og^Yc$c!iPaLObl;Ro|{$=e1_SY7BR_mW8-uZ5Pkd$`1TOt!(f_u@eZZD zX#iPC1!A%LeVL6Zznr`#=w-IV7Y~)wg|IqN{uX#y%mJ}NiUdw;4GU-rhaeJvW>ylIf=k7<{u+=-JrZ7H)3b* zdTSGaocS23G>ho45+N-7RX*BW!hJ~3l1?iBGFcI=`oMyn2JmI%OQbjQ|8r9iNL%bg zA@Y59Y@Rtc3DL^~xBD10>mLef~_6PkIyPRcAF z_DNKt{?*)F_dR%#wKq@qj)9N=r9beQ)aElg65*z8a+QbgH?z$I?j2`O#z&-vKsQ7| znRI2F%*6PJ02p@m5V~Va!R6bYZ{$V;g~>C@E2KRXG1Ik@T6bCDjPgpL-y|~`JNy2S zdd+oZa5(jyFOXewYaw&j4#Gap*@(**ksEs7Zy!vzqDf66WbQV8K5kpyy43SKZ3H9$ Q(b^zfoZKC6+6QF(1@XQFumAu6 literal 2492 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 L94yPRK9qk0h&FZU