From e239220369a32438dc938385a38aa6dc5c0db7a3 Mon Sep 17 00:00:00 2001 From: naut Date: Fri, 21 Jul 2023 21:33:36 +0800 Subject: [PATCH 1/4] New blood bags --- .../items/reagent_containers/blood_pack.dm | 33 +++++++++++++----- icons/obj/items/bloodpack.dmi | Bin 1015 -> 1332 bytes icons/obj/items/reagentfillings.dmi | Bin 2443 -> 2711 bytes 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index ce259b78f87e..2b1102989586 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -2,10 +2,10 @@ #define BLOOD_BAG_TAKING 0 /obj/item/reagent_container/blood - name = "BloodPack" - desc = "Contains blood used for transfusion." + name = "blood pack" + desc = "A blood pack. Contains fluids, typically used for transfusions." icon = 'icons/obj/items/bloodpack.dmi' - icon_state = "empty" + icon_state = "bloodpack" volume = 300 matter = list("plastic" = 500) flags_atom = CAN_BE_SYRINGED @@ -20,7 +20,7 @@ /obj/item/reagent_container/blood/Initialize() . = ..() if(blood_type != null) - name = "BloodPack [blood_type]" + name = "[blood_type] blood pack" reagents.add_reagent("blood", initial(volume), list("viruses" = null, "blood_type" = blood_type, "resistances" = null)) update_icon() @@ -29,10 +29,25 @@ /obj/item/reagent_container/blood/update_icon() var/percent = round((reagents.total_volume / volume) * 100) - switch(percent) - if(0 to 9) icon_state = "empty" - if(10 to 50) icon_state = "half" - if(51 to INFINITY) icon_state = "full" + overlays = null + underlays = null + + if(blood_type) + overlays += image('icons/obj/items/bloodpack.dmi', src, blood_type) + + if(reagents && reagents.total_volume) + var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10") + + switch(percent) + if(0 to 19) filling.icon_state = "[icon_state]10" + if(20 to 39) filling.icon_state = "[icon_state]25" + if(40 to 64) filling.icon_state = "[icon_state]50" + if(65 to 79) filling.icon_state = "[icon_state]75" + if(80 to 90) filling.icon_state = "[icon_state]80" + if(91 to INFINITY) filling.icon_state = "[icon_state]100" + + filling.color = mix_color_from_reagents(reagents.reagent_list) + underlays += filling /obj/item/reagent_container/blood/proc/update_beam() if(current_beam) @@ -132,7 +147,7 @@ connected_to.visible_message("[src] breaks free of [connected_to]!", "[src] is pulled out of you!") connected_to.apply_damage(3, BRUTE, pick("r_arm", "l_arm")) if(connected_to.pain.feels_pain) - connected_to.emote("scream") + connected_to.emote("pain") connected_to.active_transfusions -= src connected_to.base_pixel_x = 0 connected_to = null diff --git a/icons/obj/items/bloodpack.dmi b/icons/obj/items/bloodpack.dmi index b46b6eb638c07d0f251791548c23a14fe196142c..d2bee4892dcffb7bf77e47d4df172904254f6852 100644 GIT binary patch delta 1275 zcmey)zJ*J*Gr-TCmrII^fq{Y7)59eQNH+j+0tXwAyjoS|38ZFBRQ0Z(RP^a{FqhEe z%~N++1RHgCiROs%?6kPtB~%=&n4>bav$7>LR3PNxdf$jnJxA3(zn0#@5~UnI!D9l6 zUCM%e2Q#}iHLafC-PFBaU7SHxqM{%;Dtie7153E4i(^Q|oVRlw{cbymw8dv=AJy6A zl$2cdcEu~+8--kb4ohPWh&I(9Y1R86I7_$P;ik$P3&+)3AxVOpS3C(7w-8$NuF21Y zQ?26IH=jA*>nE8SZTr*z_Wt?ix8E=A+OtRHz;xd0vJ82Rj5C;-4cOTd_;?P?xo)K` zFVFhj^_ulxslA4;`8N2jezCvtxckA{+tt6<-o2aO)vUg% zwDc>NS_WIxc7{dAC-2Uw44m9>)!{Tlp^SQad%ODSYnJx*?}aXwt&G!EJiRIB=BKdL zS66vQziLnPc$E@8zoTfY@0YF04bLk@SPtgcbuGGCBjUPi_T^)r_bffV{PIfCzelev zs}o?^{CM3qwO_Z`JT8}$EOc}fICIOy_xY_|jdfdpExpfrLfdJtQ4Z7JqF+mS73QkTW=g-9 ze))Qp$ezvhn?L`4@F3x3^Mbnl_viYk-7dA|%G-Y1Tb{*t`Q<40#MjH#n{s@qtzUir zeR=Ku`=_Giju$@q{qI_e(Z!o<#7gB8@_xB(Z?Nc_tW?ju+W+D8gLfaFufMn946rWX5fqIKaivZ`v$Kei(A1;`jDjCOa&au|XrnCfw(Ebi{mm5F5i;_GZ&(2N=#ECkq*g21^5m;sgc^iCpITl>aZkRz=E{ zmJ|iXXFdPg*j*QTJpMMryyt-uZ6dCMt%)Am!GC6TUP`|r=2=g8UCxNXrbG+E?ze~up%B-rhN|Ng|vhuzr8s+*fW{Cxj;~dl_RN^WyfM z|EnDH79{^YwwEt%`=1}nUWW6&Vm67{uj9Ld|3bmvO$j^?BJO{cVED=?wJhGWLi_;k eID`1~A7k3fWhrjyMMc1ZjKR~@&t;ucLK6VV$x`_M delta 956 zcmV;t14I0@3ik&kiBL{Q4GJ0x0000DNk~Le0000$0000$2nGNE0IF$m-T(jqevu_h zf6_{Ga+J6@Q!Jp@xj55`5_3}_Y`CI~#GEvOic)h6N-A-wQdV&Fb5U^d_2dEo z5b-X=UY6La0009tNkl4?jT9h;I}A>*xXp}nPoyYlj?14?~t!y)n^(3s;Xk?f8#qS zpDqCaOC$A{M@Ikv>DfJ;t-U6M%1$&IeJ_gQqE4LWvMk3a{W2K<0Iid29Cy1@+bo}4 z18Wp{8mg+Eo82d~0eznO{hH-^=9mG?2%z@KWPqY5cmbf%zQE^DShG#LeSufO;MnuQ z3vFjqRhx_z`d%JDy@2=Uv)TG&1BT!E z!_@2b|BYoT;e0-(rytJeW5Vhxsb6mjP#U*e&4~}2cB=_2ESM6Mo%+lMgjVM8_Qyjk z&(CYtf1RC0Xl0HZ0B?QMGQs0+_fIBBn}W<(rB8kc+L7_usn2Y{&&M-(e-n5B0Qi2@ z#kVh40DwnN0=OUW56Z2=Dt#scBuRp-3>64KtNQ@}a3(zer(BXGR4XNNAiVT-4G4z9 zNG9TAucDw|35O64j5Aeo4pz5-;YKKUWoN9$j)6SMRU zjey&P>r-LR0Nw%c#`Ojme|`&?#iZ|hyKwyo@C@J`0B<}4cn826*Bju7^8r@EbUt8f zdxx~=M%ka|4Ra!tPN#pdv?~^ica4W*Kcq}h@8(!dx=D}>h(@EQfc8H9-@W;%`}a2y zk^#v?JT_&2KGHZiJT)aM8*$Y604wnF0O|#|Z4J>e=L4+5n*x-^f4ckg4uoVtsa&0S zTGJJIfGo?ADb*3zWP($;-6NpS=rpk646j`<8&Ip&A^-+cpwsC97#w3Ao*IraL)U=a zy?vk7g2<%(c>s$}SqlIdN5JR}WizQ>KOw4CN{(6q8pW~a1I)sZ0Z#tMM{#{B>>0p2 e0N%LXfZrmyK*c_-4s6%}0000X86PFc`7k?lK1^@s66oamS0005CdQ@0+L}hbha%pgMX>V=-0C=30l)-Mo zFbsyz^eG}ZcPdF?yYw=FCJyil$QxOj5t=H^I`!>$C{+<`>hD`CeYWh+b{67w`?foX z&3>1(IyBZ-q7eC0mdt+aDVCxTN+z>XTT{mVr->A`D8&3-(|=iqbeYYQ*~x}R6k?go zJ_B8J|9wZopj?6A3eEV8W_-b$K}ko!Xxx&cU^I`0eK`t7!_piDqhWK7g3++PYnRh_ z(*;`@Jzd2W1k4TObk5e2LnhZ+av%oGs7}gZSnqpW} z9BVnpTFzo|YdOPO&ajpKi zSj_@zvn55AUPd7$&Tu#%59fI*$C3GuEY8a_Lnh~8yu?Q-Ed`cex zw4~O$+5dXC+x`0ezVE+94ybVgL{km}aA>>T&K`hL%CBGdeLwg3yC6UeQfuApcDt^W z5?cWrn?I-Y{CgrmjX4a!p(U;WmOlR;2+%;ca1UVr#815fo1dM3PnrwREvx|c^HZ;Y z<}Z7G%Bgejts&>)-~d?xm~Va;X8x%g@Lf0Gxp*o*WB)E5?1}-T_#h&afd({_&`EV`)8sL^!0O@_o)AMOlQvtF9FrWL3=l4IQK>@0@ZchEXxmF;jE`R2F1vWoB|Il{3 zjhu8#n|n=zS3svOf#!MzG=JIixi5nv1C)LRG=JIixi1gv^*VhFKx6iA2wi%+#V4VG z7%Lzk#tM_41uT=^0~vpsRBPR=R;!a+h0_KB0%8P+QLI3if&evYwOR=P%@d$Tl~U4& z02dRWkz9hr{hmGmF83*Y0F3r~*L8m^cs>EO)_=U{?smJb@B43K9d%f2kN~hm$rJq^=eq|4#5@J8*X#5#laB;Y0Zx

g<=02W7=@+4~^GDqSDy97GNk8{DZ+>=u z%6kFuBG~5qNiM<0F2AN?{yg*FJIUv|3_cHa40A=;{AuUA2@S+}8y=IO1uK)@108>u zW&?B!yI}&C8MQIt+Y^7g-Cli1%v+idOSeAEe7FVaD}X8If4cl|{!&Wm`o5p);hLMzG8}smJoUn8{>LV}3BB9xrh2F* z=Q9tN;P+*+0F_dvdZ;GnFNFXwrNJVXV5gpJbFDybb^e@7;N<-Gj=_BMhZ^-ZJirv1 z{U9RHK9k`BM3esm1%DW!*1Ab=5O@y;?~Dq!V1M$@xg#w9w_2?>hufj=cDt_c`@ug8 z0ir2yR~>VQC_R5~ssM~tO8MJ%=%tjd@B6`zBS4&Of3oeLc!wuI*IoZ4d~bfOb#w3Y z4^0(-Gy!Tzt#xziL#H1<}Ydfy%`)JfT{Q(B9nmzG?UN> z1b<9Z|5JKMdAkwdN9NuruvG#CXDFp~FE1~HzP`nc0_P?`G{FkwJ_!&_xP=wS>+5Ux z`Sa(qzV7MiY0}yEN`N@aEv!IpApozhuUC28r5YWew@=8ImzVDO`Pq{9PL)!A?Tdcy z*I(lvNGbqBcSIfXceP}rHzusLZVs2kPk&EOc83H8@i`zMX7nZ4+a;+b=RD527vpl6 zR*Vi%-}m2^_&JAj0&vZ@fX{h1=;`UHdwzbt#(0=ibMJzcQvUPh%a?b*=I76!-EO!0 z_m$>XUN;tkTm)xG{B|Yga!tCe0=;-YyENQ;|LHmXsQ6Dxda3Q zVyu(j11pp80~(X?0}Wzo)Z^phkH^Qy=+?Ze)vEcefyok}k!~RXX{D6td;x48Ku0>F}`S77P+Qv|TtOEB`b+wE`WFL!?5_ZQE9 zSg+R;916g2R+E7T84mL)eE^X3{rmUyAuO5|lW_+Vf4AXjMy>VFbG~l7-9B9VSeS+t z5KTBYK108jEGr<+GW4Xj3gH|A#2_Dq<=U%{^n9k}5)6nDphnbM|2*f_{oJpETOdF{ zi~s>K0(2&qKrlT40%8ORh!G$lrkMb_2Ltz~xlcl;<6{1@=QFLd1LVI20;YEMCD@Rl zTq8c_Wt*Rz&vgvC2ekjeZnxWq!yoeDKVS2QZ@&4-`Al!{P3ZT2z;pcY%{MdKtPND0Wksu#0U@&BS1jRe*vwNfz-K`n9=|M002ovPDHLk FV1o5&IvoH2 delta 1947 zcmV;M2W0q{6^j#)7k>Z<1^@s66ECZ_0004-dQ@0+L}hbha%pgMX>V=-0C=30lR<96 zFc3x8$tf&Yy9#!o-DFdNDi&}B+VL6f_<|3ElHLSMxFv6bB_0j?@+Me4|vA8wOu%;Q-G{c(a zSj#!qau$nQ%Nf>khP9kwEyt{Vf1D`FER$NJu+HTQh&;fn6_n##H>@aE9!qoO!9ZW8 za;!u*1z4n;0x(nAH?^E@T=q?k9QMG0{S?>_cqC=t)PGU~H{mLG2xKf(@eoaQf)44v z2zXr&HNfkAr~wB5W1#2*WgMB*hI|&uD94#M&p%ik)rtNh|g0Q6I;KWh%XN* zVb0Tfy$bFC68@2X0>E+!lMw?cfAb~%1fV6g*3IGT-EQ~$zxRFrBl3hACqOjiH~`1C z+wJTDD5d=Vy6^kB$3FxCVvt(vX1CjQrIgqT;MDv%rRP5q0cy-~0FEtj1+et_k3fJ1 zx`%rJhZlb83~YXO{v&BFK=-f$ILuF-0nK0b{FHOY-g`ri#lZox0x;kF7tH)~H{iQ& zzGLxRe8&D=JlPckNbx~Llh6o9e*$8f+ZmOdTkMRE{46=J1BlwYOV*5*moH0s>;Jld%OhlfVTJf1*jX*3D|QI=fXkZ4e+J zMt~T_3WO;LP@`6>l>pE@0cun!CH)lOY63KpOOUuf(@%iweMvt7M*Fktx_>QrJ^{7X z|2ygKcDt_c`yXQ-uh{_AS~u7H;xNXk1F-A5ZoA#i@;Xep}#>RvLrT6Ae&u6)6 zt(#M?vun0#AH6qx%Hfyox~?mwbY0hVbMH}qYW|$k^U3%q09}_o36)a1zV8SB+~7;F zTI*)DT5VRV)#h*?B7HC7a3Gq`EuDLvAC8H+pU<)MNoef+QTKpKDSvy>&;84rpPip6 z@=*Ys1lycH$tBp><=0fqpJ)C@2l-r=!RMaCToE>Z+WBrm12Nu)2b1v#CX?_8B7dgY z0NulGn80;LZA|$7z~64SH{TKSp60{S9ge|kkG;Vwpi`@kIaea-`M`7rt$=E+n^VQB zwQlCv8$3N9?m_wrV9NPlu75iJRZ8jlzMtyhnw!ruoH_}fJ29I7xyf!q?{>SX9;(Ut z%)=%4W0@>KrIe{2s>%6FAplHi@FFGHxfk19E0BAgKj#uSIsc>QV7~c7jd~j%U<%EC z5D{pflaL29lQ07jlb{C$e~eIT-J~}Nd<27cMumHDIQZw>5thHKR;$hNcIdm^uIu}L z@V|us(UkYAj=4jWo_{b^0LCh%{B1k*QcBnN{ouzDATD+|*bXne;{%}UZhsJdG{4rm zdGz_mrV2os05zo6x;c07cilW^;g9CeVd?V^-v3+A9iOS@3(x?cJKc1gBLL|azWLet zkEW>r9aaG6UIcTk0Fp04^OrsU(LAl!>p?$oZWWNa3246gOPc>^1_uaWDn5t^lduFh zf78_elpa#vZv^<6xi<=Il>os7N-5obzaRAdEp8MzHvysvRv?c_fM~)!tU%u0-ny?} zzh3lxFE1~X&VEz^#6|951#%Aoczb)h$>T27=m5QcLGJha?)CN6lJ`NCQhx7?e(Cq$ z;vPsU07G{~9rAazWTQ7GthH{Am&7kGe=l~21P1XrARuP+CD{8VsU_z;F1Z)ua+p?( z4p86sKbH78hf4x*%eR0pc{k|g<)wRleZ9qam{fD`f|XMK{q5Vg55MQvuV3A6xBKUf z=6|}{yXA+__WS*(@9+$HyBd;4--HIZmYdMPV9(FbKWnW&uYDW=f(A_$fHaq213-)w zlMw?jlb{D8VvTx!e*XFV{2bkycePqIzcnyf0yNS+1R$-H5}hxA?Q1qb_Yi>Z-@hlv z$LFUBVEaY~NB|(~5dwJC3P=E0vh)fpJ%5S-HhT$1-gdkF!~EsW@B9Ah`A_ThdV;3{ hFq{>W5d#?({0IBNyN#Bk`D_3H002ovPDHLkV1l{&)Eoc+ From 858324c261d8640f0506f429894eb7d2c51c3521 Mon Sep 17 00:00:00 2001 From: naut Date: Fri, 21 Jul 2023 21:41:05 +0800 Subject: [PATCH 2/4] <10 icon state --- code/game/objects/items/reagent_containers/blood_pack.dm | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index 2b1102989586..23df5033d779 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -39,7 +39,8 @@ var/image/filling = image('icons/obj/items/reagentfillings.dmi', src, "[icon_state]10") switch(percent) - if(0 to 19) filling.icon_state = "[icon_state]10" + if(1 to 9) filling.icon_state = "[icon_state]5" + if(10 to 19) filling.icon_state = "[icon_state]10" if(20 to 39) filling.icon_state = "[icon_state]25" if(40 to 64) filling.icon_state = "[icon_state]50" if(65 to 79) filling.icon_state = "[icon_state]75" From 6f083d6237c8daf29d6cbcb2d664882984c7514d Mon Sep 17 00:00:00 2001 From: naut Date: Fri, 21 Jul 2023 21:50:44 +0800 Subject: [PATCH 3/4] FORGOT THE ICON --- icons/obj/items/reagentfillings.dmi | Bin 2711 -> 2715 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/icons/obj/items/reagentfillings.dmi b/icons/obj/items/reagentfillings.dmi index e7e44f7b0d1f9627a137632572c9110c2175936b..1514db495e13333e74d38428038cfafdd2c7f2f0 100644 GIT binary patch delta 2137 zcmV-f2&VU!6`K{1BmudRB`tr0EX^9)D$P3e?RO|$5p3%3TPuCG?9X-<;&uDBJBZDG z7q!|qwkky?(x)VvecN-$MJAMtX1TT|5B*OQC}@$1`Mah<`*@kmquJT|Mr2|c%|1L` zbpL%v!k}D%;0n$7jAnenn?XrO-e}yCBX2a1hJ88mM#It^d81)-j=T%eu)b@T(|FT) zTN;tvCV#IA!RdGzLmNH792VK;fkk$CV3AE8SY(gK-e6dAtVtG&TayfHl3`6UtVxbF z#j&PXEN)FPtSN>y#jvJ0)>4kOl*QuKQiipZVJ&4?OEGI-r$UD~Nn)i?Sf%kAD7lB% zYp9M(RkKPNd90d|2MhY7(y}VL3BXFa2>@%#yMMZhrxWL0T_KCzb6`FR<^zr-@9HX6 zz)slG9=#@`%Ww=-7SJNy2Ladh5CdHALk!UP9}P{Pk*lh6O{W65xB=y)MIN=^5*T@r zM{Qt{M{VrwUw9$5hmF|mchL_y+2jh>Mahu>00^B)L_t(|obBDQZrfNIhGBYz zo{P`ezl#UEVgM;VhzOIg1V?{BOmjPllF01a@@D}eMq z<>~pfsi^>20hrISG!>xtq+fx}pMQR>_4_e=ec%5!%h3PMJ^p&m`ESiVn)Cag(x3p< zT6gFE-CQe>bC*AJy#kw`oquY--$zcmwavYy!7HG1mq2s90-C?>`79*M-~gpx0nK0c ze3s>5yWOUb0cgze4WVmqxA-J95Mu=d#8?57kq0u9Far^P0z{K)t-H-;b9Sq6+8{tc zi~uo;6$n!hphj&r8v&qs0@SEdO8OAsY63KpOOUuf(g(oxKBW(U(f;VV?q4gOPe85p z|6X(theOx*{ns&%*KB}lt-EW!aTw#R6R_*LZol8p@;pq>e@iK)>-&DxpB)__0bq@i zC;AfSy9Wdd#5`=b+w?I2D`f?f0Rupjpa%$ljjFZo&h3&3tq>p}#>RvLrT6Ae&u6`A zt-H6LXV+}gK6-EXl;bzsbzN6V>AJ4#=H8?Jt@(3G&nM%(0CZjUMW~e0^?g71&keo= ztF`Vno6T;s+3b$@A=39Ejwhn|+|s${`SF~X`*=>JUxdcaA9W9?l=8PH{oLQY`Pum? zDencqi(s4cC%FV0yZoAp`SZ+w??-Wc$CH1~9bx&O&1SPZ-46Y5ICOpA5B^yQ5KVc# z>XG?-f1z@aF%HOs_FQs&S-w%Eq0peoElkND#J3Rrq?)E3)d-H3pyQR-RHB|u8 z1gIgk*4??2zw73C6@G929M(Sn==INf?)XeKUw}OZ_~@qN905o_@y*Z9Uz(-@bX)

=Nv8xz%AbbzU1AYr>Cdx`T6-4<6%zCu z2q%;92q$I&Vg#sBkB^VvA0Hp1Tk~!^jrEv)c#0U@!W^C+9EKRRNm&e#h|#yWj60PJhU!|9s0IzWL@S=Pyw+E1;wI ze!z45@Xa?rIe%%I3lOjz58LfFeGIT#c18sV5g;H&fPfeQ0%8ORi1`mMU4;tS$g42` P0000k8ZR=KqP*&t!bXVv$-R3RZ{$65w5@|7+J5(cO z%}XO&M2RRS@|N6)HgAik(VCa--qX3yd7kT>>zwQRJLh+<>-YPd??uz5YTq=4u=33I zfZP0vG>go;53C3hcAnO}G`ASAn^?cVjo)E}Tkwvwu&dx6 z+znah9e{0@R9xH4+S#@q)bB^e-|41|bY?nl4!iRX1q;GUi7qco15+ndx_@M!C$!QI zySlVq{B-Mns7-Dr(Lu%eRiD26{j;$-X{zt5o1>`xiT&~cdU>CaAh%-%&puvu!yr`s z`XynDF~_m`4N}9Rwj&&8ZQ(Fzdi^!SHPg1U8mTvE+EMiR4Ax>xL%HtY=2t~wXR!KF z4jukIVV9#EUitS_7woJ0Qpj4&t;>lhpu3e-clFzz_(Ov^bYiV8Hh6HfFCRRuf2Wp{Y{uiztAg9oMN(z^RYr@SUF%My!RYlJ2&sqzNg1T zhg;$fwE;tGaF~t6#i{?o^mFvUa%)%~H8S-7azPN1XjD(WF}#q_X;oN1l;x{Y+6Vwj zf4Uwyd@8Y6Fjf=2&39|&A7hfDze|Q;s1gj2~HMS7Xd2)MG07RdLu2^1A zHpbj=P-`hOdjb@oqy|d8n1&dQP-&Z26O>l+C+JnA+PkL;_%6gUQ+QU%q^`=?MTQao z^90}rDa4U<&Pyt{Ed|+)Hzt~+!ljl53;%{Z_<=B{yq7blXuu4?Zb7zNk8OPWxe>XC zMvL+Ymb;)v9AgRDI#J*Y%o4l$g%MaRq!wyjvetJh}E~y#4gNM57G^1fQe)ueQW(29#VydrGMy94tH!!>e-6LaBPJy_2I_ zAZIL?=<+V0NW;AWt!Q;fq`*wcVI1HEUVFfY_3J%_$~fj|GY8ps!f{K>glF=zyHj@Y zLH2r##M^ClwYg+&vWUk0ML${7apmPjNe7an+%zgEzw!{t-={&H5dBsQ@JE&Ubq(dFLSz_Xx;7?Is?LpP}ED z;cd+|!4&@v)(T1z$vZGZK~hr!j>M305Ndd6r`SLukIBT`^ddVcIAffKCeyj&$!m3Y z52CQ$I;9ZQLH4Y@3()695Y`D7J+P3EOu+MyGS44kT5?t9Gf7j@8Rk&Bq^0sSW)4{@ z=2=BZn)LJ$DV6^-mpXVHE5%+pmc-GVaN+&6v-&ht?!rzw-pa}S=C8A}5q%>fw-o!gd#W(eMgWt^^iBFi-@3iD!Rrl`O8qJp zkK7V@=6jO_*GXT8LZ%FknFCG_+tbvizW4Wl|s7hA_BZacI?NrbJ?Qa1)P v7@Ut=)kU=TJoNMVr?Xs}5*%)V!Mp<@3`**U#{9xQKo+h?J&!#3H8kySYIGkU From 811f18dace4f9bbe3eb3e0a3a5b26c9dd0bd7cfe Mon Sep 17 00:00:00 2001 From: naut Date: Fri, 21 Jul 2023 22:02:39 +0800 Subject: [PATCH 4/4] tests fix cus it's so picky --- code/game/objects/items/reagent_containers/blood_pack.dm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/code/game/objects/items/reagent_containers/blood_pack.dm b/code/game/objects/items/reagent_containers/blood_pack.dm index 23df5033d779..0879dcffdc68 100644 --- a/code/game/objects/items/reagent_containers/blood_pack.dm +++ b/code/game/objects/items/reagent_containers/blood_pack.dm @@ -189,9 +189,8 @@ blood_type = "O-" /obj/item/reagent_container/blood/empty - name = "Empty BloodPack" - desc = "Seems pretty useless... Maybe if there were a way to fill it?" - icon_state = "empty" + name = "empty blood pack" + desc = "An empty blood pack. Sorry, vampires, no luck here." #undef BLOOD_BAG_INJECTING #undef BLOOD_BAG_TAKING